diff --git a/src/shared/att.c b/src/shared/att.c
index 14d346c..c29e914 100644
--- a/src/shared/att.c
+++ b/src/shared/att.c
@@ -669,7 +669,7 @@ static bool disconnect_cb(struct io *io, void *user_data)
 
 	DBG(att, "Channel %p disconnected: %s", chan, strerror(err));
 
-	/* Dettach channel */
+	/* Detach channel */
 	queue_remove(att->chans, chan);
 
 	if (chan->pending_req) {
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 2d4f003..6fb449b 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -1033,7 +1033,7 @@ static void stream_notify_config(struct bt_bap_stream *stream)
 	status->id = ep->id;
 	status->state = ep->state;
 
-	/* Initialize preffered settings if not set */
+	/* Initialize preferred settings if not set */
 	if (!lpac->qos.phy)
 		lpac->qos.phy = 0x02;
 
@@ -1055,7 +1055,7 @@ static void stream_notify_config(struct bt_bap_stream *stream)
 	if (!lpac->qos.ppd_max)
 		lpac->qos.ppd_max = lpac->qos.pd_max;
 
-	/* TODO:Add support for setting preffered settings on bt_bap_pac */
+	/* TODO:Add support for setting preferred settings on bt_bap_pac */
 	config = (void *)status->params;
 	config->framing = lpac->qos.framing;
 	config->phy = lpac->qos.phy;
@@ -3682,7 +3682,7 @@ static void ascs_ase_cp_write(struct gatt_db_attribute *attrib,
 		DBG(bap, "%s", handler->str);
 
 		/* Set in_cp_write so ASE notification are not sent ahead of
-		 * CP notifcation.
+		 * CP notification.
 		 */
 		bap->in_cp_write = true;
 
@@ -4885,7 +4885,7 @@ static void read_pac_supported_context(bool success, uint8_t att_ecode,
 	const struct bt_pacs_context *ctx = (void *)value;
 
 	if (!success) {
-		DBG(bap, "Unable to read PAC Supproted Context: error 0x%02x",
+		DBG(bap, "Unable to read PAC Supported Context: error 0x%02x",
 								att_ecode);
 		return;
 	}
diff --git a/src/shared/crypto.c b/src/shared/crypto.c
index 5449621..43d7f7c 100644
--- a/src/shared/crypto.c
+++ b/src/shared/crypto.c
@@ -496,7 +496,7 @@ static inline void u128_xor(const uint8_t p[16], const uint8_t q[16],
  *
  * ra is concatenated with ia and padding to generate p2 which is XORed
  * with the result of the security function e using p1 as the input
- * paremter plaintextData and is then used as the 128-bit input
+ * parameter plaintextData and is then used as the 128-bit input
  * parameter plaintextData to security function e:
  *
  *   p2 = padding || ia || ra
diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index ec23415..26b4d1c 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -79,7 +79,7 @@ struct bt_gatt_client {
 	/*
 	 * Queue of long write requests. An error during "prepare write"
 	 * requests can result in a cancel through "execute write". To prevent
-	 * cancelation of prepared writes to the wrong attribute and multiple
+	 * cancellation of prepared writes to the wrong attribute and multiple
 	 * requests to the same attribute that may result in a corrupted final
 	 * value, we avoid interleaving prepared writes.
 	 */
diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index 8951079..332af2d 100644
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -493,7 +493,7 @@ static void notify_service_changed(struct gatt_db *db,
 
 	queue_foreach(db->notify_list, handle_notify, &data);
 
-	/* Tigger hash update */
+	/* Trigger hash update */
 	if (!db->hash_id && db->crypto)
 		db->hash_id = timeout_add(HASH_UPDATE_TIMEOUT, db_hash_update,
 								db, NULL);
@@ -2099,7 +2099,7 @@ bool gatt_db_attribute_set_fixed_length(struct gatt_db_attribute *attrib,
 	if (attrib->service->attributes[0] == attrib)
 		return false;
 
-	/* If attribute is a characteristic declaration ajust to its value */
+	/* If attribute is a characteristic declaration adjust to its value */
 	if (!bt_uuid_cmp(&characteristic_uuid, &attrib->uuid)) {
 		int i;
 
diff --git a/src/shared/gatt-server.c b/src/shared/gatt-server.c
index b30ec8c..f8ed9a5 100644
--- a/src/shared/gatt-server.c
+++ b/src/shared/gatt-server.c
@@ -887,7 +887,7 @@ static uint8_t get_read_rsp_opcode(uint8_t opcode)
 		 * Should never happen
 		 *
 		 * TODO: It would be nice to have a debug-mode assert macro
-		 * for development builds. This way bugs could be easily catched
+		 * for development builds. This way bugs could be easily caught
 		 * during development and there would be self documenting code
 		 * that wouldn't be crash release builds.
 		 */
diff --git a/src/shared/ringbuf.c b/src/shared/ringbuf.c
index 1b7adbb..957d355 100644
--- a/src/shared/ringbuf.c
+++ b/src/shared/ringbuf.c
@@ -36,7 +36,7 @@ struct ringbuf {
 
 #define RINGBUF_RESET 0
 
-/* Find last (most siginificant) set bit */
+/* Find last (most significant) set bit */
 static inline unsigned int fls(unsigned int x)
 {
 	return x ? sizeof(x) * 8 - __builtin_clz(x) : 0;
diff --git a/src/shared/util.c b/src/shared/util.c
index 5d3a14d..6fa451d 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -741,7 +741,7 @@ static const struct {
 	{ 0x111d, "Imaging Referenced Objects"			},
 	{ 0x111e, "Handsfree"					},
 	{ 0x111f, "Handsfree Audio Gateway"			},
-	{ 0x1120, "Direct Printing Refrence Objects Service"	},
+	{ 0x1120, "Direct Printing Reference Objects Service"	},
 	{ 0x1121, "Reflected UI"				},
 	{ 0x1122, "Basic Printing"				},
 	{ 0x1123, "Printing Status"				},
@@ -855,7 +855,7 @@ static const struct {
 	{ 0x2902, "Client Characteristic Configuration"		},
 	{ 0x2903, "Server Characteristic Configuration"		},
 	{ 0x2904, "Characteristic Format"			},
-	{ 0x2905, "Characteristic Aggregate Formate"		},
+	{ 0x2905, "Characteristic Aggregate Format"		},
 	{ 0x2906, "Valid Range"					},
 	{ 0x2907, "External Report Reference"			},
 	{ 0x2908, "Report Reference"				},
diff --git a/src/shared/vcp.c b/src/shared/vcp.c
index c96ad43..e614ff6 100644
--- a/src/shared/vcp.c
+++ b/src/shared/vcp.c
@@ -37,7 +37,7 @@
 #define VOCS_VOL_OFFSET_UPPER_LIMIT	 255
 #define VOCS_VOL_OFFSET_LOWER_LIMIT	-255
 
-/* Apllication Error Code */
+/* Application Error Code */
 #define BT_ATT_ERROR_INVALID_CHANGE_COUNTER	0x80
 #define BT_ATT_ERROR_OPCODE_NOT_SUPPORTED	0x81
 #define BT_ATT_ERROR_VALUE_OUT_OF_RANGE		0x82