DPM: Fix API naming convention 27/68327/2 accepted/tizen/common/20160504.130649 accepted/tizen/ivi/20160504.115109 accepted/tizen/mobile/20160504.114614 accepted/tizen/tv/20160504.114519 accepted/tizen/wearable/20160504.114851 submit/tizen/20160504.035912
authorh.sandeep <h.sandeep@samsung.com>
Tue, 3 May 2016 11:11:20 +0000 (16:41 +0530)
committerh.sandeep <h.sandeep@samsung.com>
Wed, 4 May 2016 03:52:22 +0000 (09:22 +0530)
Change-Id: I0db8ff282158f50af605103cc2fbaea69a1ec29a
Signed-off-by: h.sandeep <h.sandeep@samsung.com>
include/mobile/bluetooth_internal.h
src/bluetooth-dpm.c
test/bt_unit_test.c

index 34abbcdee9c3e53f76c8bf411bf3b6ef219c8013..b0a1db98c2db7e2e48a5175bdf6f7b9ce03c7dd7 100644 (file)
@@ -3248,7 +3248,7 @@ int bt_dpm_get_allow_bluetooth_mode(bt_dpm_allow_e *value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_activate_bluetooth_device_restriction(bt_dpm_status_e value);
+int bt_dpm_activate_device_restriction(bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3269,7 +3269,7 @@ int bt_dpm_activate_bluetooth_device_restriction(bt_dpm_status_e value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_is_bluetooth_device_restriction_active(bt_dpm_status_e *value);
+int bt_dpm_is_device_restriction_active(bt_dpm_status_e *value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3290,7 +3290,7 @@ int bt_dpm_is_bluetooth_device_restriction_active(bt_dpm_status_e *value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_activate_bluetoooth_uuid_restriction(bt_dpm_status_e value);
+int bt_dpm_activate_uuid_restriction(bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3311,7 +3311,7 @@ int bt_dpm_activate_bluetoooth_uuid_restriction(bt_dpm_status_e value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_is_bluetooth_uuid_restriction_active(bt_dpm_status_e *value);
+int bt_dpm_is_uuid_restriction_active(bt_dpm_status_e *value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3330,7 +3330,7 @@ int bt_dpm_is_bluetooth_uuid_restriction_active(bt_dpm_status_e *value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_add_bluetooth_devices_to_blacklist(const char *device_address);
+int bt_dpm_add_devices_to_blacklist(const char *device_address);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3349,7 +3349,7 @@ int bt_dpm_add_bluetooth_devices_to_blacklist(const char *device_address);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_add_bluetooth_devices_to_whitelist(const char *device_address);
+int bt_dpm_add_devices_to_whitelist(const char *device_address);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3368,7 +3368,7 @@ int bt_dpm_add_bluetooth_devices_to_whitelist(const char *device_address);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_add_bluetooth_uuids_to_blacklist(const char *service_uuid);
+int bt_dpm_add_uuids_to_blacklist(const char *service_uuid);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3387,7 +3387,7 @@ int bt_dpm_add_bluetooth_uuids_to_blacklist(const char *service_uuid);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_add_bluetooth_uuids_to_whitelist(const char *service_uuid);
+int bt_dpm_add_uuids_to_whitelist(const char *service_uuid);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3406,7 +3406,7 @@ int bt_dpm_add_bluetooth_uuids_to_whitelist(const char *service_uuid);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_clear_bluetooth_devices_from_blacklist(void);
+int bt_dpm_clear_devices_from_blacklist(void);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3425,7 +3425,7 @@ int bt_dpm_clear_bluetooth_devices_from_blacklist(void);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_clear_bluetooth_devices_from_whitelist(void);
+int bt_dpm_clear_devices_from_whitelist(void);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3444,7 +3444,7 @@ int bt_dpm_clear_bluetooth_devices_from_whitelist(void);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_clear_bluetooth_uuids_from_blacklist(void);
+int bt_dpm_clear_uuids_from_blacklist(void);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3463,7 +3463,7 @@ int bt_dpm_clear_bluetooth_uuids_from_blacklist(void);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_clear_bluetooth_uuids_from_whitelist(void);
+int bt_dpm_clear_uuids_from_whitelist(void);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3482,7 +3482,7 @@ int bt_dpm_clear_bluetooth_uuids_from_whitelist(void);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_devices_from_blacklist(bt_dpm_device_list_s **device_list);
+int bt_dpm_get_devices_from_blacklist(bt_dpm_device_list_s **device_list);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3501,7 +3501,7 @@ int bt_dpm_get_bluetooth_devices_from_blacklist(bt_dpm_device_list_s **device_li
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_devices_from_whitelist(bt_dpm_device_list_s **device_list);
+int bt_dpm_get_devices_from_whitelist(bt_dpm_device_list_s **device_list);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3520,7 +3520,7 @@ int bt_dpm_get_bluetooth_devices_from_whitelist(bt_dpm_device_list_s **device_li
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list);
+int bt_dpm_get_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3539,7 +3539,7 @@ int bt_dpm_get_bluetooth_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list);
+int bt_dpm_get_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3558,7 +3558,7 @@ int bt_dpm_get_bluetooth_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_remove_bluetooth_device_from_whitelist(const char *device_address);
+int bt_dpm_remove_device_from_whitelist(const char *device_address);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3577,7 +3577,7 @@ int bt_dpm_remove_bluetooth_device_from_whitelist(const char *device_address);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_remove_bluetooth_device_from_blacklist(const char *device_address);
+int bt_dpm_remove_device_from_blacklist(const char *device_address);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3596,7 +3596,7 @@ int bt_dpm_remove_bluetooth_device_from_blacklist(const char *device_address);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_remove_bluetooth_uuid_from_whitelist(const char *service_uuid);
+int bt_dpm_remove_uuid_from_whitelist(const char *service_uuid);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3615,7 +3615,7 @@ int bt_dpm_remove_bluetooth_uuid_from_whitelist(const char *service_uuid);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_remove_bluetooth_uuid_from_blacklist(const char *service_uuid);
+int bt_dpm_remove_uuid_from_blacklist(const char *service_uuid);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3636,7 +3636,7 @@ int bt_dpm_remove_bluetooth_uuid_from_blacklist(const char *service_uuid);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_set_allow_bluetooth_outgoing_call(bt_dpm_status_e value);
+int bt_dpm_set_allow_outgoing_call(bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3657,7 +3657,7 @@ int bt_dpm_set_allow_bluetooth_outgoing_call(bt_dpm_status_e value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_allow_bluetooth_outgoing_call(bt_dpm_status_e *value);
+int bt_dpm_get_allow_outgoing_call(bt_dpm_status_e *value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3678,7 +3678,7 @@ int bt_dpm_get_allow_bluetooth_outgoing_call(bt_dpm_status_e *value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_set_bluetooth_pairing_state(bt_dpm_status_e value);
+int bt_dpm_set_pairing_state(bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3699,7 +3699,7 @@ int bt_dpm_set_bluetooth_pairing_state(bt_dpm_status_e value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_pairing_state(bt_dpm_status_e *value);
+int bt_dpm_get_pairing_state(bt_dpm_status_e *value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3729,7 +3729,7 @@ int bt_dpm_get_bluetooth_pairing_state(bt_dpm_status_e *value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_set_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e value);
+int bt_dpm_set_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3762,7 +3762,7 @@ int bt_dpm_set_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e *value);
+int bt_dpm_get_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e *value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3783,7 +3783,7 @@ int bt_dpm_get_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_set_bluetooth_desktop_connectivity_state(bt_dpm_status_e value);
+int bt_dpm_set_desktop_connectivity_state(bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3804,7 +3804,7 @@ int bt_dpm_set_bluetooth_desktop_connectivity_state(bt_dpm_status_e value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_desktop_connectivity_state(bt_dpm_status_e *value);
+int bt_dpm_get_desktop_connectivity_state(bt_dpm_status_e *value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3825,7 +3825,7 @@ int bt_dpm_get_bluetooth_desktop_connectivity_state(bt_dpm_status_e *value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_set_bluetooth_discoverable_state(bt_dpm_status_e value);
+int bt_dpm_set_discoverable_state(bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3846,7 +3846,7 @@ int bt_dpm_set_bluetooth_discoverable_state(bt_dpm_status_e value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_discoverable_state(bt_dpm_status_e *value);
+int bt_dpm_get_discoverable_state(bt_dpm_status_e *value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3868,7 +3868,7 @@ int bt_dpm_get_bluetooth_discoverable_state(bt_dpm_status_e *value);
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
 
-int bt_dpm_set_bluetooth_limited_discoverable_state(bt_dpm_status_e value);
+int bt_dpm_set_limited_discoverable_state(bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3889,7 +3889,7 @@ int bt_dpm_set_bluetooth_limited_discoverable_state(bt_dpm_status_e value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_limited_discoverable_state(bt_dpm_status_e *value);
+int bt_dpm_get_limited_discoverable_state(bt_dpm_status_e *value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3910,7 +3910,7 @@ int bt_dpm_get_bluetooth_limited_discoverable_state(bt_dpm_status_e *value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_set_bluetooth_data_transfer_state(bt_dpm_status_e value);
+int bt_dpm_set_data_transfer_state(bt_dpm_status_e value);
 
 /**
  * @ingroup CAPI_NETWORK_BLUETOOTH_DPM_MODULE
@@ -3931,7 +3931,7 @@ int bt_dpm_set_bluetooth_data_transfer_state(bt_dpm_status_e value);
  * @pre bt_dpm_set_allow_bluetooth_mode must be allowed.
  * @see bt_dpm_get_allow_bluetooth_mode()
  */
-int bt_dpm_get_bluetooth_data_transfer_state(bt_dpm_status_e *value);
+int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value);
 
 /**
  * @}
index 5cc906ab9309b3c97dbaf56b9c4a28b8e9fd2baa..5ce33268f04958527b82e9b53d5a9de46109e883 100644 (file)
@@ -53,7 +53,7 @@ int bt_dpm_set_allow_bluetooth_mode(bt_dpm_allow_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_allow_bluetooth_mode(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_allow_mode(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -67,7 +67,7 @@ int bt_dpm_get_allow_bluetooth_mode(bt_dpm_allow_e *value)
 
        BT_CHECK_BT_SUPPORT();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_allow_bluetooth_mode(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_allow_mode(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -75,7 +75,7 @@ int bt_dpm_get_allow_bluetooth_mode(bt_dpm_allow_e *value)
        return error_code;
 }
 
-int bt_dpm_activate_bluetooth_device_restriction(bt_dpm_status_e value)
+int bt_dpm_activate_device_restriction(bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -83,14 +83,14 @@ int bt_dpm_activate_bluetooth_device_restriction(bt_dpm_status_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_activate_bluetooth_device_restriction(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_activate_device_restriction(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_is_bluetooth_device_restriction_active(bt_dpm_status_e *value)
+int bt_dpm_is_device_restriction_active(bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -98,7 +98,7 @@ int bt_dpm_is_bluetooth_device_restriction_active(bt_dpm_status_e *value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_is_bluetooth_device_restriction_active(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_is_device_restriction_active(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -106,7 +106,7 @@ int bt_dpm_is_bluetooth_device_restriction_active(bt_dpm_status_e *value)
        return error_code;
 }
 
-int bt_dpm_activate_bluetoooth_uuid_restriction(bt_dpm_status_e value)
+int bt_dpm_activate_uuid_restriction(bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -114,14 +114,14 @@ int bt_dpm_activate_bluetoooth_uuid_restriction(bt_dpm_status_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_activate_bluetoooth_uuid_restriction(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_activate_uuid_restriction(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_is_bluetooth_uuid_restriction_active(bt_dpm_status_e *value)
+int bt_dpm_is_uuid_restriction_active(bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -129,7 +129,7 @@ int bt_dpm_is_bluetooth_uuid_restriction_active(bt_dpm_status_e *value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_is_bluetooth_uuid_restriction_active(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_is_uuid_restriction_active(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -137,7 +137,7 @@ int bt_dpm_is_bluetooth_uuid_restriction_active(bt_dpm_status_e *value)
        return error_code;
 }
 
-int bt_dpm_add_bluetooth_devices_to_blacklist(const char *device_address)
+int bt_dpm_add_devices_to_blacklist(const char *device_address)
 {
        bluetooth_device_address_t addr_hex = { {0,} };
        int error_code = BT_ERROR_NONE;
@@ -147,14 +147,14 @@ int bt_dpm_add_bluetooth_devices_to_blacklist(const char *device_address)
        BT_CHECK_INPUT_PARAMETER(device_address);
 
        _bt_convert_address_to_hex(&addr_hex, device_address);
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_bluetooth_devices_to_blacklist(&addr_hex));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_devices_to_blacklist(&addr_hex));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_add_bluetooth_devices_to_whitelist(const char *device_address)
+int bt_dpm_add_devices_to_whitelist(const char *device_address)
 {
        bluetooth_device_address_t addr_hex = { {0,} };
        int error_code = BT_ERROR_NONE;
@@ -164,91 +164,91 @@ int bt_dpm_add_bluetooth_devices_to_whitelist(const char *device_address)
        BT_CHECK_INPUT_PARAMETER(device_address);
 
        _bt_convert_address_to_hex(&addr_hex, device_address);
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_bluetooth_devices_to_whitelist(&addr_hex));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_devices_to_whitelist(&addr_hex));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_add_bluetooth_uuids_to_blacklist(const char *service_uuid)
+int bt_dpm_add_uuids_to_blacklist(const char *service_uuid)
 {
        int error_code = BT_ERROR_NONE;
 
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_bluetooth_uuids_to_blacklist(service_uuid));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_uuids_to_blacklist(service_uuid));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_add_bluetooth_uuids_to_whitelist(const char *service_uuid)
+int bt_dpm_add_uuids_to_whitelist(const char *service_uuid)
 {
        int error_code = BT_ERROR_NONE;
 
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_bluetooth_uuids_to_whitelist(service_uuid));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_add_uuids_to_whitelist(service_uuid));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_clear_bluetooth_devices_from_blacklist(void)
+int bt_dpm_clear_devices_from_blacklist(void)
 {
        int error_code = BT_ERROR_NONE;
 
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_bluetooth_devices_from_blacklist());
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_devices_from_blacklist());
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_clear_bluetooth_devices_from_whitelist(void)
+int bt_dpm_clear_devices_from_whitelist(void)
 {
        int error_code = BT_ERROR_NONE;
 
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_bluetooth_devices_from_whitelist());
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_devices_from_whitelist());
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_clear_bluetooth_uuids_from_blacklist(void)
+int bt_dpm_clear_uuids_from_blacklist(void)
 {
        int error_code = BT_ERROR_NONE;
 
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_bluetooth_uuids_from_blacklist());
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_uuids_from_blacklist());
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_clear_bluetooth_uuids_from_whitelist(void)
+int bt_dpm_clear_uuids_from_whitelist(void)
 {
        int error_code = BT_ERROR_NONE;
 
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_bluetooth_uuids_from_whitelist());
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_clear_uuids_from_whitelist());
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -280,7 +280,7 @@ static int __bt_get_bt_dpm_device_list_info_s(bt_dpm_device_list_s **device_info
        return BT_ERROR_NONE;
 }
 
-int bt_dpm_get_bluetooth_devices_from_blacklist(bt_dpm_device_list_s **device_list)
+int bt_dpm_get_devices_from_blacklist(bt_dpm_device_list_s **device_list)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_device_list_t dev_list;
@@ -288,7 +288,7 @@ int bt_dpm_get_bluetooth_devices_from_blacklist(bt_dpm_device_list_s **device_li
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_devices_from_blacklist(&dev_list));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_devices_from_blacklist(&dev_list));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -297,7 +297,7 @@ int bt_dpm_get_bluetooth_devices_from_blacklist(bt_dpm_device_list_s **device_li
        return error_code;
 }
 
-int bt_dpm_get_bluetooth_devices_from_whitelist(bt_dpm_device_list_s **device_list)
+int bt_dpm_get_devices_from_whitelist(bt_dpm_device_list_s **device_list)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_device_list_t dev_list;
@@ -305,7 +305,7 @@ int bt_dpm_get_bluetooth_devices_from_whitelist(bt_dpm_device_list_s **device_li
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_devices_from_whitelist(&dev_list));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_devices_from_whitelist(&dev_list));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -343,7 +343,7 @@ static int __bt_get_bt_dpm_uuid_list_info_s(bt_dpm_uuids_list_s **uuid_list, bt_
        return BT_ERROR_NONE;
 }
 
-int bt_dpm_get_bluetooth_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list)
+int bt_dpm_get_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_uuids_list_t uuids;
@@ -351,7 +351,7 @@ int bt_dpm_get_bluetooth_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_uuids_from_blacklist(&uuids));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_uuids_from_blacklist(&uuids));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -360,7 +360,7 @@ int bt_dpm_get_bluetooth_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list)
        return error_code;
 }
 
-int bt_dpm_get_bluetooth_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list)
+int bt_dpm_get_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_uuids_list_t uuids;
@@ -368,7 +368,7 @@ int bt_dpm_get_bluetooth_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_uuids_from_whitelist(&uuids));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_uuids_from_whitelist(&uuids));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -377,7 +377,7 @@ int bt_dpm_get_bluetooth_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list)
        return error_code;
 }
 
-int bt_dpm_remove_bluetooth_device_from_whitelist(const char *device_address)
+int bt_dpm_remove_device_from_whitelist(const char *device_address)
 {
        bluetooth_device_address_t addr_hex = { {0,} };
        int error_code = BT_ERROR_NONE;
@@ -387,14 +387,14 @@ int bt_dpm_remove_bluetooth_device_from_whitelist(const char *device_address)
        BT_CHECK_INPUT_PARAMETER(device_address);
 
        _bt_convert_address_to_hex(&addr_hex, device_address);
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_bluetooth_device_from_whitelist(&addr_hex));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_device_from_whitelist(&addr_hex));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_remove_bluetooth_device_from_blacklist(const char *device_address)
+int bt_dpm_remove_device_from_blacklist(const char *device_address)
 {
        bluetooth_device_address_t addr_hex = { {0,} };
        int error_code = BT_ERROR_NONE;
@@ -404,42 +404,42 @@ int bt_dpm_remove_bluetooth_device_from_blacklist(const char *device_address)
        BT_CHECK_INPUT_PARAMETER(device_address);
 
        _bt_convert_address_to_hex(&addr_hex, device_address);
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_bluetooth_device_from_blacklist(&addr_hex));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_device_from_blacklist(&addr_hex));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_remove_bluetooth_uuid_from_whitelist(const char *service_uuid)
+int bt_dpm_remove_uuid_from_whitelist(const char *service_uuid)
 {
        int error_code = BT_ERROR_NONE;
 
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_bluetooth_uuid_from_whitelist(service_uuid));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_uuid_from_whitelist(service_uuid));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_remove_bluetooth_uuid_from_blacklist(const char *service_uuid)
+int bt_dpm_remove_uuid_from_blacklist(const char *service_uuid)
 {
        int error_code = BT_ERROR_NONE;
 
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_bluetooth_uuid_from_blacklist(service_uuid));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_remove_uuid_from_blacklist(service_uuid));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_set_allow_bluetooth_outgoing_call(bt_dpm_status_e value)
+int bt_dpm_set_allow_outgoing_call(bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -447,14 +447,14 @@ int bt_dpm_set_allow_bluetooth_outgoing_call(bt_dpm_status_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_allow_bluetooth_outgoing_call(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_allow_outgoing_call(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_get_allow_bluetooth_outgoing_call(bt_dpm_status_e *value)
+int bt_dpm_get_allow_outgoing_call(bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -462,7 +462,7 @@ int bt_dpm_get_allow_bluetooth_outgoing_call(bt_dpm_status_e *value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_allow_bluetooth_outgoing_call(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_allow_outgoing_call(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -470,7 +470,7 @@ int bt_dpm_get_allow_bluetooth_outgoing_call(bt_dpm_status_e *value)
        return error_code;
 }
 
-int bt_dpm_set_bluetooth_pairing_state(bt_dpm_status_e value)
+int bt_dpm_set_pairing_state(bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -478,14 +478,14 @@ int bt_dpm_set_bluetooth_pairing_state(bt_dpm_status_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_bluetooth_pairing_state(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_pairing_state(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_get_bluetooth_pairing_state(bt_dpm_status_e *value)
+int bt_dpm_get_pairing_state(bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -493,7 +493,7 @@ int bt_dpm_get_bluetooth_pairing_state(bt_dpm_status_e *value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_pairing_state(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_pairing_state(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -501,7 +501,7 @@ int bt_dpm_get_bluetooth_pairing_state(bt_dpm_status_e *value)
        return error_code;
 }
 
-int bt_dpm_set_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e value)
+int bt_dpm_set_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -510,14 +510,14 @@ int bt_dpm_set_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_bluetooth_profile_state(dpm_profile, dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_profile_state(dpm_profile, dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_get_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e *value)
+int bt_dpm_get_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -525,7 +525,7 @@ int bt_dpm_get_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_profile_state(profile, &dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_profile_state(profile, &dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -533,7 +533,7 @@ int bt_dpm_get_bluetooth_profile_state(bt_dpm_profile_e profile, bt_dpm_status_e
        return error_code;
 }
 
-int bt_dpm_set_bluetooth_desktop_connectivity_state(bt_dpm_status_e value)
+int bt_dpm_set_desktop_connectivity_state(bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -541,14 +541,14 @@ int bt_dpm_set_bluetooth_desktop_connectivity_state(bt_dpm_status_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_bluetooth_desktop_connectivity_state(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_desktop_connectivity_state(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_get_bluetooth_desktop_connectivity_state(bt_dpm_status_e *value)
+int bt_dpm_get_desktop_connectivity_state(bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -556,7 +556,7 @@ int bt_dpm_get_bluetooth_desktop_connectivity_state(bt_dpm_status_e *value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_desktop_connectivity_state(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_desktop_connectivity_state(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -564,7 +564,7 @@ int bt_dpm_get_bluetooth_desktop_connectivity_state(bt_dpm_status_e *value)
        return error_code;
 }
 
-int bt_dpm_set_bluetooth_discoverable_state(bt_dpm_status_e value)
+int bt_dpm_set_discoverable_state(bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -572,14 +572,14 @@ int bt_dpm_set_bluetooth_discoverable_state(bt_dpm_status_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_bluetooth_discoverable_state(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_discoverable_state(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_get_bluetooth_discoverable_state(bt_dpm_status_e *value)
+int bt_dpm_get_discoverable_state(bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -587,7 +587,7 @@ int bt_dpm_get_bluetooth_discoverable_state(bt_dpm_status_e *value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_discoverable_state(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_discoverable_state(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -595,7 +595,7 @@ int bt_dpm_get_bluetooth_discoverable_state(bt_dpm_status_e *value)
        return error_code;
 }
 
-int bt_dpm_set_bluetooth_limited_discoverable_state(bt_dpm_status_e value)
+int bt_dpm_set_limited_discoverable_state(bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -603,14 +603,14 @@ int bt_dpm_set_bluetooth_limited_discoverable_state(bt_dpm_status_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_bluetooth_limited_discoverable_state(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_limited_discoverable_state(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_get_bluetooth_limited_discoverable_state(bt_dpm_status_e *value)
+int bt_dpm_get_limited_discoverable_state(bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -618,7 +618,7 @@ int bt_dpm_get_bluetooth_limited_discoverable_state(bt_dpm_status_e *value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_limited_discoverable_state(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_limited_discoverable_state(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
@@ -626,7 +626,7 @@ int bt_dpm_get_bluetooth_limited_discoverable_state(bt_dpm_status_e *value)
        return error_code;
 }
 
-int bt_dpm_set_bluetooth_data_transfer_state(bt_dpm_status_e value)
+int bt_dpm_set_data_transfer_state(bt_dpm_status_e value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = value;
@@ -634,14 +634,14 @@ int bt_dpm_set_bluetooth_data_transfer_state(bt_dpm_status_e value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_bluetooth_data_transfer_state(dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_set_data_transfer_state(dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
        return error_code;
 }
 
-int bt_dpm_get_bluetooth_data_transfer_state(bt_dpm_status_e *value)
+int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value)
 {
        int error_code = BT_ERROR_NONE;
        bt_dpm_status_t dpm_value = BLUETOOTH_DPM_STATUS_ERROR;
@@ -649,7 +649,7 @@ int bt_dpm_get_bluetooth_data_transfer_state(bt_dpm_status_e *value)
        BT_CHECK_BT_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_bluetooth_data_transfer_state(&dpm_value));
+       error_code = _bt_dpm_get_error_code(bluetooth_dpm_get_data_transfer_state(&dpm_value));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
        *value = dpm_value;
index f65f7bf650b4de569ac0bee61bff8af827302c4b..063adbeccd7426cd2d2e03df0cdebf32357a022e 100644 (file)
@@ -839,73 +839,73 @@ tc_table_t tc_DPM[] = {
                , BT_UNIT_TEST_FUNCTION_DPM_SET_ALLOW_BLUETOOTH_MODE},
        {"bt_dpm_get_allow_bluetooth_mode"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_ALLOW_BLUETOOTH_MODE},
-       {"bt_dpm_activate_bluetooth_device_restriction"
+       {"bt_dpm_activate_device_restriction"
                , BT_UNIT_TEST_FUNCTION_DPM_ACTIVATE_DEVICE_RESTRICTION},
-       {"bt_dpm_is_bluetooth_device_restriction_active"
+       {"bt_dpm_is_device_restriction_active"
                , BT_UNIT_TEST_FUNCTION_DPM_IS_DEVICE_RESTRICTIO_ACTIVATE},
        {"bt_dpm_activate_bluetoooth_uuid_restriction"
                , BT_UNIT_TEST_FUNCTION_DPM_ACTIVATE_UUID_RESTRICTION},
-       {"bt_dpm_is_bluetooth_uuid_restriction_active"
+       {"bt_dpm_is_uuid_restriction_active"
                , BT_UNIT_TEST_FUNCTION_DPM_IS_UUID_RESTRICTIO_ACTIVATE},
-       {"bt_dpm_add_bluetooth_devices_to_blacklist"
+       {"bt_dpm_add_devices_to_blacklist"
                , BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLACKLIST},
-       {"bt_dpm_add_bluetooth_devices_to_whitelist"
+       {"bt_dpm_add_devices_to_whitelist"
                , BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_WHITELIST},
-       {"bt_dpm_add_bluetooth_uuids_to_blacklist"
+       {"bt_dpm_add_uuids_to_blacklist"
                , BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLACKLIST},
-       {"bt_dpm_add_bluetooth_uuids_to_whitelist"
+       {"bt_dpm_add_uuids_to_whitelist"
                , BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_WHITELIST},
-       {"bt_dpm_get_bluetooth_devices_from_blacklist"
+       {"bt_dpm_get_devices_from_blacklist"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_BLACKLIST},
-       {"bt_dpm_get_bluetooth_devices_from_whitelist"
+       {"bt_dpm_get_devices_from_whitelist"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_WHITELIST},
-       {"bt_dpm_get_bluetooth_uuids_from_blacklist"
+       {"bt_dpm_get_uuids_from_blacklist"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_BLACKLIST},
-       {"bt_dpm_get_bluetooth_uuids_from_whitelist"
+       {"bt_dpm_get_uuids_from_whitelist"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_WHITELIST},
-       {"bt_dpm_clear_bluetooth_devices_from_blacklist"
+       {"bt_dpm_clear_devices_from_blacklist"
                , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_BLACKLIST},
-       {"bt_dpm_clear_bluetooth_devices_from_whitelist"
+       {"bt_dpm_clear_devices_from_whitelist"
                , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_WHITELIST},
-       {"bt_dpm_clear_bluetooth_uuids_from_blacklist"
+       {"bt_dpm_clear_uuids_from_blacklist"
                , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_BLACKLIST},
-       {"bt_dpm_clear_bluetooth_uuids_from_whitelist"
+       {"bt_dpm_clear_uuids_from_whitelist"
                , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_WHITELIST},
-       {"bt_dpm_remove_bluetooth_device_from_blacklist"
+       {"bt_dpm_remove_device_from_blacklist"
                , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLACKLIST},
-       {"bt_dpm_remove_bluetooth_device_from_whitelist"
+       {"bt_dpm_remove_device_from_whitelist"
                , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_WHITELIST},
-       {"bt_dpm_remove_bluetooth_uuid_from_blacklist"
+       {"bt_dpm_remove_uuid_from_blacklist"
                , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLACKLIST},
-       {"bt_dpm_remove_bluetooth_uuid_from_whitelist"
+       {"bt_dpm_remove_uuid_from_whitelist"
                , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_WHITELIST},
-       {"bt_dpm_set_allow_bluetooth_outgoing_call"
+       {"bt_dpm_set_allow_outgoing_call"
                , BT_UNIT_TEST_FUNCTION_DPM_SET_ALLOW_OUTGOING_CALL},
-       {"bt_dpm_get_allow_bluetooth_outgoing_call"
+       {"bt_dpm_get_allow_outgoing_call"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_ALLOW_OUTGOING_CALL},
-       {"bt_dpm_set_bluetooth_pairing_state"
+       {"bt_dpm_set_pairing_state"
                , BT_UNIT_TEST_FUNCTION_DPM_SET_PAIRING_STATE},
-       {"bt_dpm_get_bluetooth_pairing_state"
+       {"bt_dpm_get_pairing_state"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_PAIRING_STATE},
-       {"bt_dpm_set_bluetooth_profile_state"
+       {"bt_dpm_set_profile_state"
                , BT_UNIT_TEST_FUNCTION_DPM_SET_PROFILE_STATE},
-       {"bt_dpm_get_bluetooth_profile_state"
+       {"bt_dpm_get_profile_state"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_PROFILE_STATE},
-       {"bt_dpm_set_bluetooth_desktop_connectivity_state"
+       {"bt_dpm_set_desktop_connectivity_state"
                , BT_UNIT_TEST_FUNCTION_DPM_SET_DESKTOP_CONNECTIVITY_STATE},
-       {"bt_dpm_get_bluetooth_desktop_connectivity_state"
+       {"bt_dpm_get_desktop_connectivity_state"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_DESKTOP_CONNECTIVITY_STATE},
-       {"bt_dpm_set_bluetooth_discoverable_state"
+       {"bt_dpm_set_discoverable_state"
                , BT_UNIT_TEST_FUNCTION_DPM_SET_DISCOVERABLE_STATE},
-       {"bt_dpm_get_bluetooth_discoverable_state"
+       {"bt_dpm_get_discoverable_state"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_DISCOVERABLE_STATE},
-       {"bt_dpm_set_bluetooth_limited_discoverable_state"
+       {"bt_dpm_set_limited_discoverable_state"
                , BT_UNIT_TEST_FUNCTION_DPM_SET_LIMITED_DISCOVERABLE_STATE},
-       {"bt_dpm_get_bluetooth_limited_discoverable_state"
+       {"bt_dpm_get_limited_discoverable_state"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_LIMITED_DISCOVERABLE_STATE},
-       {"bt_dpm_set_bluetooth_data_transfer_state"
+       {"bt_dpm_set_data_transfer_state"
                , BT_UNIT_TEST_FUNCTION_DPM_SET_DATA_TRANSFER_STATE},
-       {"bt_dpm_get_bluetooth_data_transfer_state"
+       {"bt_dpm_get_data_transfer_state"
                , BT_UNIT_TEST_FUNCTION_DPM_GET_DATA_TRANSFER_STATE},
        {"Select this menu to set parameters and then select the function again."
                , BT_UNIT_TEST_FUNCTION_ACTIVATE_FLAG_TO_SET_PARAMETERS},
@@ -7542,85 +7542,85 @@ int test_input_callback(void *data)
                        TC_PRT("bt_dpm_set_allow_bluetooth_mode : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_activate_bluetooth_device_restriction(BT_DPM_BT_ALLOWED);
+                       ret = bt_dpm_activate_device_restriction(BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_activate_bluetooth_device_restriction : returns %s\n",
+                       TC_PRT("bt_dpm_activate_device_restriction : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_activate_bluetoooth_uuid_restriction(BT_DPM_BT_ALLOWED);
+                       ret = bt_dpm_activate_uuid_restriction(BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_activate_bluetoooth_uuid_restriction : returns %s\n",
+                       TC_PRT("bt_dpm_activate_uuid_restriction : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_set_allow_bluetooth_outgoing_call(BT_DPM_BT_ALLOWED);
+                       ret = bt_dpm_set_allow_outgoing_call(BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_set_allow_bluetooth_outgoing_call : returns %s\n",
+                       TC_PRT("bt_dpm_set_allow_outgoing_call : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_set_bluetooth_pairing_state(BT_DPM_BT_ALLOWED);
+                       ret = bt_dpm_set_pairing_state(BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_set_bluetooth_pairing_state : returns %s\n",
+                       TC_PRT("bt_dpm_set_pairing_state : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_set_bluetooth_profile_state(BT_DPM_POLICY_HFP_PROFILE_STATE,
+                       ret = bt_dpm_set_profile_state(BT_DPM_POLICY_HFP_PROFILE_STATE,
                                                                BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_set_bluetooth_profile_state : returns %s\n",
+                       TC_PRT("bt_dpm_set_profile_state : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_set_bluetooth_desktop_connectivity_state(BT_DPM_BT_ALLOWED);
+                       ret = bt_dpm_set_desktop_connectivity_state(BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_set_bluetooth_desktop_connectivity_state : returns %s\n",
+                       TC_PRT("bt_dpm_set_desktop_connectivity_state : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_set_bluetooth_discoverable_state(BT_DPM_BT_ALLOWED);
+                       ret = bt_dpm_set_discoverable_state(BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_set_bluetooth_discoverable_state : returns %s\n",
+                       TC_PRT("bt_dpm_set_discoverable_state : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_set_bluetooth_limited_discoverable_state(BT_DPM_BT_ALLOWED);
+                       ret = bt_dpm_set_limited_discoverable_state(BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_set_bluetooth_limited_discoverable_state : returns %s\n",
+                       TC_PRT("bt_dpm_set_limited_discoverable_state : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_set_bluetooth_data_transfer_state(BT_DPM_BT_ALLOWED);
+                       ret = bt_dpm_set_data_transfer_state(BT_DPM_BT_ALLOWED);
 
-                       TC_PRT("bt_dpm_set_bluetooth_data_transfer_state : returns %s\n",
+                       TC_PRT("bt_dpm_set_data_transfer_state : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_whitelist(spp_uuid);
+                       ret = bt_dpm_add_uuids_to_whitelist(spp_uuid);
 
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_whitelist : returns %s\n",
+                       TC_PRT("bt_dpm_add_uuids_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_whitelist(opp_uuid);
+                       ret = bt_dpm_add_uuids_to_whitelist(opp_uuid);
 
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_whitelist : returns %s\n",
+                       TC_PRT("bt_dpm_add_uuids_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_whitelist(hid_uuid);
+                       ret = bt_dpm_add_uuids_to_whitelist(hid_uuid);
 
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_whitelist : returns %s\n",
+                       TC_PRT("bt_dpm_add_uuids_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_whitelist(hfp_uuid);
+                       ret = bt_dpm_add_uuids_to_whitelist(hfp_uuid);
 
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_whitelist : returns %s\n",
+                       TC_PRT("bt_dpm_add_uuids_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_whitelist(hsp_uuid);
+                       ret = bt_dpm_add_uuids_to_whitelist(hsp_uuid);
 
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_whitelist : returns %s\n",
+                       TC_PRT("bt_dpm_add_uuids_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_whitelist(a2dp_uuid);
+                       ret = bt_dpm_add_uuids_to_whitelist(a2dp_uuid);
 
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_whitelist : returns %s\n",
+                       TC_PRT("bt_dpm_add_uuids_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_whitelist(avrcp_target_uuid);
+                       ret = bt_dpm_add_uuids_to_whitelist(avrcp_target_uuid);
 
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_whitelist : returns %s\n",
+                       TC_PRT("bt_dpm_add_uuids_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
                }
@@ -7653,16 +7653,16 @@ int test_input_callback(void *data)
                        }
                        value = atoi(g_test_param.params[0]);
 
-                       ret = bt_dpm_activate_bluetooth_device_restriction(value);
-                       TC_PRT("bt_dpm_activate_bluetooth_device_restriction : returns %s\n",
+                       ret = bt_dpm_activate_device_restriction(value);
+                       TC_PRT("bt_dpm_activate_device_restriction : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_IS_DEVICE_RESTRICTIO_ACTIVATE: {
                        bt_dpm_status_e value = BT_DPM_STATUS_ERROR;
-                       ret = bt_dpm_is_bluetooth_device_restriction_active(&value);
-                       TC_PRT("bt_dpm_is_bluetooth_device_restriction_active : allow: %d, returns %s\n",
+                       ret = bt_dpm_is_device_restriction_active(&value);
+                       TC_PRT("bt_dpm_is_device_restriction_active : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        break;
                }
@@ -7674,16 +7674,16 @@ int test_input_callback(void *data)
                        }
                        value = atoi(g_test_param.params[0]);
 
-                       ret = bt_dpm_activate_bluetoooth_uuid_restriction(value);
-                       TC_PRT("bt_dpm_activate_bluetoooth_uuid_restriction : returns %s\n",
+                       ret = bt_dpm_activate_uuid_restriction(value);
+                       TC_PRT("bt_dpm_activate_uuid_restriction : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_IS_UUID_RESTRICTIO_ACTIVATE: {
                        bt_dpm_status_e value = BT_DPM_STATUS_ERROR;
-                       ret = bt_dpm_is_bluetooth_uuid_restriction_active(&value);
-                       TC_PRT("bt_dpm_is_bluetooth_uuid_restriction_active : allow: %d, returns %s\n",
+                       ret = bt_dpm_is_uuid_restriction_active(&value);
+                       TC_PRT("bt_dpm_is_uuid_restriction_active : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        break;
                }
@@ -7693,8 +7693,8 @@ int test_input_callback(void *data)
                                        break;
                        }
 
-                       ret = bt_dpm_add_bluetooth_devices_to_blacklist(g_test_param.params[0]);
-                       TC_PRT("bt_dpm_add_bluetooth_devices_to_blacklist : returns %s\n",
+                       ret = bt_dpm_add_devices_to_blacklist(g_test_param.params[0]);
+                       TC_PRT("bt_dpm_add_devices_to_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7704,8 +7704,8 @@ int test_input_callback(void *data)
                                        break;
                        }
 
-                       ret = bt_dpm_add_bluetooth_devices_to_whitelist(g_test_param.params[0]);
-                       TC_PRT("bt_dpm_add_bluetooth_devices_to_whitelist : returns %s\n",
+                       ret = bt_dpm_add_devices_to_whitelist(g_test_param.params[0]);
+                       TC_PRT("bt_dpm_add_devices_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7715,8 +7715,8 @@ int test_input_callback(void *data)
                                        break;
                        }
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_blacklist(g_test_param.params[0]);
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_blacklist : returns %s\n",
+                       ret = bt_dpm_add_uuids_to_blacklist(g_test_param.params[0]);
+                       TC_PRT("bt_dpm_add_uuids_to_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7726,8 +7726,8 @@ int test_input_callback(void *data)
                                        break;
                        }
 
-                       ret = bt_dpm_add_bluetooth_uuids_to_whitelist(g_test_param.params[0]);
-                       TC_PRT("bt_dpm_add_bluetooth_uuids_to_whitelist : returns %s\n",
+                       ret = bt_dpm_add_uuids_to_whitelist(g_test_param.params[0]);
+                       TC_PRT("bt_dpm_add_uuids_to_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7735,8 +7735,8 @@ int test_input_callback(void *data)
                        bt_dpm_device_list_s *device_list = NULL;
                        int i = 0;
                        char *str = NULL;
-                       ret = bt_dpm_get_bluetooth_devices_from_blacklist(&device_list);
-                       TC_PRT("bt_dpm_get_bluetooth_devices_from_blacklist : returns %s\n",
+                       ret = bt_dpm_get_devices_from_blacklist(&device_list);
+                       TC_PRT("bt_dpm_get_devices_from_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        if (device_list) {
                                TC_PRT("list len %d", device_list->count);
@@ -7754,8 +7754,8 @@ int test_input_callback(void *data)
                        bt_dpm_device_list_s *device_list = NULL;
                        int i = 0;
                        char *str = NULL;
-                       ret = bt_dpm_get_bluetooth_devices_from_whitelist(&device_list);
-                       TC_PRT("bt_dpm_get_bluetooth_devices_from_whitelist : returns %s\n",
+                       ret = bt_dpm_get_devices_from_whitelist(&device_list);
+                       TC_PRT("bt_dpm_get_devices_from_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
 
                        if (device_list) {
@@ -7774,8 +7774,8 @@ int test_input_callback(void *data)
                        bt_dpm_uuids_list_s *uuids_list = NULL;
                        int i = 0;
                        char *str = NULL;
-                       ret = bt_dpm_get_bluetooth_uuids_from_blacklist(&uuids_list);
-                       TC_PRT("bt_dpm_get_bluetooth_uuids_from_blacklist : returns %s\n",
+                       ret = bt_dpm_get_uuids_from_blacklist(&uuids_list);
+                       TC_PRT("bt_dpm_get_uuids_from_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
 
                        if (uuids_list) {
@@ -7794,8 +7794,8 @@ int test_input_callback(void *data)
                        bt_dpm_uuids_list_s *uuids_list = NULL;
                        int i = 0;
                        char *str = NULL;
-                       ret = bt_dpm_get_bluetooth_uuids_from_whitelist(&uuids_list);
-                       TC_PRT("bt_dpm_get_bluetooth_uuids_from_whitelist : returns %s\n",
+                       ret = bt_dpm_get_uuids_from_whitelist(&uuids_list);
+                       TC_PRT("bt_dpm_get_uuids_from_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
 
                        if (uuids_list) {
@@ -7811,23 +7811,23 @@ int test_input_callback(void *data)
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_BLACKLIST:
-                       ret = bt_dpm_clear_bluetooth_devices_from_blacklist();
-                       TC_PRT("bt_dpm_clear_bluetooth_devices_from_blacklist : returns %s\n",
+                       ret = bt_dpm_clear_devices_from_blacklist();
+                       TC_PRT("bt_dpm_clear_devices_from_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
                case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_WHITELIST:
-                       ret = bt_dpm_clear_bluetooth_devices_from_whitelist();
-                       TC_PRT("bt_dpm_clear_bluetooth_devices_from_whitelist : returns %s\n",
+                       ret = bt_dpm_clear_devices_from_whitelist();
+                       TC_PRT("bt_dpm_clear_devices_from_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
                case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_BLACKLIST:
-                       ret = bt_dpm_clear_bluetooth_uuids_from_blacklist();
-                       TC_PRT("bt_dpm_clear_bluetooth_uuids_from_blacklist : returns %s\n",
+                       ret = bt_dpm_clear_uuids_from_blacklist();
+                       TC_PRT("bt_dpm_clear_uuids_from_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
                case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_WHITELIST:
-                       ret = bt_dpm_clear_bluetooth_uuids_from_whitelist();
-                       TC_PRT("bt_dpm_clear_bluetooth_uuids_from_whitelist : returns %s\n",
+                       ret = bt_dpm_clear_uuids_from_whitelist();
+                       TC_PRT("bt_dpm_clear_uuids_from_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
                case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLACKLIST:
@@ -7836,8 +7836,8 @@ int test_input_callback(void *data)
                                        break;
                        }
 
-                       ret = bt_dpm_remove_bluetooth_device_from_blacklist(g_test_param.params[0]);
-                       TC_PRT("bt_dpm_add_bluetooth_devices_to_blacklist : returns %s\n",
+                       ret = bt_dpm_remove_device_from_blacklist(g_test_param.params[0]);
+                       TC_PRT("bt_dpm_add_devices_to_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7847,8 +7847,8 @@ int test_input_callback(void *data)
                                        break;
                        }
 
-                       ret = bt_dpm_remove_bluetooth_device_from_whitelist(g_test_param.params[0]);
-                       TC_PRT("bt_dpm_remove_bluetooth_device_from_whitelist : returns %s\n",
+                       ret = bt_dpm_remove_device_from_whitelist(g_test_param.params[0]);
+                       TC_PRT("bt_dpm_remove_device_from_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7858,8 +7858,8 @@ int test_input_callback(void *data)
                                        break;
                        }
 
-                       ret = bt_dpm_remove_bluetooth_uuid_from_blacklist(g_test_param.params[0]);
-                       TC_PRT("bt_dpm_remove_bluetooth_device_from_blacklist : returns %s\n",
+                       ret = bt_dpm_remove_uuid_from_blacklist(g_test_param.params[0]);
+                       TC_PRT("bt_dpm_remove_device_from_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7869,8 +7869,8 @@ int test_input_callback(void *data)
                                        break;
                        }
 
-                       ret = bt_dpm_remove_bluetooth_uuid_from_whitelist(g_test_param.params[0]);
-                       TC_PRT("bt_dpm_remove_bluetooth_uuid_from_whitelist : returns %s\n",
+                       ret = bt_dpm_remove_uuid_from_whitelist(g_test_param.params[0]);
+                       TC_PRT("bt_dpm_remove_uuid_from_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7882,16 +7882,16 @@ int test_input_callback(void *data)
                        }
                        value = atoi(g_test_param.params[0]);
 
-                       ret = bt_dpm_set_allow_bluetooth_outgoing_call(value);
-                       TC_PRT("bt_dpm_set_allow_bluetooth_outgoing_call : returns %s\n",
+                       ret = bt_dpm_set_allow_outgoing_call(value);
+                       TC_PRT("bt_dpm_set_allow_outgoing_call : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_GET_ALLOW_OUTGOING_CALL: {
                        bt_dpm_status_e value = BT_DPM_STATUS_ERROR;
-                       ret = bt_dpm_get_allow_bluetooth_outgoing_call(&value);
-                       TC_PRT("bt_dpm_get_allow_bluetooth_outgoing_call : allow: %d, returns %s\n",
+                       ret = bt_dpm_get_allow_outgoing_call(&value);
+                       TC_PRT("bt_dpm_get_allow_outgoing_call : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        break;
                }
@@ -7903,16 +7903,16 @@ int test_input_callback(void *data)
                        }
                        value = atoi(g_test_param.params[0]);
 
-                       ret = bt_dpm_set_bluetooth_pairing_state(value);
-                       TC_PRT("bt_dpm_set_bluetooth_pairing_state : returns %s\n",
+                       ret = bt_dpm_set_pairing_state(value);
+                       TC_PRT("bt_dpm_set_pairing_state : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_GET_PAIRING_STATE: {
                        bt_dpm_status_e value = BT_DPM_STATUS_ERROR;
-                       ret = bt_dpm_get_bluetooth_pairing_state(&value);
-                       TC_PRT("bt_dpm_get_bluetooth_pairing_state : allow: %d, returns %s\n",
+                       ret = bt_dpm_get_pairing_state(&value);
+                       TC_PRT("bt_dpm_get_pairing_state : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        break;
                }
@@ -7925,8 +7925,8 @@ int test_input_callback(void *data)
                        profile = atoi(g_test_param.params[0]);
                        value = atoi(g_test_param.params[1]);
 
-                       ret = bt_dpm_set_bluetooth_profile_state(profile, value);
-                       TC_PRT("bt_dpm_set_bluetooth_profile_state : returns %s\n",
+                       ret = bt_dpm_set_profile_state(profile, value);
+                       TC_PRT("bt_dpm_set_profile_state : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7940,8 +7940,8 @@ int test_input_callback(void *data)
                        }
                        profile = atoi(g_test_param.params[0]);
 
-                       ret = bt_dpm_get_bluetooth_profile_state(profile, &value);
-                       TC_PRT("bt_dpm_get_bluetooth_profile_state : allow: %d, returns %s\n",
+                       ret = bt_dpm_get_profile_state(profile, &value);
+                       TC_PRT("bt_dpm_get_profile_state : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
@@ -7954,16 +7954,16 @@ int test_input_callback(void *data)
                        }
                        value = atoi(g_test_param.params[0]);
 
-                       ret = bt_dpm_set_bluetooth_desktop_connectivity_state(value);
-                       TC_PRT("bt_dpm_set_bluetooth_desktop_connectivity_state : returns %s\n",
+                       ret = bt_dpm_set_desktop_connectivity_state(value);
+                       TC_PRT("bt_dpm_set_desktop_connectivity_state : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_GET_DESKTOP_CONNECTIVITY_STATE: {
                        bt_dpm_status_e value = BT_DPM_STATUS_ERROR;
-                       ret = bt_dpm_get_bluetooth_desktop_connectivity_state(&value);
-                       TC_PRT("bt_dpm_get_bluetooth_desktop_connectivity_state : allow: %d, returns %s\n",
+                       ret = bt_dpm_get_desktop_connectivity_state(&value);
+                       TC_PRT("bt_dpm_get_desktop_connectivity_state : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        break;
                }
@@ -7974,16 +7974,16 @@ int test_input_callback(void *data)
                                        break;
                        }
                        value = atoi(g_test_param.params[0]);
-                       ret = bt_dpm_set_bluetooth_discoverable_state(value);
-                       TC_PRT("bt_dpm_set_bluetooth_discoverable_state : returns %s\n",
+                       ret = bt_dpm_set_discoverable_state(value);
+                       TC_PRT("bt_dpm_set_discoverable_state : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_GET_DISCOVERABLE_STATE: {
                        bt_dpm_status_e value = BT_DPM_STATUS_ERROR;
-                       ret = bt_dpm_get_bluetooth_discoverable_state(&value);
-                       TC_PRT("bt_dpm_get_bluetooth_discoverable_state : allow: %d, returns %s\n",
+                       ret = bt_dpm_get_discoverable_state(&value);
+                       TC_PRT("bt_dpm_get_discoverable_state : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        break;
                }
@@ -7995,16 +7995,16 @@ int test_input_callback(void *data)
                        }
                        value = atoi(g_test_param.params[0]);
 
-                       ret = bt_dpm_set_bluetooth_limited_discoverable_state(value);
-                       TC_PRT("bt_dpm_set_bluetooth_limited_discoverable_state : returns %s\n",
+                       ret = bt_dpm_set_limited_discoverable_state(value);
+                       TC_PRT("bt_dpm_set_limited_discoverable_state : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_GET_LIMITED_DISCOVERABLE_STATE: {
                        bt_dpm_status_e value = BT_DPM_STATUS_ERROR;
-                       ret = bt_dpm_get_bluetooth_limited_discoverable_state(&value);
-                       TC_PRT("bt_dpm_get_bluetooth_limited_discoverable_state : allow: %d, returns %s\n",
+                       ret = bt_dpm_get_limited_discoverable_state(&value);
+                       TC_PRT("bt_dpm_get_limited_discoverable_state : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        break;
                }
@@ -8016,16 +8016,16 @@ int test_input_callback(void *data)
                        }
                        value = atoi(g_test_param.params[0]);
 
-                       ret = bt_dpm_set_bluetooth_data_transfer_state(value);
-                       TC_PRT("bt_dpm_set_bluetooth_data_transfer_state : returns %s\n",
+                       ret = bt_dpm_set_data_transfer_state(value);
+                       TC_PRT("bt_dpm_set_data_transfer_state : returns %s\n",
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
                }
                case BT_UNIT_TEST_FUNCTION_DPM_GET_DATA_TRANSFER_STATE: {
                        bt_dpm_status_e value = BT_DPM_STATUS_ERROR;
-                       ret = bt_dpm_get_bluetooth_data_transfer_state(&value);
-                       TC_PRT("bt_dpm_get_bluetooth_data_transfer_state : allow: %d, returns %s\n",
+                       ret = bt_dpm_get_data_transfer_state(&value);
+                       TC_PRT("bt_dpm_get_data_transfer_state : allow: %d, returns %s\n",
                                                value, __bt_get_error_message(ret));
                        break;
                }