diff --git a/src/dsp/firmware_update.c b/src/dsp/firmware_update.c
index 9ebb970..8b4a1ed 100644
--- a/src/dsp/firmware_update.c
+++ b/src/dsp/firmware_update.c
@@ -533,7 +533,7 @@
 		return PLDM_ERROR_INVALID_DATA;
 	}
 
-	// Assuming atleast 1 byte of VendorDefinedDescriptorData
+	// Assuming at least 1 byte of VendorDefinedDescriptorData
 	if (length < (sizeof(struct pldm_vendor_defined_descriptor_title_data) +
 		      entry->vendor_defined_descriptor_title_str_len)) {
 		return PLDM_ERROR_INVALID_LENGTH;
diff --git a/src/dsp/pdr.c b/src/dsp/pdr.c
index 09e87be..d5b3173 100644
--- a/src/dsp/pdr.c
+++ b/src/dsp/pdr.c
@@ -496,7 +496,7 @@
 	assert(start != NULL);
 
 	/* Insert after the the last node that matches the input entity type, or
-	 * at the end if no such match occurrs
+	 * at the end if no such match occurs
 	 */
 	while (start->next_sibling != NULL) {
 		uint16_t this_type = start->entity.entity_type;
@@ -1302,7 +1302,7 @@
 	*entities = l_entities;
 }
 
-/* Find the postion of record in pldm_pdr repo and place new_record in
+/* Find the position of record in pldm_pdr repo and place new_record in
  * the same position.
  */
 static int pldm_pdr_replace_record(pldm_pdr *repo, pldm_pdr_record *record,
diff --git a/src/msgbuf.h b/src/msgbuf.h
index 3dcfa42..37ad470 100644
--- a/src/msgbuf.h
+++ b/src/msgbuf.h
@@ -376,7 +376,7 @@
  * C++ could be less of a headache than the C as we can leverage template
  * functions. An advantage of template functions is that while their definition
  * is driven by instantion, the definition does not appear at the source
- * location of the instantation, which gives it a great leg-up over the problems
+ * location of the instantiation, which gives it a great leg-up over the problems
  * we have in the C path. However, the use of the msgbuf APIs in the test suite
  * still makes things somewhat tricky, as the call-sites in the test suite are
  * wrapped up in EXPECT_*() gtest macros. Ideally we'd implement functions that
@@ -415,7 +415,7 @@
 /**
  * @brief pldm_msgbuf extractor for a uint8_t
  *
- * @param[inout] ctx - pldm_msgbuf context for extractor
+ * @param[in,out] ctx - pldm_msgbuf context for extractor
  * @param[out] dst - destination of extracted value
  *
  * @return PLDM_SUCCESS if buffer accesses were in-bounds,
@@ -1047,8 +1047,8 @@
 /**
  * @brief pldm_msgbuf copy data between two msg buffers
  *
- * @param[inout] src - pldm_msgbuf for source from where value should be copied
- * @param[inout] dst - destination of copy from source
+ * @param[in,out] src - pldm_msgbuf for source from where value should be copied
+ * @param[in,out] dst - destination of copy from source
  * @param[in] size - size of data to be copied
  * @param[in] description - description of data copied
  *