diff --git a/android/tester-bluetooth.c b/android/tester-bluetooth.c
index f8c1c85..11d9039 100644
--- a/android/tester-bluetooth.c
+++ b/android/tester-bluetooth.c
@@ -443,150 +443,150 @@ static struct bt_action_data ssp_confirm_reject_reply = {
 };
 
 static struct test_case test_cases[] = {
-	TEST_CASE_BREDRLE("Bt. Init",
+	TEST_CASE_BREDRLE("Bluetooth Init",
 		ACTION_SUCCESS(dummy_action, NULL),
 	),
-	TEST_CASE_BREDRLE("Bt. Enable - Success",
+	TEST_CASE_BREDRLE("Bluetooth Enable - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_ADAPTER_PROPS(prop_emu_default_set, 8),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 	),
-	TEST_CASE_BREDRLE("Bt. Enable - Success 2",
+	TEST_CASE_BREDRLE("Bluetooth Enable - Success 2",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_ADAPTER_PROPS(prop_emu_default_set, 8),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 	),
-	TEST_CASE_BREDRLE("Bt. Disable - Success",
+	TEST_CASE_BREDRLE("Bluetooth Disable - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
-	TEST_CASE_BREDRLE("Bt. Set BDNAME - Success",
+	TEST_CASE_BREDRLE("Bluetooth Set BDNAME - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_set_property_action, &prop_test_bdname),
 		CALLBACK_ADAPTER_PROPS(&prop_test_bdname, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Set SCAN_MODE - Success",
+	TEST_CASE_BREDRLE("Bluetooth Set SCAN_MODE - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_set_property_action,
 					&prop_test_scanmode_conn_discov),
 		CALLBACK_ADAPTER_PROPS(&prop_test_scanmode_conn_discov, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Set DISCOVERY_TIMEOUT - Success",
+	TEST_CASE_BREDRLE("Bluetooth Set DISCOVERY_TIMEOUT - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_set_property_action, &prop_test_disctimeout),
 		CALLBACK_ADAPTER_PROPS(&prop_test_disctimeout, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Get BDADDR - Success",
+	TEST_CASE_BREDRLE("Bluetooth Get BDADDR - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_get_property_action, &prop_emu_bdaddr),
 		CALLBACK_ADAPTER_PROPS(&prop_emu_bdaddr, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Get BDNAME - Success",
+	TEST_CASE_BREDRLE("Bluetooth Get BDNAME - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_get_property_action, &prop_emu_bdname),
 		CALLBACK_ADAPTER_PROPS(&prop_emu_bdname, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Set UUID - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Set UUID - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_FAIL(bt_set_property_action, &prop_test_uuid),
 	),
-	TEST_CASE_BREDRLE("Bt. Set CLASS_OF_DEVICE - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Set CLASS_OF_DEVICE - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_FAIL(bt_set_property_action, &prop_test_cod),
 	),
-	TEST_CASE_BREDRLE("Bt. Set TYPE_OF_DEVICE - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Set TYPE_OF_DEVICE - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_FAIL(bt_set_property_action, &prop_test_tod),
 	),
-	TEST_CASE_BREDRLE("Bt. Set REMOTE_RSSI - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Set REMOTE_RSSI - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_FAIL(bt_set_property_action, &prop_test_remote_rssi),
 	),
-	TEST_CASE_BREDRLE("Bt. Set SERVICE_RECORD - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Set SERVICE_RECORD - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_FAIL(bt_set_property_action, &prop_test_srvc_record),
 	),
-	TEST_CASE_BREDRLE("Bt. Set BDADDR - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Set BDADDR - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_FAIL(bt_set_property_action, &prop_test_bdaddr),
 	),
-	TEST_CASE_BREDRLE("Bt. Set SCAN_MODE_CONNECTABLE - SUCCESS",
+	TEST_CASE_BREDRLE("Bluetooth Set SCAN_MODE_CONNECTABLE - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_set_property_action,
 						&prop_test_scan_mode_conn),
 		CALLBACK_ADAPTER_PROPS(&prop_test_scan_mode_conn, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Set BONDED_DEVICES - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Set BONDED_DEVICES - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_FAIL(bt_set_property_action, &prop_test_bonded_dev_addr),
 	),
-	TEST_CASE_BREDRLE("Bt. Get CLASS_OF_DEVICE - Success",
+	TEST_CASE_BREDRLE("Bluetooth Get CLASS_OF_DEVICE - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_get_property_action, &prop_emu_cod),
 		CALLBACK_ADAPTER_PROPS(&prop_emu_cod, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Get TYPE_OF_DEVICE - Success",
+	TEST_CASE_BREDRLE("Bluetooth Get TYPE_OF_DEVICE - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_get_property_action, &prop_emu_dual_tod),
 		CALLBACK_ADAPTER_PROPS(&prop_emu_dual_tod, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Get SCAN_MODE - Success",
+	TEST_CASE_BREDRLE("Bluetooth Get SCAN_MODE - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_get_property_action, &prop_emu_scan_mode),
 		CALLBACK_ADAPTER_PROPS(&prop_emu_scan_mode, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Get DISCOVERY_TIMEOUT - Success",
+	TEST_CASE_BREDRLE("Bluetooth Get DISCOVERY_TIMEOUT - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_get_property_action, &prop_emu_disc_timeout),
 		CALLBACK_ADAPTER_PROPS(&prop_emu_disc_timeout, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Get UUIDS - Success",
+	TEST_CASE_BREDRLE("Bluetooth Get UUIDS - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_get_property_action, &prop_emu_uuids),
 		CALLBACK_ADAPTER_PROPS(&prop_emu_uuids, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Get BONDED_DEVICES - Success",
+	TEST_CASE_BREDRLE("Bluetooth Get BONDED_DEVICES - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_get_property_action, &prop_emu_bonded_devs),
 		CALLBACK_ADAPTER_PROPS(&prop_emu_bonded_devs, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Set SCAN_MODE - Success 2",
+	TEST_CASE_BREDRLE("Bluetooth Set SCAN_MODE - Success 2",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_set_property_action,
 						&prop_test_scan_mode_none),
 		CALLBACK_ADAPTER_PROPS(&prop_test_scan_mode_none, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Discovery Start - Success",
+	TEST_CASE_BREDRLE("Bluetooth Discovery Start - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_start_discovery_action, NULL),
 		CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
 							BT_DISCOVERY_STARTED),
 	),
-	TEST_CASE_BREDRLE("Bt. Discovery Start - Done",
+	TEST_CASE_BREDRLE("Bluetooth Discovery Start - Done",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_start_discovery_action, NULL),
@@ -594,7 +594,7 @@ static struct test_case test_cases[] = {
 							BT_DISCOVERY_STARTED),
 		ACTION_SUCCESS(bt_start_discovery_action, NULL),
 	),
-	TEST_CASE_BREDRLE("Bt. Discovery Stop - Success",
+	TEST_CASE_BREDRLE("Bluetooth Discovery Stop - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_start_discovery_action, NULL),
@@ -604,7 +604,7 @@ static struct test_case test_cases[] = {
 		CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
 							BT_DISCOVERY_STOPPED),
 	),
-	TEST_CASE_BREDRLE("Bt. Discovery Stop - Done",
+	TEST_CASE_BREDRLE("Bluetooth Discovery Stop - Done",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(bt_start_discovery_action, NULL),
@@ -615,7 +615,7 @@ static struct test_case test_cases[] = {
 							BT_DISCOVERY_STOPPED),
 		ACTION_SUCCESS(bt_start_discovery_action, NULL),
 	),
-	TEST_CASE_BREDRLE("Bt. Discovery Device Found",
+	TEST_CASE_BREDRLE("Bluetooth Discovery Device Found",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -627,7 +627,7 @@ static struct test_case test_cases[] = {
 		CALLBACK_STATE(CB_BT_DISCOVERY_STATE_CHANGED,
 							BT_DISCOVERY_STOPPED),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get Props - Success",
+	TEST_CASE_BREDRLE("Bluetooth Device Get Props - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -641,7 +641,7 @@ static struct test_case test_cases[] = {
 							&emu_remote_bdaddr_val),
 		CALLBACK_DEVICE_PROPS(prop_emu_remote_bles_query_set, 6),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get BDNAME - Success",
+	TEST_CASE_BREDRLE("Bluetooth Device Get BDNAME - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -655,7 +655,7 @@ static struct test_case test_cases[] = {
 					&prop_emu_remote_ble_bdname_req),
 		CALLBACK_DEVICE_PROPS(&prop_emu_remote_ble_bdname_prop, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get UUIDS - Success",
+	TEST_CASE_BREDRLE("Bluetooth Device Get UUIDS - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -669,7 +669,7 @@ static struct test_case test_cases[] = {
 						&prop_emu_remote_ble_uuids_req),
 		CALLBACK_DEVICE_PROPS(&prop_emu_remote_ble_uuids_prop, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get COD - Success",
+	TEST_CASE_BREDRLE("Bluetooth Device Get COD - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -683,7 +683,7 @@ static struct test_case test_cases[] = {
 						&prop_emu_remote_ble_cod_req),
 		CALLBACK_DEVICE_PROPS(&prop_emu_remote_ble_cod_prop, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get TOD - Success",
+	TEST_CASE_BREDRLE("Bluetooth Device Get TOD - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -697,7 +697,7 @@ static struct test_case test_cases[] = {
 						&prop_emu_remote_ble_tod_req),
 		CALLBACK_DEVICE_PROPS(&prop_emu_remote_ble_tod_prop, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get RSSI - Success",
+	TEST_CASE_BREDRLE("Bluetooth Device Get RSSI - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -711,7 +711,7 @@ static struct test_case test_cases[] = {
 						&prop_emu_remote_ble_rssi_req),
 		CALLBACK_DEVICE_PROPS(&prop_emu_remote_ble_rssi_prop, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get TIMESTAMP - Success",
+	TEST_CASE_BREDRLE("Bluetooth Device Get TIMESTAMP - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -725,7 +725,7 @@ static struct test_case test_cases[] = {
 					&prop_emu_remote_ble_timestamp_req),
 		CALLBACK_DEVICE_PROPS(&prop_emu_remote_ble_timestamp_prop, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get BDADDR - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Get BDADDR - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -738,7 +738,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_get_device_prop_action,
 					&prop_emu_remote_ble_bdaddr_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get SCAN_MODE - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Get SCAN_MODE - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -751,7 +751,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_get_device_prop_action,
 					&prop_emu_remote_ble_scan_mode_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get BONDED_DEVICES - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Get BONDED_DEVICES - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -764,7 +764,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_get_device_prop_action,
 					&prop_emu_remote_ble_bondeddev_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get DISCOVERY_TIMEOUT - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Get DISCOVERY_TIMEOUT - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -777,7 +777,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_get_device_prop_action,
 					&prop_emu_remote_ble_disctimeout_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get VERSION_INFO - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Get VERSION_INFO - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -790,7 +790,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_get_device_prop_action,
 					&prop_emu_remote_ble_verinfo_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Get FRIENDLY_NAME - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Get FRIENDLY_NAME - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -803,7 +803,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_get_device_prop_action,
 						&prop_emu_remote_ble_fname_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set FRIENDLY_NAME - Success",
+	TEST_CASE_BREDRLE("Bluetooth Device Set FRIENDLY_NAME - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -819,7 +819,7 @@ static struct test_case test_cases[] = {
 						&prop_emu_remote_ble_fname_req),
 		CALLBACK_DEVICE_PROPS(&prop_emu_remote_ble_fname_prop, 1),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set BDNAME - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set BDNAME - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -832,7 +832,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 					&prop_test_remote_ble_bdname_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set UUIDS - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set UUIDS - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -845,7 +845,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 					&prop_test_remote_ble_uuids_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set COD - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set COD - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -858,7 +858,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 						&prop_test_remote_ble_cod_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set TOD - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set TOD - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -871,7 +871,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 						&prop_test_remote_ble_tod_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set RSSI - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set RSSI - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -884,7 +884,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 						&prop_test_remote_ble_rssi_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set TIMESTAMP - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set TIMESTAMP - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -897,7 +897,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 					&prop_test_remote_ble_timestamp_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set BDADDR - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set BDADDR - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -910,7 +910,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 					&prop_test_remote_ble_bdaddr_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set SERVICE_RECORD - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set SERVICE_RECORD - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -923,7 +923,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 					&prop_test_remote_ble_srvc_record_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set SCAN_MODE - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set SCAN_MODE - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -936,7 +936,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 					&prop_test_remote_ble_scanmode_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set BONDED_DEVICES - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set BONDED_DEVICES - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -949,7 +949,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 						&prop_test_ble_bonded_dev_req),
 	),
-	TEST_CASE_BREDRLE("Bt. Device Set DISCOVERY_TIMEOUT - Fail",
+	TEST_CASE_BREDRLE("Bluetooth Device Set DISCOVERY_TIMEOUT - Fail",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -962,7 +962,7 @@ static struct test_case test_cases[] = {
 		ACTION_FAIL(bt_set_device_prop_action,
 					&prop_test_remote_ble_disc_timeout_req),
 	),
-	TEST_CASE_BREDR("Bt. Create Bond PIN - Success",
+	TEST_CASE_BREDR("Bluetooth Create Bond PIN - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -985,7 +985,7 @@ static struct test_case test_cases[] = {
 		CALLBACK_BOND_STATE(BT_BOND_STATE_BONDED,
 						&prop_emu_remote_bdadr, 1),
 	),
-	TEST_CASE_BREDR("Bt. Create Bond PIN - Bad PIN",
+	TEST_CASE_BREDR("Bluetooth Create Bond PIN - Bad PIN",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -1009,7 +1009,7 @@ static struct test_case test_cases[] = {
 						&prop_emu_remote_bdadr, 1,
 						BT_STATUS_AUTH_FAILURE),
 	),
-	TEST_CASE_BREDR("Bt. Create Bond SSP -Success",
+	TEST_CASE_BREDR("Bluetooth Create Bond SSP -Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -1032,7 +1032,7 @@ static struct test_case test_cases[] = {
 		CALLBACK_BOND_STATE(BT_BOND_STATE_BONDED,
 						&prop_emu_remote_bdadr, 1),
 	),
-	TEST_CASE_BREDR("Bt. Create Bond SSP - Negative reply",
+	TEST_CASE_BREDR("Bluetooth Create Bond SSP - Negative reply",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -1056,7 +1056,7 @@ static struct test_case test_cases[] = {
 						&prop_emu_remote_bdadr, 1,
 						BT_STATUS_AUTH_FAILURE),
 	),
-	TEST_CASE_BREDR("Bt. Create Bond - No Discovery",
+	TEST_CASE_BREDR("Bluetooth Create Bond - No Discovery",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -1074,7 +1074,7 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
-	TEST_CASE_BREDR("Bt. Create Bond - Bad Address",
+	TEST_CASE_BREDR("Bluetooth Create Bond - Bad Address",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -1088,7 +1088,7 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
-	TEST_CASE_BREDR("Bt. Cancel Bonding - Success",
+	TEST_CASE_BREDR("Bluetooth Cancel Bonding - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
@@ -1113,7 +1113,7 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
-	TEST_CASE_BREDR("Bt. Remove Bond - Success",
+	TEST_CASE_BREDR("Bluetooth Remove Bond - Success",
 		ACTION_SUCCESS(bluetooth_enable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),