diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index f63870ff9ac..69fe1d9cda4 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -97,9 +97,9 @@ static NET_BUF_POOL(req_pool, CONFIG_BLUETOOTH_ATT_REQ_COUNT,
 
 /*
  * Pool for ougoing ATT responses packets. This is necessary in order not to
- * block the RX fiber since otherwise req_pool would have be used but buffers
+ * block the RX thread since otherwise req_pool would have be used but buffers
  * may only be freed after a response is received which would never happen if
- * the RX fiber is waiting a buffer causing a deadlock.
+ * the RX thread is waiting a buffer causing a deadlock.
  */
 static struct k_fifo rsp_data;
 static NET_BUF_POOL(rsp_pool, 1,
@@ -1790,7 +1790,7 @@ struct net_buf *bt_att_create_pdu(struct bt_conn *conn, uint8_t op, size_t len)
 	case BT_ATT_OP_PREPARE_WRITE_RSP:
 	case BT_ATT_OP_EXEC_WRITE_RSP:
 		/* Use a different buffer pool for responses as this is
-		 * usually sent from RX fiber it shall never block.
+		 * usually sent from RX thread it shall never block.
 		 */
 		buf = bt_l2cap_create_pdu(&rsp_data, 0);
 		break;
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index eeee447e759..3c46a108bd5 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -48,7 +48,7 @@ static struct k_fifo frag_buf;
 static NET_BUF_POOL(frag_pool, 1, BT_L2CAP_BUF_SIZE(23), &frag_buf, NULL,
 		    BT_BUF_USER_DATA_MIN);
 
-/* Pool for dummy buffers to wake up the tx fibers */
+/* Pool for dummy buffers to wake up the tx threads */
 static struct k_fifo dummy;
 static NET_BUF_POOL(dummy_pool, CONFIG_BLUETOOTH_MAX_CONN, 0, &dummy, NULL, 0);
 
@@ -1101,7 +1101,7 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
 			k_thread_cancel(conn->timeout);
 			conn->timeout = NULL;
 
-			/* Drop the reference taken by timeout fiber */
+			/* Drop the reference taken by timeout thread */
 			bt_conn_unref(conn);
 		}
 		break;
@@ -1122,7 +1122,7 @@ void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state)
 		break;
 	case BT_CONN_DISCONNECTED:
 		/* Notify disconnection and queue a dummy buffer to wake
-		 * up and stop the tx fiber for states where it was
+		 * up and stop the tx thread for states where it was
 		 * running.
 		 */
 		if (old_state == BT_CONN_CONNECTED ||
@@ -1349,7 +1349,7 @@ static int bt_hci_connect_le_cancel(struct bt_conn *conn)
 		k_thread_cancel(conn->timeout);
 		conn->timeout = NULL;
 
-		/* Drop the reference took by timeout fiber */
+		/* Drop the reference took by timeout thread */
 		bt_conn_unref(conn);
 	}
 
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index 349817dbd87..881aa8ce97d 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -116,8 +116,8 @@ struct bt_conn {
 #endif
 	};
 
-	/* Stack for TX fiber and timeout fiber.
-	 * Since these fibers don't overlap, one stack can be used by
+	/* Stack for TX thread and timeout thread.
+	 * Since these threads don't overlap, one stack can be used by
 	 * both of them.
 	 */
 	BT_STACK(stack, 256);
diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
index 5efe7580190..8b8290f5410 100644
--- a/subsys/bluetooth/host/hci_core.h
+++ b/subsys/bluetooth/host/hci_core.h
@@ -113,7 +113,7 @@ struct bt_dev {
 	struct k_fifo		rx_queue;
 
 	/* Queue for high priority HCI events which may unlock waiters
-	 * in other fibers. Such events include Number of Completed
+	 * in other threads. Such events include Number of Completed
 	 * Packets, as well as the Command Complete/Status events.
 	 */
 	struct k_fifo		rx_prio_queue;
@@ -187,7 +187,7 @@ int bt_hci_cmd_send(uint16_t opcode, struct net_buf *buf);
 int bt_hci_cmd_send_sync(uint16_t opcode, struct net_buf *buf,
 			 struct net_buf **rsp);
 
-/* The helper is only safe to be called from internal fibers as it's
+/* The helper is only safe to be called from internal threads as it's
  * not multi-threading safe
  */
 #if defined(CONFIG_BLUETOOTH_DEBUG)