diff --git a/plugins/hostname.c b/plugins/hostname.c
index 0066ee8..daab715 100644
--- a/plugins/hostname.c
+++ b/plugins/hostname.c
@@ -56,14 +56,10 @@ static char *pretty_hostname = NULL;
 
 static void update_name(struct btd_adapter *adapter, gpointer user_data)
 {
-	struct btd_adapter *default_adapter;
-
 	if (pretty_hostname == NULL)
 		return;
 
-	default_adapter = adapter_get_default();
-
-	if (default_adapter == NULL || adapter == default_adapter) {
+	if (btd_adapter_is_default(adapter)) {
 		DBG("name: %s", pretty_hostname);
 
 		adapter_set_name(adapter, pretty_hostname);
diff --git a/plugins/neard.c b/plugins/neard.c
index df4382f..4d52e07 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -618,7 +618,8 @@ static DBusMessage *push_oob(DBusConnection *conn, DBusMessage *msg, void *data)
 
 	DBG("");
 
-	adapter = adapter_get_default();
+	adapter = btd_adapter_get_default();
+
 	err = check_adapter(adapter);
 	if (err < 0)
 		return error_reply(msg, -err);
@@ -662,7 +663,8 @@ static DBusMessage *request_oob(DBusConnection *conn, DBusMessage *msg,
 
 	DBG("");
 
-	adapter = adapter_get_default();
+	adapter = btd_adapter_get_default();
+
 	err = check_adapter(adapter);
 	if (err < 0)
 		return error_reply(msg, -err);
@@ -726,7 +728,8 @@ static void neard_appeared(DBusConnection *conn, void *user_data)
 	 * due to neard crash or release before action was completed, postpone
 	 * register until action is finished.
 	 */
-	adapter = adapter_get_default();
+	adapter = btd_adapter_get_default();
+
 	if (adapter && btd_adapter_check_oob_handler(adapter))
 		agent_register_postpone = TRUE;
 	else