diff --git a/build/git.mk b/build/git.mk
index e4d0226b..0a45154a 100644
--- a/build/git.mk
+++ b/build/git.mk
@@ -101,7 +101,7 @@ git-status:
 	$(Q) echo "$(call COLOR_GRAY,LOCAL) - on local branch"
 	$(Q) echo -n "$(call COLOR_RED,PUSH) - push needed; "
 	$(Q) echo -n "$(call COLOR_MAGENTA,MERGE) - branch diverged; "
-	$(Q) echo  "! - there are uncommited files"
+	$(Q) echo  "! - there are uncommitted files"
 	$(Q) echo
 	$(Q) (cd .. ; $(call GIT_STATUS,Master))
 	$(Q) git -C "$(MASTER_REPO)" submodule --quiet foreach --recursive '$(call GIT_STATUS,$$path)'
diff --git a/build/help.mk b/build/help.mk
index 3af005c1..18d6d485 100644
--- a/build/help.mk
+++ b/build/help.mk
@@ -40,7 +40,7 @@ help:
 	$(NQ) "   unit-install              Build and install ALL active units"
 	$(NQ) "   unit-clean                Clean ALL active units"
 	$(NQ) "   unit-list                 List ALL active units"
-	$(NQ) "   unit-run                  Build and exectutes ALL active units"
+	$(NQ) "   unit-run                  Build and executes ALL active units"
 	$(NQ) "   unit-coverage             Build, execute and provide coverage (requires CC=clang-6.0)"
 	$(NQ) ""
 	$(NQ) "   UNIT_PATH/clean           Clean a single UNIT"
diff --git a/build/kconfig.mk b/build/kconfig.mk
index 8011024b..3c20f3b0 100644
--- a/build/kconfig.mk
+++ b/build/kconfig.mk
@@ -33,7 +33,7 @@
 #                  distilled version of the file (diff), meaning that it
 #                  doesn't contain options that are not different from the
 #                  defaults
-# KCONFIG_DEFAULT- Path to the defualt kconfig file, if none is set
+# KCONFIG_DEFAULT- Path to the default kconfig file, if none is set
 #
 # KCONFIG        - This either points to KCONFIG_TARGET or KCONFIG_DEFAULT
 #
@@ -90,7 +90,7 @@ $(info Using configuration file: $(KCONFIG_TARGET))
 KCONFIG:=$(KCONFIG_TARGET)
 endif
 
-# KCONFIG_WORK is the full (it includes defualt options) configuration file that will be generated from KCONFIG.
+# KCONFIG_WORK is the full (it includes default options) configuration file that will be generated from KCONFIG.
 KCONFIG_WORK:=$(KWORKDIR)/$(notdir $(KCONFIG))
 
 # skip including and generating kconfig if goal is to cleanup
diff --git a/build/templates.py b/build/templates.py
index 7a080c9d..affc8ddb 100755
--- a/build/templates.py
+++ b/build/templates.py
@@ -128,7 +128,7 @@ def process_rootfs(dirname):
             if filename.endswith(TEMPLATE_SUFFIX):
                 # Preserve original file permission
                 os.chmod(dst, os.stat(src).st_mode)
-                # Clenaup source template file
+                # Cleanup source template file
                 os.unlink(src)
 
 def process_ovsdb(filename):
diff --git a/build/unit-build.mk b/build/unit-build.mk
index 515ade48..1ed98a06 100644
--- a/build/unit-build.mk
+++ b/build/unit-build.mk
@@ -119,7 +119,7 @@ $(UNIT_BUILD)/.target: $(TESTBINDIR)/$(UNIT_BIN)/unit $(TESTBINDIR)/$(UNIT_BIN)/
 
 # Use the .target file to actually see if any of the libraries changed
 # Use -Wl,--start-group to force GNU LD to ignore the link order; this might be slower for larger projects
-# Special naming convetion for unit testing $(UNIT_BIN)/unit instead of $(UNIT_BIN)
+# Special naming convention for unit testing $(UNIT_BIN)/unit instead of $(UNIT_BIN)
 $(TESTBINDIR)/$(UNIT_BIN): | $(TESTBINDIR)
 
 # In case data folder exist in UNIT_PATH, copy directory and its content to bin folder
@@ -769,7 +769,7 @@ unit-run: unit-run-cleanup
 	    echo "$(call COLOR_GREEN,Unit-test complete)";\
 	fi
 
-# For coverage execution, we must intially check if we have properly set up CLANG
+# For coverage execution, we must initially check if we have properly set up CLANG
 # and the associated tools.
 #
 unit-coverage-prerequisite:
diff --git a/kconfig/Kconfig.osp_pki b/kconfig/Kconfig.osp_pki
index aeb773e1..666103e1 100644
--- a/kconfig/Kconfig.osp_pki
+++ b/kconfig/Kconfig.osp_pki
@@ -1,5 +1,5 @@
 #
-# OpenSync Public Key Infrastracture
+# OpenSync Public Key Infrastructure
 #
 source "src/lib/osp/kconfig/Kconfig.osp_pki"
 
diff --git a/kconfig/minimize.sh b/kconfig/minimize.sh
index 910bbb20..bc1166bb 100755
--- a/kconfig/minimize.sh
+++ b/kconfig/minimize.sh
@@ -36,7 +36,7 @@
 # - enter the name of the base config in Common/INCLUDE
 # - upon exiting the minimized config will contain the include directive
 #   and the file will contain just the delta against the base
-# To dissasociate from the base config:
+# To disassociate from the base config:
 # - run make menuconfig
 # - delete the Common/INCLUDE value
 # - upon exiting the minimized config will be a delta against the default config.
diff --git a/rootfs/common/INSTALL_PREFIX/scripts/vlan.funcs.sh b/rootfs/common/INSTALL_PREFIX/scripts/vlan.funcs.sh
index 3f2837bb..f742ea90 100644
--- a/rootfs/common/INSTALL_PREFIX/scripts/vlan.funcs.sh
+++ b/rootfs/common/INSTALL_PREFIX/scripts/vlan.funcs.sh
@@ -38,7 +38,7 @@ vlan_ifname()
 vlan_add()
 {
     [ -d "/sys/class/net/$1.$2" ] && return 0
-    vlan_log "Adding VLAN interface $1.$2 usig vconfig"
+    vlan_log "Adding VLAN interface $1.$2 using vconfig"
     vconfig set_name_type DEV_PLUS_VID_NO_PAD
     vconfig add "$1" "$2"
 }
diff --git a/rootfs/kconfig/IN_PLACE_UPGRADE/INSTALL_PREFIX/scripts/ospkg.d/25_overlay.sh b/rootfs/kconfig/IN_PLACE_UPGRADE/INSTALL_PREFIX/scripts/ospkg.d/25_overlay.sh
index 68e45fc3..7032feae 100644
--- a/rootfs/kconfig/IN_PLACE_UPGRADE/INSTALL_PREFIX/scripts/ospkg.d/25_overlay.sh
+++ b/rootfs/kconfig/IN_PLACE_UPGRADE/INSTALL_PREFIX/scripts/ospkg.d/25_overlay.sh
@@ -157,7 +157,7 @@ ospkg_select_active_mount_layer()
         fi
         # get current after eventual changes
         local CURR_NAME_2=$(ospkg_get_current_name)
-        # if curent changed reset overlay/upper
+        # if current changed reset overlay/upper
         if [ "$CURR_NAME_1" != "$CURR_NAME_2" ]; then
             ospkg_reset_overlay_upper "$OVERLAY_UPPER"
         fi
diff --git a/rootfs/kconfig/OPENSYNC_LEGACY_FIREWALL/INSTALL_PREFIX/bin/iptables_cmd.sh b/rootfs/kconfig/OPENSYNC_LEGACY_FIREWALL/INSTALL_PREFIX/bin/iptables_cmd.sh
index 21ee92bc..5a7848c0 100755
--- a/rootfs/kconfig/OPENSYNC_LEGACY_FIREWALL/INSTALL_PREFIX/bin/iptables_cmd.sh
+++ b/rootfs/kconfig/OPENSYNC_LEGACY_FIREWALL/INSTALL_PREFIX/bin/iptables_cmd.sh
@@ -206,7 +206,7 @@ ip6tables_boot()
 
 #
 # - Clear all wavering rules
-# - Stop the upnp deamon and flush its rules
+# - Stop the upnp daemon and flush its rules
 #
 iptables_flush()
 {
diff --git a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/12_dns.sh b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/12_dns.sh
index dc1c31db..b3cc3451 100755
--- a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/12_dns.sh
+++ b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/12_dns.sh
@@ -28,7 +28,7 @@
 #
 # Performs a DNS health check on a gateway node by verifying name resolution
 # against the configured DNS servers on the system and a few reference global
-# DNS servers. If at least one such DNS lookup succeedes the health check passes.
+# DNS servers. If at least one such DNS lookup succeeds the health check passes.
 #
 # If there is no internet connectivity at all (check performed by pinging a few
 # random global root DNS servers) and/or there is no IP address assigned on the
diff --git a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/15_ap.sh b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/15_ap.sh
index d0eb88d3..38532c28 100755
--- a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/15_ap.sh
+++ b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/15_ap.sh
@@ -31,7 +31,7 @@ OVSH=$CONFIG_INSTALL_PREFIX/tools/ovsh
 # active (enabled) radio. Not having any AP interfaces is considered
 # an error and may need a recovery.
 
-# Skip healtcheck when all radios are disbaled
+# Skip healtcheck when all radios are disabled
 [ -z "$($OVSH -r s Wifi_Radio_Config -w enabled==true if_name)" ] && Healthcheck_Pass
 
 for vif_uuid in $($OVSH -rU s Wifi_VIF_Config _uuid -w enabled==true -w mode==ap)
diff --git a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/20_tmp_df.sh b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/20_tmp_df.sh
index 71287dc5..5e2d4b82 100755
--- a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/20_tmp_df.sh
+++ b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/20_tmp_df.sh
@@ -30,7 +30,7 @@ LOG_MODULE="TMP_DF"
 # Check free space on /tmp. If tmp free space is bellow the configured limit,
 # the check fails with logging the top offenders.
 
-# Calcualte free space on /tmp, express it as %
+# Calculate free space on /tmp, express it as %
 DF=$(df -k /tmp | tail -n +2 | awk '{printf("%0.0f", $4 / $2 * 100.0)}')
 
 if [ "${DF}" -le ${DF_CRIT_LOW} ]
diff --git a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/30_netdev_refcount.sh b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/30_netdev_refcount.sh
index 7bb20159..47cf51b2 100755
--- a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/30_netdev_refcount.sh
+++ b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/30_netdev_refcount.sh
@@ -42,7 +42,7 @@ REGEX="unregister_netdevice: waiting for .* to become free. Usage count"
 # timestamps this will detect false positives
 # really easily. If that happens it is preferred
 # to enable kernel log timestamps on the given
-# paltform. Reworking the logic in the script to
+# platform. Reworking the logic in the script to
 # work with no timestamps is not trivial.
 dmesg | awk -v "LASTLINE=$LASTLINE" '
 	/'"$REGEX"'/ { FOUND=$0 }
diff --git a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/40_conntrack_overflow.sh b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/40_conntrack_overflow.sh
index 9f504cc9..75f3bc37 100755
--- a/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/40_conntrack_overflow.sh
+++ b/rootfs/kconfig/SERVICE_HEALTHCHECK/INSTALL_PREFIX/scripts/healthcheck.d/40_conntrack_overflow.sh
@@ -29,7 +29,7 @@
 # and thus causing ct overflow condition. When this condition is active
 # no new connections will be allowed.
 #
-# To avoid loosing connectivity ct table will be flushed when reaching
+# To avoid losing connectivity ct table will be flushed when reaching
 # CT_ALLOWED. While condition may be recurring, at least
 # clients and device should not permanently loose connectivity.
 #
diff --git a/src/cellm/inc/cell_info.h b/src/cellm/inc/cell_info.h
index 0e9c8a1a..5e31750a 100644
--- a/src/cellm/inc/cell_info.h
+++ b/src/cellm/inc/cell_info.h
@@ -101,7 +101,7 @@ static inline bool cell_info_set_string(char *source, char **dest)
 {
     if (dest == NULL) return false;
 
-    /* Bail if the destination is alreay allocated */
+    /* Bail if the destination is already allocated */
     if (*dest != NULL) return false;
 
     if (source == NULL) return true;
@@ -405,7 +405,7 @@ struct cell_info_packed_buffer
  * @brief Generates a cell info serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see cell_info_free_packed_buffer() for this purpose.
  *
diff --git a/src/cellm/inc/lte_info.h b/src/cellm/inc/lte_info.h
index aa79e352..ef269dd3 100644
--- a/src/cellm/inc/lte_info.h
+++ b/src/cellm/inc/lte_info.h
@@ -254,7 +254,7 @@ static inline bool lte_info_set_string(char *source, char **dest)
 {
     if (dest == NULL) return false;
 
-    /* Bail if the destination is alreay allocated */
+    /* Bail if the destination is already allocated */
     if (*dest != NULL) return false;
 
     if (source == NULL) return true;
@@ -482,7 +482,7 @@ struct lte_info_packed_buffer
  * @brief Generates a lte info serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see lte_info_free_packed_buffer() for this purpose.
  *
diff --git a/src/cellm/src/cellm_info_report.c b/src/cellm/src/cellm_info_report.c
index 90b0ccdb..365a0f1c 100644
--- a/src/cellm/src/cellm_info_report.c
+++ b/src/cellm/src/cellm_info_report.c
@@ -1372,7 +1372,7 @@ static Interfaces__CellInfo__CellularNetInfo *cellm_info_set_cell_net_info(struc
     cell_net_info = report->cell_net_info;
     if (cell_net_info == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1422,7 +1422,7 @@ static Interfaces__CellInfo__CellularDataUsage *cellm_info_set_cell_data_usage(s
     cell_data_usage = report->cell_data_usage;
     if (cell_data_usage == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1452,7 +1452,7 @@ static Interfaces__CellInfo__LteNetServingCellInfo *cellm_info_set_srv_cell(stru
     cell = report->cell_srv_cell;
     if (cell == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1629,7 +1629,7 @@ static Interfaces__CellInfo__NetCarrierAggInfo *cellm_info_set_pb_primary_carrie
     pca = report->cell_pca_info;
     if (pca == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1671,7 +1671,7 @@ static Interfaces__CellInfo__NetCarrierAggInfo *cellm_info_set_pb_lte_secondary_
 {
     Interfaces__CellInfo__NetCarrierAggInfo *pb;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1752,7 +1752,7 @@ static Interfaces__CellInfo__PdpContextInfo *cellm_info_set_pb_pdp_ctx_param(
 {
     Interfaces__CellInfo__PdpContextInfo *pb;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1832,7 +1832,7 @@ static Interfaces__CellInfo__CellularNr5gCellInfo *cellular_info_set_pb_nr5g_sa_
     cell = report->nr5g_sa_srv_cell;
     if (cell == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1896,7 +1896,7 @@ static Interfaces__CellInfo__CellularNr5gCellInfo *cellular_info_set_pb_nr5g_nsa
     cell = report->nr5g_nsa_srv_cell;
     if (cell == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1956,7 +1956,7 @@ static Interfaces__CellInfo__CellularNr5gCellInfo *cellm_info_set_pb_nrg_seconda
 
     if (cell == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Assign the message fields */
@@ -2290,7 +2290,7 @@ static Interfaces__CellInfo__CellularInfoReport *cellm_info_set_pb_report(struct
  * @brief Generates a cell info serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see cell_info_free_packed_buffer() for this purpose.
  *
diff --git a/src/cellm/src/cellm_lte_report.c b/src/cellm/src/cellm_lte_report.c
index 9bab5f21..d772f666 100644
--- a/src/cellm/src/cellm_lte_report.c
+++ b/src/cellm/src/cellm_lte_report.c
@@ -1078,7 +1078,7 @@ static Interfaces__LteInfo__LteNetInfo *lte_info_set_lte_net_info(struct lte_inf
     lte_net_info = report->lte_net_info;
     if (lte_net_info == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1115,7 +1115,7 @@ static Interfaces__LteInfo__LteDataUsage *lte_info_set_lte_data_usage(struct lte
     lte_data_usage = report->lte_data_usage;
     if (lte_data_usage == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1146,7 +1146,7 @@ static Interfaces__LteInfo__LteNetServingCellInfo *lte_info_set_srv_cell(struct
     cell = report->lte_srv_cell;
     if (cell == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1299,7 +1299,7 @@ static Interfaces__LteInfo__LteNetCarrierAggInfo *lte_info_set_pb_primary_carrie
     pca = report->lte_pca_info;
     if (pca == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1334,7 +1334,7 @@ static Interfaces__LteInfo__LteNetCarrierAggInfo *lte_info_set_pb_secondary_carr
     sca = report->lte_sca_info;
     if (sca == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1369,7 +1369,7 @@ static Interfaces__LteInfo__LtePDPContextInfo *lte_info_set_pb_pdp_ctx_param(str
     pdp_ctx = report->lte_pdp_ctx_info;
     if (pdp_ctx == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1410,7 +1410,7 @@ static Interfaces__LteInfo__CellularNr5gSaServingCellInfo *cellular_info_set_pb_
     cell = report->nr5g_sa_srv_cell;
     if (cell == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1474,7 +1474,7 @@ static Interfaces__LteInfo__CellularNr5gNsaServingCellInfo *cellular_info_set_pb
     cell = report->nr5g_nsa_srv_cell;
     if (cell == NULL) return NULL;
 
-    /* Allocate the signal quality mesage */
+    /* Allocate the signal quality message */
     pb = CALLOC(1, sizeof(*pb));
 
     /* Initialize the message */
@@ -1665,7 +1665,7 @@ static Interfaces__LteInfo__LteInfoReport *lte_info_set_pb_report(struct lte_inf
  * @brief Generates a lte info serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see lte_info_free_packed_buffer() for this purpose.
  *
diff --git a/src/cellm/src/cellm_main.c b/src/cellm/src/cellm_main.c
index 946519ad..c1730246 100644
--- a/src/cellm/src/cellm_main.c
+++ b/src/cellm/src/cellm_main.c
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
         return -1;
     }
 
-    // Initialzie CELLM
+    // Initialize CELLM
     cellm_info_event_init();
 
     // Create client table
diff --git a/src/cellm/src/cellm_ovsdb.c b/src/cellm/src/cellm_ovsdb.c
index 9f94bf82..aed0ed86 100644
--- a/src/cellm/src/cellm_ovsdb.c
+++ b/src/cellm/src/cellm_ovsdb.c
@@ -1175,7 +1175,7 @@ void callback_Wifi_Inet_State(
             rc = strncmp(old_inet_state->if_type, LTE_TYPE_NAME, strlen(old_inet_state->if_type));
             if (!rc)
             {
-                LOGI("%s: OVSDB_UDATE_DEL: %s, CELLM_STATE_DOWN", __func__, old_inet_state->if_name);
+                LOGI("%s: OVSDB_UPDATE_DEL: %s, CELLM_STATE_DOWN", __func__, old_inet_state->if_name);
                 cellm_set_state(CELLM_STATE_DOWN);
             }
             break;
diff --git a/src/cm2/kconfig/Kconfig.managers b/src/cm2/kconfig/Kconfig.managers
index 7d029eb8..05fc0870 100644
--- a/src/cm2/kconfig/Kconfig.managers
+++ b/src/cm2/kconfig/Kconfig.managers
@@ -29,7 +29,7 @@ if MANAGER_CM
         bool "Set default uplink priority based on radio band"
         default n
         help
-            Use dafault uplink priority based on radio type for WiFi links, using during onboarding
+            Use default uplink priority based on radio type for WiFi links, using during onboarding
 
     config CM2_USE_DRYRUN_ON_GRE
         bool "Use udhcpc dryrun on gre interfaces"
diff --git a/src/cm2/src/cm2_net.c b/src/cm2/src/cm2_net.c
index 84ab738c..5e8a54b2 100644
--- a/src/cm2/src/cm2_net.c
+++ b/src/cm2/src/cm2_net.c
@@ -421,7 +421,7 @@ static void cm2_dhcpc_dryrun_cb(struct ev_loop *loop, ev_child *w, int revents)
         if (cm2_is_eth_type(dhcp_dryrun->if_type) &&
                    g_state.link.is_used &&
                    cm2_is_wifi_type(g_state.link.if_type)) {
-            LOGI("%s: Detected Leaf with pluged ethernet, connected = %d",
+            LOGI("%s: Detected Leaf with plugged ethernet, connected = %d",
                  dhcp_dryrun->if_name, g_state.connected);
             eth_timeout = g_state.connected ? CONFIG_CM2_ETHERNET_SHORT_DELAY : CONFIG_CM2_ETHERNET_LONG_DELAY;
             cm2_delayed_eth_update(dhcp_dryrun->if_name, eth_timeout);
diff --git a/src/cm2/src/cm2_ovsdb.c b/src/cm2/src/cm2_ovsdb.c
index 49a31835..8d4eef28 100644
--- a/src/cm2/src/cm2_ovsdb.c
+++ b/src/cm2/src/cm2_ovsdb.c
@@ -2573,7 +2573,7 @@ cm2_Connection_Manager_Uplink_handle_update(
         if (uplink->is_used) {
             // Ignore if_name so the usecase when customer changes eth connected leaf
             // to wifi connected leaf. This will create LINK event as disconnect on eth and
-            // would create a LINK event as conencted on wifi link which is ok.
+            // would create a LINK event as connected on wifi link which is ok.
             if (uplink->has_L2)
             {
                 cm2_uplink_event_add_event(time_real(), true, CM2_UPLINK_LINK);
@@ -2830,7 +2830,7 @@ static void cm2_reconfigure_ethernet_states(bool blocked)
                                   ETH_TYPE_NAME,
                                   &count);
     if (!uplink_p) {
-        LOGD("%s: Ethernet uplinks no avaialble", __func__);
+        LOGD("%s: Ethernet uplinks no available", __func__);
         return;
     }
 
@@ -2854,7 +2854,7 @@ static void cm2_reconfigure_ethernet_states(bool blocked)
         }
 
         if (!uplink->has_L3) {
-            LOGI("%s: Ethernet link must be examinated once again", uplink->if_name);
+            LOGI("%s: Ethernet link must be examined once again", uplink->if_name);
             cm2_dhcpc_start_dryrun(uplink->if_name, uplink->if_type, 0);
             cm2_delayed_eth_update(uplink->if_name, CONFIG_CM2_ETHERNET_LONG_DELAY);
         }
diff --git a/src/cm2/src/cm2_resolve_ares.c b/src/cm2/src/cm2_resolve_ares.c
index a7c84cbb..6b369a67 100644
--- a/src/cm2/src/cm2_resolve_ares.c
+++ b/src/cm2/src/cm2_resolve_ares.c
@@ -415,7 +415,7 @@ void cm2_move_next_target_addr(void)
     else
         addr->ipv4_addr_list.h_cur_idx++;
 
-    // Flip it so everytime we tend to try a diffirent one
+    // Flip it so everytime we tend to try a different one
     addr->ipv6_pref = !addr->ipv6_pref;
 }
 
diff --git a/src/cm2/src/cm2_stability.c b/src/cm2/src/cm2_stability.c
index 53f54ad0..46b96366 100644
--- a/src/cm2/src/cm2_stability.c
+++ b/src/cm2/src/cm2_stability.c
@@ -526,7 +526,7 @@ static bool cm2_connection_req_stability_process(const char *if_name,
         }
         else
         {
-            // This will triggeres the call periodically, actuall check if pod is in the
+            // This will triggers the call periodically, actuall check if pod is in the
             // middle of outage event is done in cm2_network_state_add_event function
             if (cm2_uplink_event_is_wan_iface(if_name))
             {
@@ -572,7 +572,7 @@ static bool cm2_connection_req_stability_process(const char *if_name,
         }
         else
         {
-            // This will triggeres the call periodically, actuall check if pod is in the
+            // This will triggers the call periodically, actuall check if pod is in the
             // middle of outage event is done in cm2_network_state_add_event function
             if (cm2_uplink_event_is_wan_iface(if_name))
             {
diff --git a/src/cm2/src/cm2_uplink_event.c b/src/cm2/src/cm2_uplink_event.c
index df9bfac3..6d28dbb6 100644
--- a/src/cm2/src/cm2_uplink_event.c
+++ b/src/cm2/src/cm2_uplink_event.c
@@ -125,7 +125,7 @@ bool cm2_uplink_event_store (struct cm2_uplink_events *cm2_uplink)
         goto exit;
     }
 
-    // Store the string representation to peristent storage
+    // Store the string representation to persistent storage
     rstrsz = (ssize_t)strlen(rstr) + 1;
     if (osp_ps_set(ps, CM2_UPLINK_EVENT_KEY, rstr, (size_t)rstrsz) < rstrsz)
     {
diff --git a/src/dm/kconfig/Kconfig.managers b/src/dm/kconfig/Kconfig.managers
index 90e2a416..46fa879f 100644
--- a/src/dm/kconfig/Kconfig.managers
+++ b/src/dm/kconfig/Kconfig.managers
@@ -8,7 +8,7 @@ if MANAGER_DM
         default "$(INSTALL_PREFIX)/bin"
         help
             Search path that will be used to locate managers. Multiple paths
-            can be specified by using ; as seperator.
+            can be specified by using ; as separator.
 
     config DM_PID_PATH
         string "Path to the PID folder"
diff --git a/src/dm/src/dm_manager.c b/src/dm/src/dm_manager.c
index f56ec6f4..0d15a5f0 100644
--- a/src/dm/src/dm_manager.c
+++ b/src/dm/src/dm_manager.c
@@ -70,7 +70,7 @@ struct dm_manager
     int                 dm_restart_delay;           /* Restart delay in ms */
     int                 dm_mem_max;                 /* Max memory in kB */
     int                 dm_mem_max_cnt;             /* Max memory exceed counter limit */
-    int                 dm_mem_highest;             /* Higest memory in kB */
+    int                 dm_mem_highest;             /* Highest memory in kB */
     int                 dm_mem_exceed_cnt;          /* Memory limit exceeded counter */
     ds_tree_node_t      dm_tnode;                   /* Linked list node */
     pid_t               dm_pid;                     /* Manager process ID or <0 if not started */
diff --git a/src/dm/src/dm_ovsdb.c b/src/dm/src/dm_ovsdb.c
index 4a4fc0a3..225705b1 100644
--- a/src/dm/src/dm_ovsdb.c
+++ b/src/dm/src/dm_ovsdb.c
@@ -292,7 +292,7 @@ bool act_check_id (void)
 bool dm_ovsdb_ovs_version_get(char *buff, size_t buffsz)
 {
     /*
-     * OVS bridge support has been droped with OpenSync release 6.6,
+     * OVS bridge support has been dropped with OpenSync release 6.6,
      * therefore we always return N/A as the OVS version.
      */
     strscpy(buff, "N/A", buffsz);
diff --git a/src/dm/src/dm_reboot.c b/src/dm/src/dm_reboot.c
index 7410c5bf..a4a6f354 100644
--- a/src/dm/src/dm_reboot.c
+++ b/src/dm/src/dm_reboot.c
@@ -317,7 +317,7 @@ bool dm_reboot_store(struct dm_reboot *dr)
     }
 
     /*
-     * Store the string representation to peristent storage
+     * Store the string representation to persistent storage
      */
     rstrsz = (ssize_t)strlen(rstr) + 1;
     if (osp_ps_set(ps, DM_REBOOT_KEY, rstr, (size_t)rstrsz) < rstrsz)
diff --git a/src/fcm/src/fcm_mgr.c b/src/fcm/src/fcm_mgr.c
index 7b47c7e7..056adc6a 100644
--- a/src/fcm/src/fcm_mgr.c
+++ b/src/fcm/src/fcm_mgr.c
@@ -899,7 +899,7 @@ bool fcm_init_mgr(struct ev_loop *loop)
     /* Set the initial max memory threshold */
     fcm_set_max_mem();
 
-    LOGT("%s(): initializing curl hanlder", __func__);
+    LOGT("%s(): initializing curl handler", __func__);
     gk_curl_easy_init(&mgr->ecurl);
 
     /* Set the default timer for neigh_table entries*/
@@ -915,7 +915,7 @@ bool fcm_init_mgr(struct ev_loop *loop)
 
     if (nf_ct_init(loop, mgr->dummy_aggr) < 0)
     {
-        LOGE("Eror initializing conntrack");
+        LOGE("Error initializing conntrack");
         return -1;
     }
 
diff --git a/src/fcm/ut/test_fcm_mgr.c b/src/fcm/ut/test_fcm_mgr.c
index a602ed11..b1252dbe 100644
--- a/src/fcm/ut/test_fcm_mgr.c
+++ b/src/fcm/ut/test_fcm_mgr.c
@@ -161,7 +161,7 @@ static struct schema_FCM_Report_Config test_report[] =
  */
 bool native_ovsdb_table_upsert_where(ovsdb_table_t *table, json_t *where, void *record, bool update_uuid)
 {
-    LOGD("%s: Upsert opration for native platform", __func__);
+    LOGD("%s: Upsert operation for native platform", __func__);
     json_decref(where);
     return true;
 }
diff --git a/src/fsm/inc/fsm.h b/src/fsm/inc/fsm.h
index 5c790ef8..86e27735 100644
--- a/src/fsm/inc/fsm.h
+++ b/src/fsm/inc/fsm.h
@@ -119,7 +119,7 @@ struct fsm_session_ops
     /* notify if identical session loaded/unloaded */
     void (*notify_identical_sessions)(struct fsm_session *, bool);
 
-    /* notify of dpi connetion to free.*/
+    /* notify of dpi connection to free.*/
     void (*dpi_free_conn_ctxt)(struct net_md_stats_accumulator *);
 };
 
@@ -441,7 +441,7 @@ struct fsm_session
     int64_t report_count;            /* mqtt reports counter */
     struct ev_loop *loop;            /* event loop */
     struct fsm_session *service;     /* service provider */
-    ds_tree_node_t fsm_node;         /* Seesion manager node handle */
+    ds_tree_node_t fsm_node;         /* Session manager node handle */
     char bridge[64];                 /* underlying bridge name */
     char tx_intf[64];                /* plugin's TX interface */
     long dpi_stats_report_interval;  /* dpi stats reporting interval */
@@ -737,7 +737,7 @@ fsm_is_dpi(struct fsm_session *session);
  * @brief initializes the dpi resources of a dispatcher session
  *
  * @param session the dispatcher session
- * @return true if the initialization succeeeded, false otherwise
+ * @return true if the initialization succeeded, false otherwise
  */
 bool
 fsm_init_dpi_dispatcher(struct fsm_session *session);
diff --git a/src/fsm/src/fsm_dpi.c b/src/fsm/src/fsm_dpi.c
index 08d0b659..d4cd87b5 100644
--- a/src/fsm/src/fsm_dpi.c
+++ b/src/fsm/src/fsm_dpi.c
@@ -261,7 +261,7 @@ fsm_dpi_add_plugin_to_dispatcher(struct fsm_session *session)
     /* Get the dpi plugin context */
     dpi_plugin = &session->dpi->plugin;
 
-    /* Check if the dpi plugin is alread bound to a dispatcher */
+    /* Check if the dpi plugin is already bound to a dispatcher */
     if (dpi_plugin->bound) return false;
 
     /* Retrieve the dispatcher session */
@@ -628,7 +628,7 @@ fsm_dpi_sessions_cmp(const void *a, const void *b)
 /**
  * @brief report filter routine
  *
- * @param acc the accumulater checked to be reported
+ * @param acc the accumulator checked to be reported
  * @return true if the flow should be reported, false otherwise
  */
 static bool
@@ -1256,7 +1256,7 @@ fsm_dispatcher_init_tap_intfs(struct fsm_session *dispatcher)
  * @brief initializes the dpi resources of a dispatcher session
  *
  * @param session the dispatcher session
- * @return true if the initialization succeeeded, false otherwise
+ * @return true if the initialization succeeded, false otherwise
  */
 bool
 fsm_init_dpi_dispatcher(struct fsm_session *session)
diff --git a/src/fsm/src/fsm_main.c b/src/fsm/src/fsm_main.c
index 371c4acb..7d923602 100644
--- a/src/fsm/src/fsm_main.c
+++ b/src/fsm/src/fsm_main.c
@@ -159,7 +159,7 @@ int main(int argc, char ** argv)
 
     if (nf_ct_init(loop, NULL) < 0)
     {
-        LOGE("Eror initializing conntrack\n");
+        LOGE("Error initializing conntrack\n");
         return -1;
     }
 
diff --git a/src/fsm/src/fsm_ovsdb.c b/src/fsm/src/fsm_ovsdb.c
index 38c59a8d..3079be81 100644
--- a/src/fsm/src/fsm_ovsdb.c
+++ b/src/fsm/src/fsm_ovsdb.c
@@ -754,7 +754,7 @@ fsm_parse_dso(struct fsm_session *session)
     }
     else
     {
-        LOGD("%s: plugin: No explicit plugin DSO. Infering from name: %s",
+        LOGD("%s: plugin: No explicit plugin DSO. Inferring from name: %s",
              __func__, session->name);
         if (session->name)
         {
@@ -882,7 +882,7 @@ fsm_match_init(struct fsm_session *session)
         ret = plugin_init_table[i].init(session);
         if (ret != 0) return false;
 
-        /* Wrap up initialization now that the plugin itsef is fully initialized */
+        /* Wrap up initialization now that the plugin itself is fully initialized */
         ret = fsm_wrap_init_plugin(session);
         return ret;
     }
@@ -950,7 +950,7 @@ fsm_init_plugin(struct fsm_session *session)
     rc = init(session);
     if (rc != 0) return false;
 
-    /* Wrap up initialization now that the plugin itsef is fully initialized */
+    /* Wrap up initialization now that the plugin itself is fully initialized */
     ret = fsm_wrap_init_plugin(session);
 
     return ret;
diff --git a/src/fsm/ut/test_fsm_core.c b/src/fsm/ut/test_fsm_core.c
index b4d9577b..ca89be34 100644
--- a/src/fsm/ut/test_fsm_core.c
+++ b/src/fsm/ut/test_fsm_core.c
@@ -1783,7 +1783,7 @@ test_4_dpi_dispatcher_and_plugin(void)
  * Bump up the flow's ref count so it's not removed when outdated.
  * The periodic routine is called twice with a delay greater than the
  * the programmed life of a flow. Validate that the flow is not removed.
- * Reset the flow' refcount. Validate it's gettting removed once outdated.
+ * Reset the flow' refcount. Validate it's getting removed once outdated.
  * The dpi plugin is then removed.
  */
 void
@@ -2763,7 +2763,7 @@ free_client_plugin_session(void)
 /**
  * @brief test if new flow attribute is registered
  *        with dpi plugin
- * inital flow attribute values:
+ * initial flow attribute values:
  * foo.http_dev, foo.sni_dev, foo.http_cloud, foo.sni_cloud
  * foo.app_cloud
  */
@@ -2798,7 +2798,7 @@ test_add_new_tag_value(void)
 /**
  * @brief test if deleted flow attribute is unregistered
  *        with dpi plugin
- * inital flow attribute values:
+ * initial flow attribute values:
  * foo.http_dev, foo.sni_dev, foo.http_cloud, foo.sni_cloud
  * foo.app_cloud
  */
@@ -2834,7 +2834,7 @@ test_del_tag_value(void)
  * @brief test for update flow attributes
  *        deleted attributes should be unregistered
  *        added attributes should be registered
- * inital flow attribute values:
+ * initial flow attribute values:
  * foo.http_dev, foo.sni_dev, foo.http_cloud, foo.sni_cloud
  * foo.app_cloud
  */
@@ -3060,7 +3060,7 @@ test_10_dpi_dispatcher_included_excluded_devices(void)
     TEST_ASSERT_NOT_NULL(dispatch_ops->handler);
     dispatch_ops->handler(dispatcher, net_parser);
 
-    /* source mac is in the excluded devcies */
+    /* source mac is in the excluded devices */
     /* Validate that an accumulator not was created */
     TEST_ASSERT_NULL(net_parser->acc);
 
diff --git a/src/lib/arena/src/arena.c b/src/lib/arena/src/arena.c
index ccc51cbe..54a44dfb 100644
--- a/src/lib/arena/src/arena.c
+++ b/src/lib/arena/src/arena.c
@@ -354,7 +354,7 @@ void *arena_mresize(arena_t *arena, void *ptr, size_t ptrsz, size_t newsz)
     }
 
     /*
-     * Not enoguh space in the curernt chunk, we need to move the data to a new
+     * Not enough space in the current chunk, we need to move the data to a new
      * chunk. Allocate a chunk that is at least 1.5 times bigger than `newsz`.
      */
     size_t rsz = (SIZE_MAX - (newsz >> 1)) < newsz ? SIZE_MAX : (newsz + (newsz >> 1));
@@ -388,7 +388,7 @@ void *arena_mresize(arena_t *arena, void *ptr, size_t ptrsz, size_t newsz)
 /*
  * Append memory to the buffer pointed to by `ptr`. The ergonomics of this
  * function are designed for resizing growable arrays. If `ptr` is NULL
- * a new memmory-aligned buffer is allocated.
+ * a new memory-aligned buffer is allocated.
  *
  * `ptr` + `membsz` * `cur` must point exactly to the end of arena. The buffer
  * is expanded by `grow` * `membsz` bytes.
diff --git a/src/lib/arena/src/arena_scratch.c b/src/lib/arena/src/arena_scratch.c
index 2404a8f6..14790830 100644
--- a/src/lib/arena/src/arena_scratch.c
+++ b/src/lib/arena/src/arena_scratch.c
@@ -63,7 +63,7 @@ arena_t *__arena_scratch(arena_t **conflicts)
             {
                 if (*c == arena_scratch_list[s]) break;
             }
-            /* No conflcits found, break out */
+            /* No conflicts found, break out */
             if (*c == NULL) break;
         }
         if (s >= ARENA_SCRATCH_NUM)
diff --git a/src/lib/arena/src/arena_string.c b/src/lib/arena/src/arena_string.c
index b45e30d9..eec89182 100644
--- a/src/lib/arena/src/arena_string.c
+++ b/src/lib/arena/src/arena_string.c
@@ -110,7 +110,7 @@ char *arena_vprintf(arena_t *arena, const char *fmt, va_list va)
      * just copy it to the arena.
      *
      * If it fails, we know the size of the string, so we can allocate the right
-     * amount of memory and do a 2nd call to vsnprintf() with the correct lenght.
+     * amount of memory and do a 2nd call to vsnprintf() with the correct length.
      */
     len = vsnprintf(sbuf, sizeof(sbuf), fmt, va);
     if (len < 0) return NULL;
@@ -167,7 +167,7 @@ char *arena_vcprintf(arena_t *arena, char *str, const char *fmt, va_list va)
      * just copy it to the arena.
      *
      * If it fails, we know the size of the string, so we can allocate the right
-     * amount of memory and do a 2nd call to vsnprintf() with the correct lenght.
+     * amount of memory and do a 2nd call to vsnprintf() with the correct length.
      */
     len = vsnprintf(sbuf, sizeof(sbuf), fmt, va);
     if (len < 0)
diff --git a/src/lib/arena/ut/base/test_arena.c b/src/lib/arena/ut/base/test_arena.c
index 67e5b332..9e34fc79 100644
--- a/src/lib/arena/ut/base/test_arena.c
+++ b/src/lib/arena/ut/base/test_arena.c
@@ -126,7 +126,7 @@ void test_arena_set_get(void)
     p1 = arena_get(c);
     TEST_ASSERT_FALSE(p1 == NULL);
 
-    /* Allocate a region that is larger than the defualt chunk size so push
+    /* Allocate a region that is larger than the default chunk size so push
      * is force to allocate a new chunk */
     p2 = arena_push(c, ARENA_GROW_SIZE);
     TEST_ASSERT_FALSE(p2 == NULL);
@@ -622,7 +622,7 @@ void test_arena_defer(void)
     TEST_ASSERT_TRUE(a == 0);
     TEST_ASSERT_TRUE(arena_pop(c, SIZE_MAX) != ARENA_ERROR);
 
-    /* Test deferal on arena delete */
+    /* Test deferral on arena delete */
     a = 0;
     TEST_ASSERT_TRUE(arena_defer(c, test_arena_defer_fn, &a));
     TEST_ASSERT_TRUE(arena_del(c) != ARENA_ERROR);
diff --git a/src/lib/arp_parse/inc/arp_parse.h b/src/lib/arp_parse/inc/arp_parse.h
index 59f48021..456ebc3d 100644
--- a/src/lib/arp_parse/inc/arp_parse.h
+++ b/src/lib/arp_parse/inc/arp_parse.h
@@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "os_types.h"
 
 /**
- * @brief ehternet ARP
+ * @brief ethernet ARP
  */
 struct eth_arp
 {
diff --git a/src/lib/brctl_mac_learn/unit.mk b/src/lib/brctl_mac_learn/unit.mk
index 20dcdaad..9b741d85 100644
--- a/src/lib/brctl_mac_learn/unit.mk
+++ b/src/lib/brctl_mac_learn/unit.mk
@@ -24,7 +24,7 @@
 
 ###############################################################################
 #
-# MAC Learning library - BRCTL implementaion
+# MAC Learning library - BRCTL implementation
 #
 ###############################################################################
 UNIT_NAME := brctl_mac_learn
diff --git a/src/lib/common/inc/util.h b/src/lib/common/inc/util.h
index 0ad76270..72eb65c0 100644
--- a/src/lib/common/inc/util.h
+++ b/src/lib/common/inc/util.h
@@ -181,7 +181,7 @@ const int *unii_5g_chan2list(int chan, int width);
  */
 const int *unii_6g_chan2list(int chan, int width);
 /*
- * Gets 6GHz channels list for requied segment.
+ * Gets 6GHz channels list for required segment.
  * Functions below are specialised for 320MHz
  * channels with respect to band scheme (_1/_2)
  * @param channel
diff --git a/src/lib/common/src/os_exec.c b/src/lib/common/src/os_exec.c
index 82904610..58e3bb6f 100644
--- a/src/lib/common/src/os_exec.c
+++ b/src/lib/common/src/os_exec.c
@@ -47,7 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   exit_code : command exit code
  * return:
  *   true on success
- * default behvaiour (flags=0):
+ * default behaviour (flags=0):
  *   log all output
  *   require exit_code = 0 or return failure
  *   on failure use error log severity
diff --git a/src/lib/common/src/util.c b/src/lib/common/src/util.c
index 593b5b2b..1e65661c 100644
--- a/src/lib/common/src/util.c
+++ b/src/lib/common/src/util.c
@@ -762,7 +762,7 @@ char *str_trimws(char *s)
 }
 
 /*
- * Delete all occurences or characters `chars` in string
+ * Delete all occurrences or characters `chars` in string
  * `str`
  *
  * Note: This function modifies the input string.
diff --git a/src/lib/connector/inc/connector.h b/src/lib/connector/inc/connector.h
index 603b2620..c7663738 100644
--- a/src/lib/connector/inc/connector.h
+++ b/src/lib/connector/inc/connector.h
@@ -182,7 +182,7 @@ bool connector_dhcp_reservation_del(const struct schema_DHCP_reserved_IP *rip);
  *              update info in external database
  * @param[in] pschema - IP port reservation row
  *
- * @retun success of synchronization
+ * @return success of synchronization
  */
 bool connector_portforward_add(const struct schema_IP_Port_Forward *pschema);
 
@@ -193,7 +193,7 @@ bool connector_portforward_add(const struct schema_IP_Port_Forward *pschema);
  *              update info in external database
  * @param[in] pschema - IP port reservation row
  *
- * @retun success of synchronization
+ * @return success of synchronization
  */
 bool connector_portforward_modify(const struct schema_IP_Port_Forward *pschema);
 
@@ -204,7 +204,7 @@ bool connector_portforward_modify(const struct schema_IP_Port_Forward *pschema);
  *              update info in external database
  * @param[in] pschema - IP port reservation row
  *
- * @retun success of synchronization
+ * @return success of synchronization
  */
 bool connector_portforward_del(const struct schema_IP_Port_Forward *pschema);
 #endif /* CONNECTOR_H_INCLUDED */
diff --git a/src/lib/const/inc/const.h b/src/lib/const/inc/const.h
index b757622e..6c731b59 100644
--- a/src/lib/const/inc/const.h
+++ b/src/lib/const/inc/const.h
@@ -202,7 +202,7 @@ extern bool             _c_get_param_by_key(c_item_t *list, int list_sz, int key
  *      MY_OPTION_MAX,
  * };
  *
- * uint8_t  my_option_bytes[C_SET_LEN(MY_OPTION_MAX, uint8_t)]; // ARRAY_LEN(my_option_byets) == 2
+ * uint8_t  my_option_bytes[C_SET_LEN(MY_OPTION_MAX, uint8_t)]; // ARRAY_LEN(my_option_bytes) == 2
  * uint32_t my_option_ints[C_SET_LEN(MY_OPTION_MAX, uint32_t)]; // ARRAY_LEN(my_option_ints) == 1
  *
  * CSET_ADD(my_option_bytes, MY_OPTION_3);
diff --git a/src/lib/ct_stats/ut/test_ct_stats.c b/src/lib/ct_stats/ut/test_ct_stats.c
index a72479b9..ca3c3835 100644
--- a/src/lib/ct_stats/ut/test_ct_stats.c
+++ b/src/lib/ct_stats/ut/test_ct_stats.c
@@ -175,7 +175,7 @@ ct_stats_setUp(void)
 
     if (nf_ct_init(loop, NULL) < 0)
     {
-        LOGE("Eror initializing conntrack");
+        LOGE("Error initializing conntrack");
         return;
     }
 
diff --git a/src/lib/daemon/src/daemon.c b/src/lib/daemon/src/daemon.c
index ed2990e0..a58bacae 100644
--- a/src/lib/daemon/src/daemon.c
+++ b/src/lib/daemon/src/daemon.c
@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "read_until.h"
 #include "memutil.h"
 
-#define DAEMON_DEFAULT_RESTART_DELAY      1.0   /* Default delay between daemon restarts in secods */
+#define DAEMON_DEFAULT_RESTART_DELAY      1.0   /* Default delay between daemon restarts in seconds */
 #define DAEMON_DEFAULT_RESTART_MAX        5     /* Number of retries before giving up */
 #define DAEMON_DEFAULT_KILL_TIMEOUT       10.0   /* Seconds to wait for child termination */
 
@@ -671,7 +671,7 @@ bool daemon_waitpid(
         /* Check if we can reap the status */
         if (waitpid(pid, wstatus, WNOHANG) == pid)
         {
-            /* Sucess, return the status */
+            /* Success, return the status */
             retval = true;
             goto exit;
         }
@@ -693,7 +693,7 @@ bool daemon_waitpid(
 /**
  * Kill an unrelated process
  *
- * This function fails to detect if the process-to-be-terminatd is a zombie. In such case it will
+ * This function fails to detect if the process-to-be-terminated is a zombie. In such case it will
  * return false (termination failed).
  *
  * TODO Add some /proc magic to determine if the process is a zombie or not.
diff --git a/src/lib/daemon/ut/daemon_test.c b/src/lib/daemon/ut/daemon_test.c
index 941fb670..35ca92ec 100644
--- a/src/lib/daemon/ut/daemon_test.c
+++ b/src/lib/daemon/ut/daemon_test.c
@@ -151,7 +151,7 @@ void test_daemon_wait(void)
 
     TEST_ASSERT_TRUE_MESSAGE(
             daemon_stop(&pr),
-            "Unalbe to stop process");
+            "Unable to stop process");
 
     daemon_fini(&pr);
 }
@@ -180,7 +180,7 @@ void test_daemon_wait_neg(void)
 
     TEST_ASSERT_TRUE_MESSAGE(
             daemon_stop(&pr),
-            "Unalbe to stop process");
+            "Unable to stop process");
 
     daemon_fini(&pr);
 }
diff --git a/src/lib/data_report_tags/src/data_report_tags.c b/src/lib/data_report_tags/src/data_report_tags.c
index d5e0784c..78bb3222 100644
--- a/src/lib/data_report_tags/src/data_report_tags.c
+++ b/src/lib/data_report_tags/src/data_report_tags.c
@@ -87,7 +87,7 @@ drt_op_to_str(enum drt_precedence op)
     {
         if (drt_op_str[i].op == op) return drt_op_str[i].str_op;
     }
-    return "unkown";
+    return "unknown";
 }
 
 
diff --git a/src/lib/datapipeline/inc/dpp_radius_stats.h b/src/lib/datapipeline/inc/dpp_radius_stats.h
index 4ca41600..a3481c16 100644
--- a/src/lib/datapipeline/inc/dpp_radius_stats.h
+++ b/src/lib/datapipeline/inc/dpp_radius_stats.h
@@ -72,7 +72,7 @@ typedef struct dpp_radius_stats_rec
 
     /*
     * The function that allocated the data object provides the cleanup function.
-    * As the data object pointer is passed, the ownership is transfered and the
+    * As the data object pointer is passed, the ownership is transferred and the
     * last owner, that is, the function that does not transfer the ownership,
     * "promises" that it will call the cleanup function by passing to it the
     * pointer to the data object it inherited.
diff --git a/src/lib/datapipeline/inc/dppline.h b/src/lib/datapipeline/inc/dppline.h
index 5c436ab2..f25cb4ce 100644
--- a/src/lib/datapipeline/inc/dppline.h
+++ b/src/lib/datapipeline/inc/dppline.h
@@ -51,7 +51,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifdef CONFIG_MANAGER_QM
 // QM does queue-ing of reports when offline on it's own, so dpp needs
 // a smaller queue size - only to merge multiple stats to single report
-// 30 is requierd for mqttsim --rpm 2 to work properly
+// 30 is required for mqttsim --rpm 2 to work properly
 #define DPP_MAX_QUEUE_DEPTH (30)
 #else
 #define DPP_MAX_QUEUE_DEPTH (200)
diff --git a/src/lib/dhcp_relay/src/dhcp_relay.c b/src/lib/dhcp_relay/src/dhcp_relay.c
index 709d3219..fd3e00f1 100644
--- a/src/lib/dhcp_relay/src/dhcp_relay.c
+++ b/src/lib/dhcp_relay/src/dhcp_relay.c
@@ -227,7 +227,7 @@ dhcp_relay_relay_options_init(void)
         char *str = NULL;
         char *value = NULL;
 
-        /* Check IPv6 or IPv4 option and select versio */
+        /* Check IPv6 or IPv4 option and select version */
         rc = strncmp(p, "DHCPv4_OPTION:", strlen("DHCPv4_OPTION:"));
         if (!rc)
         {
diff --git a/src/lib/dhcp_relay/src/dhcpv4_relay.c b/src/lib/dhcp_relay/src/dhcpv4_relay.c
index 220f1841..e2b9c625 100644
--- a/src/lib/dhcp_relay/src/dhcpv4_relay.c
+++ b/src/lib/dhcp_relay/src/dhcpv4_relay.c
@@ -137,7 +137,7 @@ dhcp_relay_option82_insert(struct dhcp_relay_conf_options *opt,
     /* Set the Option Agent Information ID */
     *popt++ = DHCP_OPTION_AGENT_INFORMATION;
 
-    /* Set the Option Agent Information ID Legth */
+    /* Set the Option Agent Information ID Length */
     *popt++ =  size_option;
 
     /* Set Sub Option Cuircuit ID*/
diff --git a/src/lib/dns_parse/inc/network.h b/src/lib/dns_parse/inc/network.h
index 634be8ad..173e2d83 100644
--- a/src/lib/dns_parse/inc/network.h
+++ b/src/lib/dns_parse/inc/network.h
@@ -48,12 +48,12 @@ typedef struct
 
 /*
  *Compare IP header length with Packet size
- *if IP header length is greather than Packet size
- *then we have recieved malformed packet
+ *if IP header length is greater than Packet size
+ *then we have received malformed packet
  */
 #define HEADER_LEN_CHECK(h_len, p_len, p_packet)                        \
     if (h_len > p_len) {                                                \
-        LOGD("%s: %s: recieved Malformed packet ", __FILE__, __func__); \
+        LOGD("%s: %s: received Malformed packet ", __FILE__, __func__); \
         p_packet = NULL;                                                \
         return 0;                                                       \
     }
diff --git a/src/lib/dpi_stats/inc/dpi_stats.h b/src/lib/dpi_stats/inc/dpi_stats.h
index ea8c098f..ae4e733c 100644
--- a/src/lib/dpi_stats/inc/dpi_stats.h
+++ b/src/lib/dpi_stats/inc/dpi_stats.h
@@ -201,7 +201,7 @@ dpi_stats_free_packed_buffer(struct dpi_stats_packed_buffer *pb);
  * @brief Generates a dpi stats serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see dpi_stats_free_packed_buffer() for this purpose.
  *
diff --git a/src/lib/dpi_stats/src/dpi_stats.c b/src/lib/dpi_stats/src/dpi_stats.c
index 26a44115..8a6afc98 100644
--- a/src/lib/dpi_stats/src/dpi_stats.c
+++ b/src/lib/dpi_stats/src/dpi_stats.c
@@ -829,7 +829,7 @@ dpi_stats_free_packed_buffer(struct dpi_stats_packed_buffer *pb)
  * @brief Generates a dpi stats serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see dpi_stats_free_packed_buffer() for this purpose.
  *
diff --git a/src/lib/ds/README.md b/src/lib/ds/README.md
index 2081d5ce..5303943d 100644
--- a/src/lib/ds/README.md
+++ b/src/lib/ds/README.md
@@ -64,7 +64,7 @@ struct my_data
      * Data structure nodes
      */
     ds_list_node_t      lnode;              /* Single list node data    */
-    ds_dlist_node_t     dnode;              /* Dobule list data         */
+    ds_dlist_node_t     dnode;              /* Double list data         */
     ds_tree_node_t      tnode;              /* Tree node data           */
 };
 
@@ -109,7 +109,7 @@ ds_list_t list = DS_LIST_INIT(struct my_data, lnode);
 /* Declare an iterator */
 ds_list_iter_t iter;
 
-/* Run-time initilizer */
+/* Run-time initializer */
 ds_list_init(&list, struct my_data, lnode);
 
 ```
@@ -171,7 +171,7 @@ ds_dlist_t dlist = DS_DLIST_INIT(struct my_data, dnode);
 /* Declare an iterator */
 ds_dlist_iter_t iter;
 
-/* Run-time initilizer */
+/* Run-time initializer */
 ds_dlist_init(&dlist, struct my_data, dnode);
 ```
 
diff --git a/src/lib/ds/src/ds_dlist.c.h b/src/lib/ds/src/ds_dlist.c.h
index 89404e18..924d9faf 100644
--- a/src/lib/ds/src/ds_dlist.c.h
+++ b/src/lib/ds/src/ds_dlist.c.h
@@ -138,7 +138,7 @@ static inline void ds_dlist_insert_before(ds_dlist_t *list, void *before, void *
 }
 
 /**
- * Insert elemt @p cont at the tail of the list; @p cont becomes the new tail
+ * Insert element @p cont at the tail of the list; @p cont becomes the new tail
  */
 static inline void ds_dlist_insert_tail(ds_dlist_t* list, void *data)
 {
diff --git a/src/lib/ds/src/ds_tree.c.h b/src/lib/ds/src/ds_tree.c.h
index c77361cc..264bb63c 100644
--- a/src/lib/ds/src/ds_tree.c.h
+++ b/src/lib/ds/src/ds_tree.c.h
@@ -186,7 +186,7 @@ static inline void *ds_tree_remove_tail(ds_tree_t *root)
  */
 
 /**
- * Initialize the @p iter strucure, @p iter will point to the first element in the tree
+ * Initialize the @p iter structure, @p iter will point to the first element in the tree
  */
 static inline void* ds_tree_ifirst(ds_tree_iter_t *iter, ds_tree_t *root)
 {
diff --git a/src/lib/est/src/est_request.c b/src/lib/est/src/est_request.c
index b0c28364..43f99434 100644
--- a/src/lib/est/src/est_request.c
+++ b/src/lib/est/src/est_request.c
@@ -197,7 +197,7 @@ bool est_request_curl_async(arena_t *arena, struct ev_loop *loop, CURL *c_req, e
  */
 
 /*
- * CURLM socket function -- used to manage I/O watchers on socekts
+ * CURLM socket function -- used to manage I/O watchers on sockets
  */
 int est_request_cmulti_socket_fn(CURL *easy, curl_socket_t s, int what, void *data, void *sock_data)
 {
diff --git a/src/lib/est/src/est_util.c b/src/lib/est/src/est_util.c
index 5217c168..82db6c84 100644
--- a/src/lib/est/src/est_util.c
+++ b/src/lib/est/src/est_util.c
@@ -78,7 +78,7 @@ char *est_util_pkcs7_to_pem(arena_t *arena, const char *pkcs7)
     }
 
     /*
-     * openssl pkcs7 prints certificte information before dumping the PEM
+     * openssl pkcs7 prints certificate information before dumping the PEM
      * certificate, try to find the PEM signature.
      */
     char *pem_hdr = strstr(pem, "-----BEGIN CERTIFICATE-----");
diff --git a/src/lib/execsh/inc/execsh.h b/src/lib/execsh/inc/execsh.h
index ec0b426e..496799c0 100644
--- a/src/lib/execsh/inc/execsh.h
+++ b/src/lib/execsh/inc/execsh.h
@@ -156,7 +156,7 @@ void execsh_async_stop(execsh_async_t *esa);
  * Execute a shell script specified by @p script synchronously,
  * redirect outputs to the logger.
  *
- * The script specified in @p script is piped to a forked shell proces
+ * The script specified in @p script is piped to a forked shell process
  * which is executed by passing the variable length arguments as its
  * parameters.
  */
diff --git a/src/lib/execsh/src/execsh.c b/src/lib/execsh/src/execsh.c
index 125c13f6..52ea0e01 100644
--- a/src/lib/execsh/src/execsh.c
+++ b/src/lib/execsh/src/execsh.c
@@ -370,7 +370,7 @@ void execsh_async_stop(execsh_async_t *esa)
 
         if (retry == 0)
         {
-            LOG(NOTICE, "execsh_async: Process %jd stil alive. Killing with SIGTERM",
+            LOG(NOTICE, "execsh_async: Process %jd still alive. Killing with SIGTERM",
                     (intmax_t)esa->esa_child_pid);
             /* Kill with negative pid -PID: This way the termination signal is sent to every
              * process in the process group whose ID is -PID. */
@@ -379,7 +379,7 @@ void execsh_async_stop(execsh_async_t *esa)
         }
         else if (retry == (EXECSH_WAITPID_MAX / 2))
         {
-            LOG(WARN, "execsh_async: Process %jd stil alive after SIGTERM. Killing with SIGKILL",
+            LOG(WARN, "execsh_async: Process %jd still alive after SIGTERM. Killing with SIGKILL",
                     (intmax_t)esa->esa_child_pid);
             /* Kill with negative pid -PID: This way the termination signal is sent to every
              * process in the process group whose ID is -PID. */
diff --git a/src/lib/execssl/src/execssl.c b/src/lib/execssl/src/execssl.c
index f3e63d40..53ffbf17 100644
--- a/src/lib/execssl/src/execssl.c
+++ b/src/lib/execssl/src/execssl.c
@@ -92,7 +92,7 @@ void execssl_io(execsh_async_t *esa, enum execsh_io io_type, const char *buf)
  * it is fed into the command's stdin. The stdout of the process is returned
  * as an allocated string buffer. NULL is returned in case the return code != 0
  *
- * The code is mostly based around libexecsh, except the defualt shell is
+ * The code is mostly based around libexecsh, except the default shell is
  * replaced by the openssl command. In this case this works well since execsh
  * is made to work around piping stuff to and back to a shell process. If we
  * replace the shell with openssl, it is just as useful passing data to openssl.
diff --git a/src/lib/fcm_filter/src/fcm_report_filter.c b/src/lib/fcm_filter/src/fcm_report_filter.c
index 38407d78..a947d754 100644
--- a/src/lib/fcm_filter/src/fcm_report_filter.c
+++ b/src/lib/fcm_filter/src/fcm_report_filter.c
@@ -68,7 +68,7 @@ void fcm_filter_context_init(fcm_collect_plugin_t *collector)
 }
 
 /**
- * @brief print function net_md_stats_accumulator paramter.
+ * @brief print function net_md_stats_accumulator parameter.
  *
  * @param valid pointer to net_md_stats_accumulator.
  * @return void.
diff --git a/src/lib/ff/kconfig/Kconfig.libs b/src/lib/ff/kconfig/Kconfig.libs
index 08a730ba..c271aa27 100644
--- a/src/lib/ff/kconfig/Kconfig.libs
+++ b/src/lib/ff/kconfig/Kconfig.libs
@@ -4,5 +4,5 @@ menu "libff: Feature Flag (FF) configuration"
         default "$(INSTALL_PREFIX)/etc/ff"
         help
             Files from this path will be checked by access provider to consider flags as enabled.
-            To set flag as ENABLED by this provider create a coresponding "flag_name" file in that path.
+            To set flag as ENABLED by this provider create a corresponding "flag_name" file in that path.
 endmenu
diff --git a/src/lib/ff_provider_access/unit.mk b/src/lib/ff_provider_access/unit.mk
index be9bf744..7b5807fb 100644
--- a/src/lib/ff_provider_access/unit.mk
+++ b/src/lib/ff_provider_access/unit.mk
@@ -24,7 +24,7 @@
 
 ###############################################################################
 #
-# Feature flag provider access - obtains feature flags from file existance
+# Feature flag provider access - obtains feature flags from file existence
 #
 ###############################################################################
 UNIT_NAME := ff_provider_access
diff --git a/src/lib/fsm_demo_dpi_plugin/src/fsm_demo_dpi_plugin.c b/src/lib/fsm_demo_dpi_plugin/src/fsm_demo_dpi_plugin.c
index 5c07d893..ae4ae3ce 100644
--- a/src/lib/fsm_demo_dpi_plugin/src/fsm_demo_dpi_plugin.c
+++ b/src/lib/fsm_demo_dpi_plugin/src/fsm_demo_dpi_plugin.c
@@ -338,7 +338,7 @@ void fsm_demo_app_detector(struct net_header_parser *net_parser, struct net_md_f
        flow_stream = "Not identified flow";
 
     fsm_demo_alloc_flow_tag(&net_parser->tags, flow_stream);
-    // Application is detected ino need furthur packets
+    // Application is detected ino need further packets
     net_parser->flow_action = FLOW_PASSTHROUGH;
 }
 
@@ -359,7 +359,7 @@ void fsm_demo_flow_analyser(struct net_header_parser *net_parser, struct net_md_
      * rules that are configured in pod using script - create_fsm_demo_dpi.sh
      * Check the destination ip of flow
      * against blocked ip. If true block the flow.
-     * If false don't inspect the furthur packets
+     * If false don't inspect the further packets
      * in the flow, just passthrough it (i.e. not tapped).
      */
     if ((*((uint32_t *)key->src_ip) == addr.s_addr) ||
diff --git a/src/lib/fsm_dpi_adt/src/fsm_dpi_adt_cache_internal.c b/src/lib/fsm_dpi_adt/src/fsm_dpi_adt_cache_internal.c
index 85a5cdea..149da933 100644
--- a/src/lib/fsm_dpi_adt/src/fsm_dpi_adt_cache_internal.c
+++ b/src/lib/fsm_dpi_adt/src/fsm_dpi_adt_cache_internal.c
@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "fsm_dpi_adt_cache_internal.h"
 
 /**
- * @brief comparator function for comparing mac adress
+ * @brief comparator function for comparing mac address
  *
  * @params: _a: first MAC address to compare
  * @params: _b: second MAC address to compare
diff --git a/src/lib/fsm_dpi_adt_upnp/inc/fsm_dpi_adt_upnp.h b/src/lib/fsm_dpi_adt_upnp/inc/fsm_dpi_adt_upnp.h
index 5c9418a4..9a75c737 100644
--- a/src/lib/fsm_dpi_adt_upnp/inc/fsm_dpi_adt_upnp.h
+++ b/src/lib/fsm_dpi_adt_upnp/inc/fsm_dpi_adt_upnp.h
@@ -84,7 +84,7 @@ struct fsm_dpi_adt_upnp_root_desc
     ds_tree_node_t next_node;
 };
 
-/* Structure aggregating all the devices and their root desciption(s) */
+/* Structure aggregating all the devices and their root description(s) */
 struct upnp_device
 {
     os_macaddr_t device_mac;  /*!< the device MAC */
diff --git a/src/lib/fsm_dpi_adt_upnp/ut/test_fsm_dpi_adt_upnp.c b/src/lib/fsm_dpi_adt_upnp/ut/test_fsm_dpi_adt_upnp.c
index 57827070..799c7f2b 100644
--- a/src/lib/fsm_dpi_adt_upnp/ut/test_fsm_dpi_adt_upnp.c
+++ b/src/lib/fsm_dpi_adt_upnp/ut/test_fsm_dpi_adt_upnp.c
@@ -336,7 +336,7 @@ test_jencode_adt_upnp_report(void)
     FREE(to_report.url->udev);
 }
 
-/* Trully nothing much to test except the absence of a crash */
+/* Truly nothing much to test except the absence of a crash */
 void
 test_hex_dump(void)
 {
diff --git a/src/lib/fsm_dpi_dhcp_relay/src/fsm_dpi_dhcp_relay.c b/src/lib/fsm_dpi_dhcp_relay/src/fsm_dpi_dhcp_relay.c
index 16829db3..66b12b98 100644
--- a/src/lib/fsm_dpi_dhcp_relay/src/fsm_dpi_dhcp_relay.c
+++ b/src/lib/fsm_dpi_dhcp_relay/src/fsm_dpi_dhcp_relay.c
@@ -282,7 +282,7 @@ static int fsm_dpi_dhcp_relay_options_init(void)
         char *str = NULL;
         char *value = NULL;
 
-        /* Check IPv6 or IPv4 option and select versio */
+        /* Check IPv6 or IPv4 option and select version */
         rc = strncmp(p, "DHCPv4_OPTION:", strlen("DHCPv4_OPTION:"));
         if (!rc)
         {
diff --git a/src/lib/fsm_dpi_dhcp_relay/src/fsm_dpi_dhcpv4_relay.c b/src/lib/fsm_dpi_dhcp_relay/src/fsm_dpi_dhcpv4_relay.c
index aa117dbb..dca8d33a 100644
--- a/src/lib/fsm_dpi_dhcp_relay/src/fsm_dpi_dhcpv4_relay.c
+++ b/src/lib/fsm_dpi_dhcp_relay/src/fsm_dpi_dhcpv4_relay.c
@@ -138,7 +138,7 @@ static uint8_t dhcp_relay_option82_insert(
     /* Set the Option Agent Information ID */
     *popt++ = DHCP_OPTION_AGENT_INFORMATION;
 
-    /* Set the Option Agent Information ID Legth */
+    /* Set the Option Agent Information ID Length */
     *popt++ = size_option;
 
     /* Set Sub Option Cuircuit ID*/
diff --git a/src/lib/fsm_dpi_dns/src/fsm_dpi_dns.c b/src/lib/fsm_dpi_dns/src/fsm_dpi_dns.c
index 3e01dcde..5aff6993 100644
--- a/src/lib/fsm_dpi_dns/src/fsm_dpi_dns.c
+++ b/src/lib/fsm_dpi_dns/src/fsm_dpi_dns.c
@@ -178,7 +178,7 @@ fsm_dpi_dns_send_report(struct fsm_policy_req *policy_request,
  * @brief: In case of gatekeeper policy, check if event
  * reporting is required. Gatekeeper policy triggers
  * reporting only for BLOCKED and REDIRECT action.
- * But if reporing is required for other action, then
+ * But if reporting is required for other action, then
  * reporting flag is set and the policy name is updated.
  */
 static void
@@ -502,7 +502,7 @@ static bool fsm_dpi_dns_set_noerror_noanswer(struct net_header_parser *net_heade
 }
 
 /**
- * @brief Skip sthe domain name in the DNS packet.
+ * @brief Skip the domain name in the DNS packet.
  * @param packet The DNS packet.
  * @param offset The offset of the domain name section.
  * @param length The length of the packet.
@@ -868,7 +868,7 @@ fsm_dpi_dns_process_dns_record(struct fsm_session *session,
      * We can have responses without `answers`.
      * Skip updating the information for the IPs.
      * The actual action returned in this case must be fully over-written,
-     * since we want to _always_ finsih processing of DNS transaction.
+     * since we want to _always_ finish processing of DNS transaction.
      */
     if (rec->idx == 0 || action == FSM_NOANSWER)
     {
diff --git a/src/lib/fsm_policy/inc/fsm_policy.h b/src/lib/fsm_policy/inc/fsm_policy.h
index 05e15734..5b4c001e 100644
--- a/src/lib/fsm_policy/inc/fsm_policy.h
+++ b/src/lib/fsm_policy/inc/fsm_policy.h
@@ -255,7 +255,7 @@ struct fsm_policy_reply
     int req_id;          /* request id, used for mapping request */
     int req_type;        /* fsm request type, same as in policy request */
     int cat_match;       /* category match */
-    int reply_type;      /* is policy check processed using blocking or aysnc*/
+    int reply_type;      /* is policy check processed using blocking or async*/
     int action;          /* action to take */
     char *log_action;    /* action to log mqtt report */
     int rd_ttl;          /* redirected response's ttl */
diff --git a/src/lib/fsm_policy/src/fsm_policy_ovsdb.c b/src/lib/fsm_policy/src/fsm_policy_ovsdb.c
index ce623a8e..eceec690 100644
--- a/src/lib/fsm_policy/src/fsm_policy_ovsdb.c
+++ b/src/lib/fsm_policy/src/fsm_policy_ovsdb.c
@@ -358,7 +358,7 @@ bool fsm_set_cats_rules(struct fsm_policy_rules *rules,
  * attributes in its policy representation
  * @param rules the policy rule representation
  * @param spolicy the ovsdb rule representation
- * @return true if the translation succeeeded, false otherwise.
+ * @return true if the translation succeeded, false otherwise.
  */
 bool
 fsm_set_risk_level_rules(struct fsm_policy_rules *rules,
@@ -404,7 +404,7 @@ fsm_set_risk_level_rules(struct fsm_policy_rules *rules,
  * attributes in its policy representation
  * @param rules the policy rule representation
  * @param spolicy the ovsdb rule representation
- * @return true if the translation succeeeded, false otherwise.
+ * @return true if the translation succeeded, false otherwise.
  */
 bool
 fsm_set_ip_rules(struct fsm_policy_rules *rules,
@@ -465,7 +465,7 @@ bool fsm_set_app_rules(struct fsm_policy_rules *rules,
  * fsm representation
  * @param rules the policy rule representation
  * @param spolicy the ovsdb rule representation
- * @return true if the translation succeeeded, false otherwise.
+ * @return true if the translation succeeded, false otherwise.
  */
 bool
 fsm_set_rules(struct fsm_policy_rules *rules,
@@ -666,7 +666,7 @@ struct fsm_policy *fsm_policy_insert_schema_p(struct policy_table *table,
     fpolicy->table = table;
     table->lookup_array[idx] = fpolicy;
 
-    /* Set lookup indeces */
+    /* Set lookup indices */
     fsm_policy_get_prev(table, fpolicy);
     fsm_policy_get_next(table, fpolicy);
 
diff --git a/src/lib/fsm_utils/inc/fsm_dns_utils.h b/src/lib/fsm_utils/inc/fsm_dns_utils.h
index d0660128..1959164f 100644
--- a/src/lib/fsm_utils/inc/fsm_dns_utils.h
+++ b/src/lib/fsm_utils/inc/fsm_dns_utils.h
@@ -144,7 +144,7 @@ fsm_dns_cache_flush_ttl();
 /**
  * @brief Prints the content of the used DNS cache.
  *
- * @param param is used to establish which cache imlementation is
+ * @param param is used to establish which cache implementation is
  *        actually used.
  */
 void
diff --git a/src/lib/fsm_utils/src/fsm_csum_utils.c b/src/lib/fsm_utils/src/fsm_csum_utils.c
index ea27e3ba..fbb4a950 100644
--- a/src/lib/fsm_utils/src/fsm_csum_utils.c
+++ b/src/lib/fsm_utils/src/fsm_csum_utils.c
@@ -136,7 +136,7 @@ uint16_t fsm_compute_ip_checksum(struct iphdr *ip_header)
         sum += word;
     }
 
-    /* handle odd-lenght header */
+    /* handle odd-length header */
     if (len & 1) {
         sum += (header[len - 1] << 8);
     }
diff --git a/src/lib/fsm_utils/src/fsm_packet_reinject_utils.c b/src/lib/fsm_utils/src/fsm_packet_reinject_utils.c
index af5b9067..e89ea296 100644
--- a/src/lib/fsm_utils/src/fsm_packet_reinject_utils.c
+++ b/src/lib/fsm_utils/src/fsm_packet_reinject_utils.c
@@ -131,7 +131,7 @@ fsm_forward(struct fsm_session *session,
 
     if (net_parser->raw_dst != NULL)
     {
-        /* The net parser is explicitely providing the TX interface to use */
+        /* The net parser is explicitly providing the TX interface to use */
         return fsm_net_parser_forward(net_parser);
     }
 
@@ -178,7 +178,7 @@ fsm_prepare_net_parser_forward(struct net_header_parser *net_parser)
 /**
  * @brief prepare packet forward
  *
- * Initiliase forward cts if it is not initilaized
+ * Initialise forward cts if it is not initilaized
  * - replace smac with pod mac address.
  * @param session the dpi_dispatcher session
  * @param net_parser modified packet
@@ -196,7 +196,7 @@ fsm_prepare_forward(struct fsm_session *session,
 
     if (net_parser->raw_dst != NULL)
     {
-        /* The net parser is explicitely providing the TX interface to use */
+        /* The net parser is explicitly providing the TX interface to use */
         return fsm_prepare_net_parser_forward(net_parser);
     }
 
diff --git a/src/lib/gatekeeper_cache/inc/gatekeeper_cache.h b/src/lib/gatekeeper_cache/inc/gatekeeper_cache.h
index 58689627..22e6081d 100644
--- a/src/lib/gatekeeper_cache/inc/gatekeeper_cache.h
+++ b/src/lib/gatekeeper_cache/inc/gatekeeper_cache.h
@@ -378,7 +378,7 @@ void
 gk_cache_cleanup(void);
 
 /**
- * @brief check ttl value for the given attribue
+ * @brief check ttl value for the given attribute
  *        or flow tree
  *
  * @params: attribute or flow tree
@@ -400,7 +400,7 @@ gkc_get_allowed_counter(os_macaddr_t *device_mac,
                         enum gk_cache_request_type attr_type);
 
 /**
- * @brief check ttl value for the given attribue
+ * @brief check ttl value for the given attribute
  *        or flow tree
  *
  * @params: attribute or flow tree
@@ -441,7 +441,7 @@ gk_get_device_count(void);
 /**
  * @brief Lookup the given attribute in cache.
  *
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  *
  * @return true for success and false for failure.
  */
@@ -449,9 +449,9 @@ bool
 gkc_lookup_attribute_entry(struct gk_attr_cache_interface *req, bool update_count);
 
 /**
- * @brief add the given attribue to cache.
+ * @brief add the given attribute to cache.
  *
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  *
  * @return true for success and false for failure.
  */
@@ -460,9 +460,9 @@ gkc_add_attribute_entry(struct gk_attr_cache_interface *entry);
 
 
 /**
- * @brief upate or add the given attribute to the cache.
+ * @brief update or add the given attribute to the cache.
  *
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  *
  * @return true for success and false for failure.
  */
@@ -472,7 +472,7 @@ gkc_upsert_attribute_entry(struct gk_attr_cache_interface *entry);
 /**
  * @brief delete the given attribute from cache
  *
- * @params req: interface structure specifing the attribute request
+ * @params req: interface structure specifying the attribute request
  * @return true for success and false for failure.
  */
 bool
@@ -503,7 +503,7 @@ gkc_ttl_cleanup(void);
 /**
  * @brief add the given IP tuple flow to cache.
  *
- * @params: req: interface structure specifing the flow request
+ * @params: req: interface structure specifying the flow request
  *
  * @return true for success and false for failure.
  */
@@ -513,7 +513,7 @@ gkc_add_flow_entry(struct gkc_ip_flow_interface *entry);
 /**
  * @brief lookup the given IP tuple flow to cache.
  *
- * @params: req: interface structure specifing the flow request
+ * @params: req: interface structure specifying the flow request
  *
  * @return true for success and false for failure.
  */
@@ -523,7 +523,7 @@ gkc_lookup_flow(struct gkc_ip_flow_interface *req, bool update_count);
 /**
  * @brief delete the given IP tuple flow to cache.
  *
- * @params: req: interface structure specifing the flow request
+ * @params: req: interface structure specifying the flow request
  *
  * @return true for success and false for failure.
  */
@@ -581,7 +581,7 @@ gkc_flow_entry_cmp(const void *_a, const void *_b);
 /**
  * @brief validate the request input.
  *
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  * @return true for success and false for failure.
  */
 bool
@@ -630,7 +630,7 @@ clear_gatekeeper_cache(void);
  *        from input.
  *        (Exposed for testing)
  *
- * @params: req: interface structure specifing the attribute request.
+ * @params: req: interface structure specifying the attribute request.
  *
  * @return ip_flow_cache pointer on success or NULL on failure.
  */
@@ -651,7 +651,7 @@ gkc_free_flow_members(struct ip_flow_cache *flow_entry);
  * @brief create a new attribute entry fo the given attribute type.
  *        (Exposed for testing)
  *
- * @params: entry: specifing the attribute type
+ * @params: entry: specifying the attribute type
  *
  * @return return pointer to created attribute struct
  *         NULL on failure
diff --git a/src/lib/gatekeeper_cache/inc/gatekeeper_cache_cmp.h b/src/lib/gatekeeper_cache/inc/gatekeeper_cache_cmp.h
index da880454..ba5937cc 100644
--- a/src/lib/gatekeeper_cache/inc/gatekeeper_cache_cmp.h
+++ b/src/lib/gatekeeper_cache/inc/gatekeeper_cache_cmp.h
@@ -55,7 +55,7 @@ risk_comparator get_risk_cmp(int risk_op);
  * Category comparison
  *
  * Since we are passing all possible categories to the comparison,
- * we can immediately handle IN/OUT as part of the comparaison function.
+ * we can immediately handle IN/OUT as part of the comparison function.
  */
 typedef bool (*cat_comparator)(int c, struct int_set *s);
 bool cat_cmp_eval(int c, struct int_set *s);
diff --git a/src/lib/gatekeeper_cache/src/gatekeeper_cache.c b/src/lib/gatekeeper_cache/src/gatekeeper_cache.c
index 331a00cc..d2038702 100644
--- a/src/lib/gatekeeper_cache/src/gatekeeper_cache.c
+++ b/src/lib/gatekeeper_cache/src/gatekeeper_cache.c
@@ -155,7 +155,7 @@ gk_cache_get_size(void)
 }
 
 /**
- * @brief comparator function for comparing mac adress
+ * @brief comparator function for comparing mac address
  *
  * @params: _a: first MAC address to compare
  * @params: _b: second MAC address to compare
@@ -562,7 +562,7 @@ gkc_interface_to_attr_cache(struct gk_attr_cache_interface *entry, struct attr_c
  * @brief create a new attribute entry fo the given attribute type.
  *        We have previously ensured the manager is initialized.
  *
- * @params: entry: specifing the attribute type
+ * @params: entry: specifying the attribute type
  *
  * @return return pointer to created attribute struct
  *         NULL on failure
@@ -1599,9 +1599,9 @@ gkc_fetch_attribute_entry(struct gk_attr_cache_interface *req)
 
 
 /**
- * @brief upate or add the given attribute to the cache.
+ * @brief update or add the given attribute to the cache.
  *
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  *
  * @return true for success and false for failure.
  */
@@ -1852,7 +1852,7 @@ gkc_get_allowed_counter(os_macaddr_t *device_mac, enum gk_cache_request_type att
 }
 
 /**
- * @brief check ttl value for the given attribue
+ * @brief check ttl value for the given attribute
  *        or flow tree
  *
  * @params: attribute or flow tree
diff --git a/src/lib/gatekeeper_cache/src/gatekeeper_cache_cmp.c b/src/lib/gatekeeper_cache/src/gatekeeper_cache_cmp.c
index d98cc5fe..9aae92c9 100644
--- a/src/lib/gatekeeper_cache/src/gatekeeper_cache_cmp.c
+++ b/src/lib/gatekeeper_cache/src/gatekeeper_cache_cmp.c
@@ -133,7 +133,7 @@ get_risk_cmp(int risk_op)
  * Category comparison
  *
  * Since we are passing all possible categories to the comparison,
- * we can immediately handle IN/OUT as part of the comparaison function.
+ * we can immediately handle IN/OUT as part of the comparison function.
  */
 bool
 cat_cmp_eval(int c, struct int_set *s)
diff --git a/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_add.c b/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_add.c
index d50bb62b..91b85db5 100644
--- a/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_add.c
+++ b/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_add.c
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /**
  * @brief create a new flow entry initializing with 5-tuple values
  *        from input.
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  *
  * @return ip_flow_cache pointer on success or NULL on failure
  */
@@ -99,7 +99,7 @@ gkc_new_flow_entry(struct gkc_ip_flow_interface *req)
 /**
  * @brief validate the request input.
  *
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  * @return true for success and false for failure.
  */
 bool
@@ -120,9 +120,9 @@ gkc_is_flow_valid(struct gkc_ip_flow_interface *req)
 }
 
 /**
- * @brief add the given attribue to the device cache.
+ * @brief add the given attribute to the device cache.
  *
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  * @params: pdevice pointer to device tree to which the
  *          attribute is added
  * @return true for success and false for failure.
diff --git a/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_del.c b/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_del.c
index 3ae3018d..5e1003a9 100644
--- a/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_del.c
+++ b/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_del.c
@@ -81,7 +81,7 @@ gkc_free_flow_members(struct ip_flow_cache *flow_entry)
  *
  * @params: flow_tree: pointer to flow tree from which flow is to be
  *          removed
- * @params: req: interface structure specifing the flow request
+ * @params: req: interface structure specifying the flow request
  * @return true for success and false for failure.
  */
 static bool
@@ -120,7 +120,7 @@ gkc_del_flow_from_tree(ds_tree_t *flow_tree, struct gkc_ip_flow_interface *req)
 /**
  * @brief delete the given flow from the device cache
  *
- * @params: req: interface structure specifing the flow request
+ * @params: req: interface structure specifying the flow request
  * @params: pdevice: pointer to device from which flow is to be
  *          removed
  * @return true for success and false for failure.
diff --git a/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_lookup.c b/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_lookup.c
index 574affa1..78888285 100644
--- a/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_lookup.c
+++ b/src/lib/gatekeeper_cache/src/gatekeeper_cache_flow_lookup.c
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * @brief Lookup the given flow in the flow tree.
  *
  * @params: tree: tree containing the flows
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  *
  * @return true if found false if not found.
  */
@@ -73,7 +73,7 @@ gkc_lookup_flows_tree(ds_tree_t *tree, struct gkc_ip_flow_interface *req, int up
  *
  * @params: pdevice: tree having the device entries along with
  *         attributes and flows associated with it
- * @params: req: interface structure specifing the attribute request
+ * @params: req: interface structure specifying the attribute request
  *
  * @return true if found false if not found.
  */
diff --git a/src/lib/gatekeeper_cache/ut/test_gatekeeper_cache.c b/src/lib/gatekeeper_cache/ut/test_gatekeeper_cache.c
index ebe5aa6c..68253a98 100644
--- a/src/lib/gatekeeper_cache/ut/test_gatekeeper_cache.c
+++ b/src/lib/gatekeeper_cache/ut/test_gatekeeper_cache.c
@@ -1277,7 +1277,7 @@ test_cache_size(void)
 
     cache_size = gk_cache_get_size();
 
-    /* cache is jus tinitialized, we can change the size */
+    /* cache is just tinitialized, we can change the size */
     gk_cache_set_size(10);
     TEST_ASSERT_EQUAL_size_t(10, gk_cache_get_size());
 
diff --git a/src/lib/gatekeeper_cache/ut/test_gatekeeper_cache_flush.c b/src/lib/gatekeeper_cache/ut/test_gatekeeper_cache_flush.c
index 8722d92e..3515cb80 100644
--- a/src/lib/gatekeeper_cache/ut/test_gatekeeper_cache_flush.c
+++ b/src/lib/gatekeeper_cache/ut/test_gatekeeper_cache_flush.c
@@ -377,7 +377,7 @@ test_gkc_flush_rules_app(void)
     /* re-add the entry */
     gkc_add_attribute_entry(entry5);
 
-    /* Now wirh _OUT */
+    /* Now with _OUT */
     fpr.app_op = APP_OP_OUT;
     strscpy(fpr.apps->array[0], entry5->attr_name, NAME_STR_SIZE);
     ret = gkc_flush_rules(&fpr);
diff --git a/src/lib/gatekeeper_msg/inc/gatekeeper_hero_stats.h b/src/lib/gatekeeper_msg/inc/gatekeeper_hero_stats.h
index fa198456..17a0e50e 100644
--- a/src/lib/gatekeeper_msg/inc/gatekeeper_hero_stats.h
+++ b/src/lib/gatekeeper_msg/inc/gatekeeper_hero_stats.h
@@ -72,7 +72,7 @@ struct gkc_report_aggregator *
 gkhc_get_aggregator(void);
 
 /**
- * @brief Initiliazes the global aggregator for hero cache
+ * @brief Initializes the global aggregator for hero cache
  *
  * @param aggr a pointer to the aggregator to initialize
  * @param session contains the @see node_id and @see location_id
@@ -81,20 +81,20 @@ gkhc_get_aggregator(void);
  *         false if anything when wrong
  *
  * @remark while the aggregator should always be a singleton,
- *         it is prefered to not use it directly .
+ *         it is preferred to not use it directly .
  */
 bool
 gkhc_init_aggregator(struct gkc_report_aggregator *aggr,
                      struct fsm_session *session);
 
 /**
- * @brief Releases and un-initilizes the global allocator.
+ * @brief Releases and un-initializes the global allocator.
  *        After the call, all allocated memory has been released.
  *
  * @param aggr a pointer to the aggregator to initialize
  *
   @remark while the aggregator should always be a singleton,
- *         it is prefered to not use it directly .
+ *         it is preferred to not use it directly .
  */
 void
 gkhc_release_aggregator(struct gkc_report_aggregator *aggr);
diff --git a/src/lib/gatekeeper_msg/src/gatekeeper_hero_stats.c b/src/lib/gatekeeper_msg/src/gatekeeper_hero_stats.c
index 77de98c6..db478c4b 100644
--- a/src/lib/gatekeeper_msg/src/gatekeeper_hero_stats.c
+++ b/src/lib/gatekeeper_msg/src/gatekeeper_hero_stats.c
@@ -201,7 +201,7 @@ gkhc_release_aggregator(struct gkc_report_aggregator *aggr)
     }
     FREE(aggr->windows);
 
-    /* The content of stats gets transfered over to windows, so all
+    /* The content of stats gets transferred over to windows, so all
      * that's left to be freed is the array itself.
      */
     FREE(aggr->stats);
@@ -469,7 +469,7 @@ finalize_observation_window(struct gkc_report_aggregator *aggr)
         FREE(new_window);
     }
 
-    /* We have tranferred ownership of all stats to observation windows,
+    /* We have transferred ownership of all stats to observation windows,
      * so clean up the stats array now, and resize to the basic size.
      */
     FREE(aggr->stats);
diff --git a/src/lib/gatekeeper_msg/ut/test_gatekeeper_hero_stats.c b/src/lib/gatekeeper_msg/ut/test_gatekeeper_hero_stats.c
index f9f607b3..9d4f34e2 100644
--- a/src/lib/gatekeeper_msg/ut/test_gatekeeper_hero_stats.c
+++ b/src/lib/gatekeeper_msg/ut/test_gatekeeper_hero_stats.c
@@ -373,7 +373,7 @@ test_gk_serialize_cache_no_mgr(void)
     ret = gkhc_serialize_cache_entries(aggr);
     TEST_ASSERT_FALSE(ret);
 
-    /* Try again after intializing */
+    /* Try again after initializing */
     ret = gkhc_init_aggregator(aggr, &g_session);
     TEST_ASSERT_TRUE(ret);
     ret = gkhc_serialize_cache_entries(aggr);
@@ -396,7 +396,7 @@ test_send_report_param(void)
     int num_reports;
     bool ret;
 
-    /* no aggr initalized */
+    /* no aggr initialized */
     num_reports = gkhc_build_and_send_report(NULL, "valid_mqtt_topic");
     TEST_ASSERT_EQUAL_INT(-1, num_reports);
 
@@ -496,7 +496,7 @@ test_release_aggregator(void)
     gkhc_release_aggregator(aggr);
     TEST_ASSERT_FALSE(aggr->initialized);
 
-    /* Now add a few cache entries and verify _realease_aggregator */
+    /* Now add a few cache entries and verify _release_aggregator */
     gkhc_init_aggregator(aggr, &g_session);
     gkhc_activate_window(aggr);
     TEST_ASSERT_NOT_EQUAL_INT(0, aggr->start_observation_window);
diff --git a/src/lib/gatekeeper_plugin/inc/gatekeeper.h b/src/lib/gatekeeper_plugin/inc/gatekeeper.h
index aa87fdd5..987f7a7f 100644
--- a/src/lib/gatekeeper_plugin/inc/gatekeeper.h
+++ b/src/lib/gatekeeper_plugin/inc/gatekeeper.h
@@ -259,11 +259,11 @@ gatekeeper_init(struct fsm_session *session);
 
 
 /**
- * @brief perfroms check whether to allow or block this packet.
+ * @brief performs check whether to allow or block this packet.
  *        by connecting ot the guard server.
  *
  * @param session the request being processed
- * @param req the policy beig processed
+ * @param req the policy being processed
  * @param policy the policy being checked against
  *
  */
diff --git a/src/lib/gatekeeper_plugin/src/gatekeeper.c b/src/lib/gatekeeper_plugin/src/gatekeeper.c
index 3b044bc8..efabdeed 100644
--- a/src/lib/gatekeeper_plugin/src/gatekeeper.c
+++ b/src/lib/gatekeeper_plugin/src/gatekeeper.c
@@ -1665,7 +1665,7 @@ gatekeeper_exit(struct fsm_session *session)
 /**
  * @brief close curl connection if it is ideal for more then
  *        set GK_CURL_TIMEOUT value. When curl request
- *        is made, the ecurl_connection_time value is udpated.
+ *        is made, the ecurl_connection_time value is updated.
  *
  * @param ctime current time value
  */
@@ -1827,7 +1827,7 @@ gatekeeper_update(struct fsm_session *session)
         fsm_gk_session->enable_multi_curl = false;
     }
 
-    /* currently overwritting ovsdb config with kconfig value */
+    /* currently overwriting ovsdb config with kconfig value */
     fsm_gk_session->enable_multi_curl = kconfig_enabled(CONFIG_GATEKEEPER_MULTI_CURL);
 
     server_info->server_url = session->ops.get_config(session, "gk_url");
diff --git a/src/lib/gatekeeper_plugin/src/gatekeeper_data.c b/src/lib/gatekeeper_plugin/src/gatekeeper_data.c
index 1a39ef18..6b36d905 100644
--- a/src/lib/gatekeeper_plugin/src/gatekeeper_data.c
+++ b/src/lib/gatekeeper_plugin/src/gatekeeper_data.c
@@ -55,7 +55,7 @@ gatekeeper_validate_fqdn(struct fsm_session *session, char *site)
     gk_session = session->handler_ctxt;
     if (gk_session == NULL) return false;
 
-    /* returns false upon emptry string */
+    /* returns false upon empty string */
     if (site == NULL)
     {
         LOGD("%s: string is NULL", __func__);
@@ -190,7 +190,7 @@ gatekeeper_add_netid(struct gk_req_header *header, struct gk_request_data *req_d
 /**
  * @brief allocates and fills up a gatekeeper request header
  *
- * @param req_data gatekeepr requet context
+ * @param req_data gatekeepr request context
  * @return a pointer to an allocated header
  */
 static struct gk_req_header *
diff --git a/src/lib/gatekeeper_plugin/ut/test_fsm_gk.c b/src/lib/gatekeeper_plugin/ut/test_fsm_gk.c
index 820bd1fb..98c67e02 100644
--- a/src/lib/gatekeeper_plugin/ut/test_fsm_gk.c
+++ b/src/lib/gatekeeper_plugin/ut/test_fsm_gk.c
@@ -2127,7 +2127,7 @@ test_mcurl_config(void)
     /* remove existing other config values */
     free_str_tree(session->conf->other_config);
 
-    /* set new other config with mulit_curl = enable */
+    /* set new other config with multi_curl = enable */
     other_config = schema2tree(OTHER_CONFIG_NELEM_SIZE,
                                 2,
                                 OTHER_CONFIG_NELEMS,
@@ -2138,7 +2138,7 @@ test_mcurl_config(void)
     gatekeeper_update(session);
     TEST_ASSERT_EQUAL_INT(1,fsm_gk_session->enable_multi_curl);
 
-    /* set new other config with mulit_curl = disable */
+    /* set new other config with multi_curl = disable */
     free_str_tree(session->conf->other_config);
     other_config = schema2tree(OTHER_CONFIG_NELEM_SIZE,
                                 2,
diff --git a/src/lib/hostap/src/ctrl-dpp.c b/src/lib/hostap/src/ctrl-dpp.c
index df1b4f51..60d96eb2 100644
--- a/src/lib/hostap/src/ctrl-dpp.c
+++ b/src/lib/hostap/src/ctrl-dpp.c
@@ -503,7 +503,7 @@ ctrl_dpp_cb(struct ctrl *ctrl, int level, const char *buf, size_t len)
     }
 
     if (!strcmp(event, EV(DPP_EVENT_CONFOBJ_AKM))) {
-        LOGI("%s: dpp: conf recieved: akm=%s", ctrl->bss, args);
+        LOGI("%s: dpp: conf received: akm=%s", ctrl->bss, args);
         STRSCPY_WARN(dpp->conf_rx_akm, args);
         ctrl_dpp_conf_rx_cb(ctrl);
         return 0;
@@ -517,21 +517,21 @@ ctrl_dpp_cb(struct ctrl *ctrl, int level, const char *buf, size_t len)
     }
 
     if (!strcmp(event, EV(DPP_EVENT_C_SIGN_KEY))) {
-        LOGI("%s: dpp: conf recieved: csignkey=%s", ctrl->bss, args);
+        LOGI("%s: dpp: conf received: csignkey=%s", ctrl->bss, args);
         STRSCPY_WARN(dpp->conf_rx_csign_hex, args);
         ctrl_dpp_conf_rx_cb(ctrl);
         return 0;
     }
 
     if (!strcmp(event, EV(DPP_EVENT_NET_ACCESS_KEY))) {
-        LOGI("%s: dpp: conf recieved: netaccesskey=%s", ctrl->bss, args);
+        LOGI("%s: dpp: conf received: netaccesskey=%s", ctrl->bss, args);
         STRSCPY_WARN(dpp->conf_rx_netaccesskey_hex, args);
         ctrl_dpp_conf_rx_cb(ctrl);
         return 0;
     }
 
     if (!strcmp(event, EV(DPP_EVENT_CONF_REQ_RX))) {
-        LOGI("%s: dpp conf request recieved", ctrl->bss);
+        LOGI("%s: dpp conf request received", ctrl->bss);
         if (!dpp->conf_req_rx) {
             dpp->conf_req_rx = 1;
             while ((kv = strsep(&args, " "))) {
@@ -541,7 +541,7 @@ ctrl_dpp_cb(struct ctrl *ctrl, int level, const char *buf, size_t len)
                 }
             }
             STRSCPY_WARN(dpp->conf_tx_sta, mac);
-            LOGI("%s: dpp conf request recieved from: %s", ctrl->bss, dpp->conf_tx_sta);
+            LOGI("%s: dpp conf request received from: %s", ctrl->bss, dpp->conf_tx_sta);
         }
         else {
             LOGW("%s: dpp conf already in progress, igorning", ctrl->bss);
diff --git a/src/lib/hostap2/src/hostap_sock.c b/src/lib/hostap2/src/hostap_sock.c
index db9f0a24..7bc5351e 100644
--- a/src/lib/hostap2/src/hostap_sock.c
+++ b/src/lib/hostap2/src/hostap_sock.c
@@ -106,7 +106,7 @@ hostap_sock_bind(struct hostap_sock *sock)
          * does _not_ reside on the VFS. This has the
          * benefit of not needing to perform unlink() /
          * cleanup - which is a problem when considering a
-         * program can abrubtly crash, or close the socket,
+         * program can abruptly crash, or close the socket,
          * but forget to unlink it. Abstract socket closing
          * is visible to the sender gracefully too.
          */
diff --git a/src/lib/hostap2/src/hostap_txq.c b/src/lib/hostap2/src/hostap_txq.c
index 3dd5f94d..24dc5dd8 100644
--- a/src/lib/hostap2/src/hostap_txq.c
+++ b/src/lib/hostap2/src/hostap_txq.c
@@ -216,7 +216,7 @@ hostap_txq_requeue_sent(struct hostap_txq *q)
                 hostap_txq_req_complete(req, NULL, 0);
             }
             else {
-                LOGT(LOG_PREFIX_REQ(req, "requeueing"));
+                LOGT(LOG_PREFIX_REQ(req, "requeuing"));
                 req->list = &q->cmds_queued;
                 ds_dlist_insert_head(&q->cmds_queued, req);
             }
diff --git a/src/lib/hostap2/src/hostap_wdog.c b/src/lib/hostap2/src/hostap_wdog.c
index f7b82b2e..1328b0f5 100644
--- a/src/lib/hostap2/src/hostap_wdog.c
+++ b/src/lib/hostap2/src/hostap_wdog.c
@@ -72,7 +72,7 @@ hostap_wdog_panic(struct hostap_wdog *wdog)
      * the socket as soon as it's ev_io calls back after
      * socket is closed.
      */
-    LOGI(HOSTAP_WDOG_LOG(wdog, "panicing, resetting conn"));
+    LOGI(HOSTAP_WDOG_LOG(wdog, "panicking, resetting conn"));
     hostap_conn_reset(conn);
 }
 
@@ -107,7 +107,7 @@ hostap_wdog_pong_cb(struct hostap_txq_req *req,
          * request-response pairs would shift. That is a
          * reason to panic and re-start the txq.
          */
-        LOGI(HOSTAP_WDOG_LOG(wdog, "pong malformed ('%.*s' len=%zu ok=%d), panicing",
+        LOGI(HOSTAP_WDOG_LOG(wdog, "pong malformed ('%.*s' len=%zu ok=%d), panicking",
                              (int)reply_len,
                              reply ?: "",
                              reply_len,
@@ -134,7 +134,7 @@ hostap_wdog_ping_cb(struct ev_loop *loop,
          * interval. Perhaps if mainloop gets stalled really
          * bandly?
          */
-        LOGI(HOSTAP_WDOG_LOG(wdog, "previous ping still ongoing, panicing"));
+        LOGI(HOSTAP_WDOG_LOG(wdog, "previous ping still ongoing, panicking"));
         hostap_wdog_free_req(wdog);
         hostap_wdog_panic(wdog);
         return;
diff --git a/src/lib/http_parse/inc/http_parser.h b/src/lib/http_parse/inc/http_parser.h
index b4fd2d8e..4ffb79d8 100644
--- a/src/lib/http_parse/inc/http_parser.h
+++ b/src/lib/http_parse/inc/http_parser.h
@@ -39,7 +39,7 @@ extern "C" {
 # define HTTP_PARSER_STRICT 1
 #endif
 
-/* Maximium header size allowed. If the macro is not defined
+/* Maximum header size allowed. If the macro is not defined
  * before including this header then the default is used. To
  * change the maximum header size, define the macro in the build
  * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
@@ -64,7 +64,7 @@ extern "C" {
  * chunked' headers that indicate the presence of a body.
  *
  * Returning `2` from on_headers_complete will tell parser that it should not
- * expect neither a body nor any futher responses on this connection. This is
+ * expect neither a body nor any further responses on this connection. This is
  * useful for handling responses to a CONNECT request which may not contain
  * `Upgrade` or `Connection: upgrade` headers.
  *
diff --git a/src/lib/inet/inc/inet.h b/src/lib/inet/inc/inet.h
index 42c64c86..2dfed094 100644
--- a/src/lib/inet/inc/inet.h
+++ b/src/lib/inet/inc/inet.h
@@ -283,7 +283,7 @@ struct __inet
     /* True if DHCP server should be enabled on this interface */
     bool        (*in_dhcps_enable_fn)(inet_t *self, bool enabled);
 
-    /* DHCP server otpions */
+    /* DHCP server options */
     bool        (*in_dhcps_lease_set_fn)(inet_t *self, int lease_time_s);
     bool        (*in_dhcps_range_set_fn)(inet_t *self, osn_ip_addr_t start, osn_ip_addr_t stop);
     bool        (*in_dhcps_option_set_fn)(inet_t *self, enum osn_dhcp_option opt, const char *value);
@@ -344,7 +344,7 @@ struct __inet
      * ===========================================================================
      */
 
-    /* Static IPv6 configuration: Add/remove IP addresess */
+    /* Static IPv6 configuration: Add/remove IP addresses */
     bool        (*in_ip6_addr_fn)(
                         inet_t *self,
                         bool add,
@@ -853,7 +853,7 @@ static inline bool inet_state_notify(inet_t *self, inet_state_fn_t *fn)
  *  IPv6 support
  * ===========================================================================
  */
-/* Static IPv6 configuration: Add/remove IP addresess */
+/* Static IPv6 configuration: Add/remove IP addresses */
 static inline bool inet_ip6_addr(inet_t *self, bool add, osn_ip6_addr_t *addr)
 {
     if (self->in_ip6_addr_fn == NULL) return false;
diff --git a/src/lib/inet/inc/inet_routes.h b/src/lib/inet/inc/inet_routes.h
index 01c03a84..dada4cdf 100644
--- a/src/lib/inet/inc/inet_routes.h
+++ b/src/lib/inet/inc/inet_routes.h
@@ -111,7 +111,7 @@ bool inet_routes_is_enabled(const inet_routes_t * self);
  * @param self ptr to inet routes object
  * @return false when inet routes object is disabled
  * @return true when reapply request was accepted. Note that actual routing
- * update may be asynchonous.
+ * update may be asynchronous.
  */
 bool inet_routes_reapply(inet_routes_t *self);
 
diff --git a/src/lib/inet/inc/inet_routes6.h b/src/lib/inet/inc/inet_routes6.h
index 574ac09a..bdb9312a 100644
--- a/src/lib/inet/inc/inet_routes6.h
+++ b/src/lib/inet/inc/inet_routes6.h
@@ -111,7 +111,7 @@ bool inet_routes6_is_enabled(const inet_routes6_t *self);
  * @param self ptr to inet routes object
  * @return false when inet routes object is disabled
  * @return true when reapply request was accepted. Note that actual routing
- * update may be asynchonous.
+ * update may be asynchronous.
  */
 bool inet_routes6_reapply(inet_routes6_t *self);
 
diff --git a/src/lib/inet/src/inet_bridge.c b/src/lib/inet/src/inet_bridge.c
index 6c018c0e..d699d0a8 100644
--- a/src/lib/inet/src/inet_bridge.c
+++ b/src/lib/inet/src/inet_bridge.c
@@ -419,7 +419,7 @@ bool inet_bridge_commit(inet_t *super)
     bool retval;
 
     inet_base_t *self = (inet_base_t *)super;
-    LOG(INFO, "inet_base: Commiting new bridge configuration.");
+    LOG(INFO, "inet_base: Committing new bridge configuration.");
 
     /* Commit all pending units */
     retval = inet_unit_commit(self->in_units, __inet_base_bridge_commit, self);
diff --git a/src/lib/inet/src/linux/inet_dns_resolv.c b/src/lib/inet/src/linux/inet_dns_resolv.c
index d510e6e9..eef476f9 100644
--- a/src/lib/inet/src/linux/inet_dns_resolv.c
+++ b/src/lib/inet/src/linux/inet_dns_resolv.c
@@ -48,8 +48,8 @@ struct __inet_dns
 {
     char                    dns_ifname[C_IFNAME_LEN];       /* Interface name */
     bool                    dns_enabled;                    /* True if service has been started */
-    osn_ip_addr_t           dns_primary;                    /* Primary DNS addrss */
-    osn_ip_addr_t           dns_secondary;                  /* Secondary DNS addrss */
+    osn_ip_addr_t           dns_primary;                    /* Primary DNS address */
+    osn_ip_addr_t           dns_secondary;                  /* Secondary DNS address */
     inet_dns_status_fn_t   *dns_status_fn;                  /* Status update function */
     void                   *dns_status_ctx;                 /* Status context */
     ds_dlist_node_t         dns_dnode;
@@ -293,7 +293,7 @@ bool inet_dns_path(inet_dns_t *self, char *dest, ssize_t destsz)
 {
     int psz;
 
-    /* XXX: Prefix the name with a _ -- this way NM set hostnames have a higher precedence (comapred to UDHCPC obtained DNS settings) */
+    /* XXX: Prefix the name with a _ -- this way NM set hostnames have a higher precedence (compared to UDHCPC obtained DNS settings) */
     psz = snprintf(dest, destsz, "%s/_%s.resolv",
              CONFIG_INET_RESOLVCONF_TMP,
             self->dns_ifname);
diff --git a/src/lib/inet/src/linux/inet_fw_iptables.c b/src/lib/inet/src/linux/inet_fw_iptables.c
index 484b49d1..b2e68a17 100644
--- a/src/lib/inet/src/linux/inet_fw_iptables.c
+++ b/src/lib/inet/src/linux/inet_fw_iptables.c
@@ -240,7 +240,7 @@ bool inet_fw_portforward_set(inet_fw_t *self, const struct inet_portforward *pf)
 }
 
 
-/* Delete port forwarding entry -- a firewall restart is requried for the change to take effect */
+/* Delete port forwarding entry -- a firewall restart is required for the change to take effect */
 bool inet_fw_portforward_del(inet_fw_t *self, const struct inet_portforward *pf)
 {
     struct fw_portfw_entry *pe = NULL;
diff --git a/src/lib/inet/src/linux/inet_fw_nfm.c b/src/lib/inet/src/linux/inet_fw_nfm.c
index 884b28a1..cbc30949 100644
--- a/src/lib/inet/src/linux/inet_fw_nfm.c
+++ b/src/lib/inet/src/linux/inet_fw_nfm.c
@@ -249,7 +249,7 @@ bool inet_fw_portforward_set(inet_fw_t *self, const struct inet_portforward *pf)
 }
 
 
-/* Delete port forwarding entry -- a firewall restart is requried for the change to take effect */
+/* Delete port forwarding entry -- a firewall restart is required for the change to take effect */
 bool inet_fw_portforward_del(inet_fw_t *self, const struct inet_portforward *pf)
 {
     struct fw_portfw_entry *pe = NULL;
diff --git a/src/lib/inet/ut/inet_base/inet_base_test.c b/src/lib/inet/ut/inet_base/inet_base_test.c
index 75ced730..e32e04ef 100644
--- a/src/lib/inet/ut/inet_base/inet_base_test.c
+++ b/src/lib/inet/ut/inet_base/inet_base_test.c
@@ -449,7 +449,7 @@ void test_inet_base_assign_scheme(void)
                 inet_network_enable(&it.inet, true),
                 "Error enabling network");
 
-        PR("Setting assing_scheme -> None");
+        PR("Setting assign_scheme -> None");
         TEST_ASSERT_TRUE_MESSAGE(
                 inet_assign_scheme_set(&it.inet, INET_ASSIGN_NONE),
                 "Error setting assign scheme");
diff --git a/src/lib/inet/ut/inet_dhcps/inet_dhcps_test.c b/src/lib/inet/ut/inet_dhcps/inet_dhcps_test.c
index 651782dd..d0f29693 100644
--- a/src/lib/inet/ut/inet_dhcps/inet_dhcps_test.c
+++ b/src/lib/inet/ut/inet_dhcps/inet_dhcps_test.c
@@ -583,7 +583,7 @@ void test_dnsmasq_errfn(void)
             if (ii == 1)
             {
                 /*
-                 * For one interface, set invalid optins -- this should case dnsmasq to fail and options should
+                 * For one interface, set invalid options -- this should case dnsmasq to fail and options should
                  * propagate to all instances
                  */
                 TEST_ASSERT_TRUE_MESSAGE(
diff --git a/src/lib/inet/ut/inet_dns/inet_dns_test.c b/src/lib/inet/ut/inet_dns/inet_dns_test.c
index 758f6167..044b0d8f 100644
--- a/src/lib/inet/ut/inet_dns/inet_dns_test.c
+++ b/src/lib/inet/ut/inet_dns/inet_dns_test.c
@@ -107,7 +107,7 @@ void test_dns()
         /* Stop DNS1 now see if the entries for dns1 disappear, check if entries for dns2 are still there */
         TEST_ASSERT_TRUE_MESSAGE(
                 inet_dns_stop(dns1),
-                "Error stoppping DNS service");
+                "Error stopping DNS service");
 
         PR("Stopping dns1");
         /* Wait for the debounce to happen */
@@ -219,7 +219,7 @@ void test_external()
         /* Stop DNS1 now see if the entries for dns1 disappear, check if entries for dns2 are still there */
         TEST_ASSERT_TRUE_MESSAGE(
                 inet_dns_stop(dns1),
-                "Error stoppping DNS service");
+                "Error stopping DNS service");
     }
 
     if (dns1 != NULL)
diff --git a/src/lib/inet/ut/inet_eth/inet_eth_test.c b/src/lib/inet/ut/inet_eth/inet_eth_test.c
index efe12c21..dbba9a72 100644
--- a/src/lib/inet/ut/inet_eth/inet_eth_test.c
+++ b/src/lib/inet/ut/inet_eth/inet_eth_test.c
@@ -145,7 +145,7 @@ void test_inet_eth_assign_scheme(void)
                 inet_network_enable(self, true),
                 "Error enabling network");
 
-        PR("Setting assing_scheme -> None");
+        PR("Setting assign_scheme -> None");
         TEST_ASSERT_TRUE_MESSAGE(
                 inet_assign_scheme_set(self, INET_ASSIGN_NONE),
                 "Error setting assign scheme");
@@ -268,7 +268,7 @@ void test_inet_eth_mtu(void)
                 "Error enabling network");
 
 
-        PR("Setting assing_scheme -> None");
+        PR("Setting assign_scheme -> None");
         TEST_ASSERT_TRUE_MESSAGE(
                 inet_mtu_set(self, 1450),
                 "Error setting assign scheme");
diff --git a/src/lib/intf_stats/inc/intf_stats.h b/src/lib/intf_stats/inc/intf_stats.h
index 5dfbc5d8..02c7e206 100644
--- a/src/lib/intf_stats/inc/intf_stats.h
+++ b/src/lib/intf_stats/inc/intf_stats.h
@@ -72,7 +72,7 @@ typedef ds_dlist_t      intf_stats_list_t;
 /**
  * @brief container of information needed to set a ObservationWindow protobuf
  *
- * Stashes information related to acitivity on interfaces within a time window
+ * Stashes information related to activity on interfaces within a time window
  * The per-interface stats are presented as an double-link list of intf stat nodes
  */
 typedef struct
@@ -86,7 +86,7 @@ typedef struct
 } intf_stats_window_t;
 
 /**
- * @brief container to desribe each element of a Observation Window list
+ * @brief container to describe each element of a Observation Window list
  *
  */
 typedef struct
@@ -99,7 +99,7 @@ typedef struct
  * @brief container of information needed to set a Intf Stats report protobuf
  *
  * Stashes information related to the activity of multiple interfaces over the
- * course of mulitple time windows.
+ * course of multiple time windows.
  * The observation windows are presented as an double-linked list of Observation
  * window nodes.
  */
diff --git a/src/lib/intf_stats/src/intf_stats.c b/src/lib/intf_stats/src/intf_stats.c
index 9ccbc0d7..05be1e58 100644
--- a/src/lib/intf_stats/src/intf_stats.c
+++ b/src/lib/intf_stats/src/intf_stats.c
@@ -578,7 +578,7 @@ intf_stats_fetch_stats(bool set_baseline)
         {
             struct rtnl_link_stats *stats_new = ifa->ifa_data;
 
-            LOGT("------Stats retreived from getifaddrs()-------");
+            LOGT("------Stats retrieved from getifaddrs()-------");
             LOGT("tx_packets = %10u; rx_packets = %10u\n",
                                         stats_new->tx_packets, stats_new->rx_packets);
             LOGT("tx_bytes   = %10u; rx_bytes   = %10u\n",
@@ -689,7 +689,7 @@ intf_stats_plugin_close_cb(fcm_collect_plugin_t *collector)
 
 int intf_stats_plugin_init(fcm_collect_plugin_t *collector)
 {
-    LOGN("Interface Stats plugin intialization");
+    LOGN("Interface Stats plugin initialization");
 
     if (!collector)
     {
diff --git a/src/lib/intf_stats/src/intf_stats_report.c b/src/lib/intf_stats/src/intf_stats_report.c
index 1a8e5331..dfca6205 100644
--- a/src/lib/intf_stats/src/intf_stats_report.c
+++ b/src/lib/intf_stats/src/intf_stats_report.c
@@ -137,7 +137,7 @@ intf_stats_free_pb_op(Interfaces__IntfStats__ObservationPoint *pb)
  * @brief Generates an observation point serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
@@ -457,7 +457,7 @@ intf_stats_free_pb_window(Interfaces__IntfStats__ObservationWindow *pb)
  * @brief Generates an observation window serialized protobuf
  *
  * Uses the information pointed by the window parameter to generate
- * a serialized obervation window buffer.
+ * a serialized observation window buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
diff --git a/src/lib/intf_stats/ut/test_intf_stats.c b/src/lib/intf_stats/ut/test_intf_stats.c
index c8136006..66930325 100644
--- a/src/lib/intf_stats/ut/test_intf_stats.c
+++ b/src/lib/intf_stats/ut/test_intf_stats.c
@@ -479,7 +479,7 @@ test_intf_stats(intf_stats_t *intf)
     nread    = file2pb(g_test_mgr.f_name, &pb_r);
     stats_pb = interfaces__intf_stats__intf_stats__unpack(NULL, nread, rbuf);
 
-    /* Validate the deserialzed content */
+    /* Validate the deserialized content */
     TEST_ASSERT_NOT_NULL(stats_pb);
     validate_intf_stats(intf, stats_pb);
 
@@ -589,7 +589,7 @@ test_observation_window(intf_stats_window_t *window)
     nread     = file2pb(g_test_mgr.f_name, &pb_r);
     window_pb = interfaces__intf_stats__observation_window__unpack(NULL, nread, rbuf);
 
-    /* Validate the deserialized contetn */
+    /* Validate the deserialized content */
     TEST_ASSERT_NOT_NULL(window_pb);
     validate_observation_window(window, window_pb);
 
@@ -843,7 +843,7 @@ intf_stats_setUp(void)
     report = &g_test_mgr.report;
     node_info = &report->node_info;
 
-    /* Initilize the report */
+    /* Initialize the report */
     ds_dlist_init(&report->window_list, intf_stats_window_list_t, node);
     report->num_windows = 0;
 
diff --git a/src/lib/ipc/inc/ipc_msg_link.h b/src/lib/ipc/inc/ipc_msg_link.h
index 7191a6f7..97943b1d 100644
--- a/src/lib/ipc/inc/ipc_msg_link.h
+++ b/src/lib/ipc/inc/ipc_msg_link.h
@@ -76,7 +76,7 @@ IPC_MSG_LINK_STORAGE const char *ipc_msg_link_addr(const ipc_msg_link_t *self);
 IPC_MSG_LINK_STORAGE bool ipc_msg_link_can_send(const ipc_msg_link_t *self);
 
 /**
- * @brief Gets message link receving capability
+ * @brief Gets message link receiving capability
  * @param self ptr to ipc msg link object
  * @return true when link can receive messages; false otherwise
  */
@@ -112,11 +112,11 @@ IPC_MSG_LINK_STORAGE bool ipc_msg_link_subscribe_receive(ipc_msg_link_t *self, v
 
 /**
  * @brief Sends message to specified destination. Function may block when
- * there is no space for new message in the underlaying driver
+ * there is no space for new message in the underlying driver
  * 
  * @param self ptr to message link object
  * @param msg ptr to message with data and optional destination addr
- * @return true 'true' when message succesfully sent; 'false' otherwise
+ * @return true 'true' when message successfully sent; 'false' otherwise
  */
 IPC_MSG_LINK_STORAGE bool ipc_msg_link_sendto(ipc_msg_link_t *self, const ipc_msg_t *msg);
 
@@ -125,7 +125,7 @@ IPC_MSG_LINK_STORAGE bool ipc_msg_link_sendto(ipc_msg_link_t *self, const ipc_ms
  * Note: use only if you don't subscribe for receive event
  * 
  * Message structure shall contain ptr to buffer for receiving message and
- * size shall be set to max size of this buffer. On succesfull reception
+ * size shall be set to max size of this buffer. On successful reception
  * buffer contains the message and size is updated to contain real length
  * of received message.
  * If the caller want to have an address of the sender, it shall provide
@@ -134,7 +134,7 @@ IPC_MSG_LINK_STORAGE bool ipc_msg_link_sendto(ipc_msg_link_t *self, const ipc_ms
  * 
  * @param self ptr to ipc message link object
  * @param msg ptr to msg buffer in & out
- * @return true when message succefully read; false on error
+ * @return true when message successfully read; false on error
  */
 IPC_MSG_LINK_STORAGE bool ipc_msg_link_receive(ipc_msg_link_t *self, ipc_msg_t *msg);
 
diff --git a/src/lib/ipc/inc/os_mq_link.h b/src/lib/ipc/inc/os_mq_link.h
index bc971175..e2a63583 100644
--- a/src/lib/ipc/inc/os_mq_link.h
+++ b/src/lib/ipc/inc/os_mq_link.h
@@ -90,7 +90,7 @@ const char *mq_link_name(const mq_link_t *self);
 bool mq_link_can_send(const mq_link_t *self);
 
 /**
- * @brief Gets MQ receving capability
+ * @brief Gets MQ receiving capability
  * @param self ptr to ipc msg link object
  * @return true when link can receive messages; false otherwise
  */
@@ -128,13 +128,13 @@ bool mq_link_subscribe_receive(mq_link_t *self, void *subscr, mq_msg_received_fu
 
 /**
  * @brief Sends message to specified destination. Function may block when
- * there is no space for new message in the underlaying driver
+ * there is no space for new message in the underlying driver
  * 
  * @param self ptr to MQ object
  * @param msg ptr to buffer with message to send
  * @param mlen message length in bytes
  * @param mpri MQ message priority in MQ_PRI_MIN..MQ_PRI_MAX range
- * @return true 'true' when message succesfully sent; 'false' otherwise
+ * @return true 'true' when message successfully sent; 'false' otherwise
  */
 bool mq_link_sendto(mq_link_t *self, const uint8_t *msg, size_t mlen, mq_priority_t mpri);
 
@@ -143,7 +143,7 @@ bool mq_link_sendto(mq_link_t *self, const uint8_t *msg, size_t mlen, mq_priorit
  * Note: use only if you don't subscribe for receive event
  * 
  * Message structure shall contain ptr to buffer for receiving message and
- * size shall be set to max size of this buffer. On succesfull reception
+ * size shall be set to max size of this buffer. On successful reception
  * buffer contains the message and size is updated to contain real length
  * of received message.
  * 
@@ -151,7 +151,7 @@ bool mq_link_sendto(mq_link_t *self, const uint8_t *msg, size_t mlen, mq_priorit
  * @param msg ptr to msg buffer in & out
  * @param p_mlen ptr to message buffer size (in) / message length (out)
  * @param p_mpri ptr to message priority field (out) or NULL
- * @return true when message succefully read; false on error
+ * @return true when message successfully read; false on error
  */
 bool mq_link_receive(mq_link_t *self, uint8_t *msg, size_t *p_mlen, mq_priority_t *p_mpri);
 
diff --git a/src/lib/ipc/src/os_mq_link.c b/src/lib/ipc/src/os_mq_link.c
index accc68ff..4b34d520 100644
--- a/src/lib/ipc/src/os_mq_link.c
+++ b/src/lib/ipc/src/os_mq_link.c
@@ -143,7 +143,7 @@ mq_link_t *mq_link_open(const char *addr, struct ev_loop *evloop,
     attr.mq_msgsize = max_msize > 0 ? max_msize : 8192 /*default*/;
     attr.mq_maxmsg = max_mcount > 0 ? max_mcount : 10 /*default*/;
 
-    /* When opening already exisiting queue, message size limits are ignored. Only first
+    /* When opening already existing queue, message size limits are ignored. Only first
      * mq_open() call which creates the queue applies the limits for all other queue users */
     mqd_t mqh = mq_open(addr, oflag, mode, &attr);
     if (mqh < 0)
diff --git a/src/lib/ipthreat_dpi/src/ipthreat_dpi.c b/src/lib/ipthreat_dpi/src/ipthreat_dpi.c
index 28188310..087c8e17 100644
--- a/src/lib/ipthreat_dpi/src/ipthreat_dpi.c
+++ b/src/lib/ipthreat_dpi/src/ipthreat_dpi.c
@@ -115,7 +115,7 @@ ipthreat_dpi_plugin_periodic(struct fsm_session *session)
 
 
 /**
- * @brief session configuration uodate handler
+ * @brief session configuration update handler
  *
  * @param session the fsm session to update
  */
@@ -127,7 +127,7 @@ ipthreat_dpi_plugin_update(struct fsm_session *session)
 
 
 /**
- * @brief session configuration uodate handler
+ * @brief session configuration update handler
  *
  * @param session the fsm session to update
  */
diff --git a/src/lib/json_mqtt/ut/test_json_mqtt.c b/src/lib/json_mqtt/ut/test_json_mqtt.c
index ac5c5423..58894d1f 100644
--- a/src/lib/json_mqtt/ut/test_json_mqtt.c
+++ b/src/lib/json_mqtt/ut/test_json_mqtt.c
@@ -112,7 +112,7 @@ test_jencode_user_agent(void)
     out = jencode_user_agent(&session, NULL);
     TEST_ASSERT_NULL(out);
 
-    /* our session is now complete, proceed wih the UA test */
+    /* our session is now complete, proceed with the UA test */
     out = jencode_user_agent(&session, &http_report);
     TEST_ASSERT_NOT_NULL(out);
 
diff --git a/src/lib/lan_stats/ut/test_lan_stats.c b/src/lib/lan_stats/ut/test_lan_stats.c
index 5c1b3775..224dda32 100644
--- a/src/lib/lan_stats/ut/test_lan_stats.c
+++ b/src/lib/lan_stats/ut/test_lan_stats.c
@@ -83,7 +83,7 @@ struct fcm_filter_client *c_client = NULL;
 struct fcm_filter_client *r_client = NULL;
 
 
-/* Gathered at sample colletion. See mnl_cb_run() implementation for details */
+/* Gathered at sample collection. See mnl_cb_run() implementation for details */
 int g_portid = 18404;
 int g_seq = 1581959512;
 
@@ -332,7 +332,7 @@ test_lan_stats_collect_flows(struct net_md_aggregator *aggr)
 /**
  * @brief emits a protobuf report
  *
- * Assumes the presenece of QM to send the report on non native platforms,
+ * Assumes the presence of QM to send the report on non native platforms,
  * simply resets the aggregator content for native target.
  * @param aggr the aggregator
  */
diff --git a/src/lib/mdns_plugin/inc/mdns_records.h b/src/lib/mdns_plugin/inc/mdns_records.h
index fc94c416..4649e058 100644
--- a/src/lib/mdns_plugin/inc/mdns_records.h
+++ b/src/lib/mdns_plugin/inc/mdns_records.h
@@ -54,7 +54,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 typedef ds_dlist_t          mdns_records_list_t;
 
 /**
- * @brief container to desribe each element of a mdns record list
+ * @brief container to describe each element of a mdns record list
  *
  */
 typedef struct
diff --git a/src/lib/mdns_plugin/src/mdns_records.c b/src/lib/mdns_plugin/src/mdns_records.c
index 6417ebca..91bf555f 100644
--- a/src/lib/mdns_plugin/src/mdns_records.c
+++ b/src/lib/mdns_plugin/src/mdns_records.c
@@ -231,7 +231,7 @@ mdns_records_get_mac(struct sockaddr_storage *from, char *mac_str)
    ret = os_nif_macaddr_to_str(&mac, mac_str, PRI_os_macaddr_lower_t);
    if (!ret)
    {
-       LOGE("%s: Failed to convert mac addres to str", __func__);
+       LOGE("%s: Failed to convert mac address to str", __func__);
        return false;
    }
 
@@ -640,7 +640,7 @@ mdns_records_clean_stale_records(void)
             /* Clean the record only after it has been reported to the cloud.
                Due to reasons such as:
                     - QM erroring out
-                    - MAC address of the client not retreived from neigh_table
+                    - MAC address of the client not retrieved from neigh_table
                the record may not have been reported before it's TTL expired. To
                avoid this, check if it has been reported here */
             if (!rec->reported) continue;
@@ -766,7 +766,7 @@ void
 mdns_records_collect_record(const struct resource *r, void *data, struct sockaddr_storage *from)
 {
     /* If report is not initialized, the cloud doesn't want the records to be reported.
-     * (report_records is false). If not intitialized, don't collect the record */
+     * (report_records is false). If not initialized, don't collect the record */
     if (!g_report.initialized) return;
 
     switch (r->type)
@@ -827,7 +827,7 @@ mdns_records_send_records(struct mdns_session *md_session)
             mdns_records_mark_records_as_reported();
         }
 
-        /* Clean the staging tree. In case of error in reporing the
+        /* Clean the staging tree. In case of error in reporting the
            records to the cloud, the records will not be marked as 'reported'
            and will be staged again. So no harming in cleaning the staging
            tree always */
@@ -864,7 +864,7 @@ mdns_records_init(struct mdns_session *md_session)
         return true;
     }
 
-    /* Intialize the report */
+    /* Initialize the report */
     ds_tree_init(&g_report.stored_clients, (ds_key_cmp_t *)strcmp, mdns_client_t, dst_node);
     ds_tree_init(&g_report.staged_clients, (ds_key_cmp_t *)strcmp, mdns_client_t, dst_node);
 
diff --git a/src/lib/mdns_plugin/src/mdns_records_report.c b/src/lib/mdns_plugin/src/mdns_records_report.c
index 0b86c0b9..07644df2 100644
--- a/src/lib/mdns_plugin/src/mdns_records_report.c
+++ b/src/lib/mdns_plugin/src/mdns_records_report.c
@@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * Uses the node info to fill a dynamically allocated
  * observation point protobuf.
  * The caller is responsible for freeing the returned pointer,
- * @see mdns_recrods_free_pb_op() for this purpose.
+ * @see mdns_records_free_pb_op() for this purpose.
  *
  * @param node info used to fill up the protobuf.
  * @return a pointer to a observation point protobuf structure
@@ -107,7 +107,7 @@ mdns_records_free_pb_op(Interfaces__MdnsRecordsTelemetry__ObservationPoint *pb)
  * @brief Generates an observation point serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
@@ -217,7 +217,7 @@ mdns_records_free_pb_window(Interfaces__MdnsRecordsTelemetry__ObservationWindow
  * @brief Generates an observation window serialized protobuf
  *
  * Uses the information pointed by the window parameter to generate
- * a serialized obervation window buffer.
+ * a serialized observation window buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
@@ -733,12 +733,12 @@ mdns_records_set_pb_clients(mdns_records_report_data_t *report)
  ****************************************************************************/
 
 /**
- * @brief Allocates and sets a mdns recrods report protobuf.
+ * @brief Allocates and sets a mdns records report protobuf.
  *
  * Uses the clients tree info to fill a dynamically allocated
  * mdns records report protobuf.
  * The caller is responsible for freeing the returned pointer,
- * @see mdns_recrods_free_pb_report() for this purpose.
+ * @see mdns_records_free_pb_report() for this purpose.
  *
  * @param node info used to fill up the protobuf
  * @return a pointer to a MdnsRecordReport protobuf structure
diff --git a/src/lib/mdns_plugin/ut/test_mdns_records_report.c b/src/lib/mdns_plugin/ut/test_mdns_records_report.c
index 089c8173..121e8842 100644
--- a/src/lib/mdns_plugin/ut/test_mdns_records_report.c
+++ b/src/lib/mdns_plugin/ut/test_mdns_records_report.c
@@ -255,7 +255,7 @@ validate_clients(mdns_records_report_data_t *report, Interfaces__MdnsRecordsTele
         client = ds_tree_inext(&client_iter);
     }
 
-    /* Free validation structre */
+    /* Free validation structure */
     for (i = 0; i < num_clients; i++)
     {
         mdns_records_free_pb_client(clients_pb_tbl[i]);
diff --git a/src/lib/mdnsd/inc/mdnsd.h b/src/lib/mdnsd/inc/mdnsd.h
index 6f2a4219..4f31a5c6 100644
--- a/src/lib/mdnsd/inc/mdnsd.h
+++ b/src/lib/mdnsd/inc/mdnsd.h
@@ -160,7 +160,7 @@ void mdnsd_register_receive_callback(mdns_daemon_t *d, mdnsd_record_received_cal
 int mdnsd_in(mdns_daemon_t *d, struct message *m, struct sockaddr_storage *from);
 
 /**
- * Outgoing messge to be delivered to host, returns >0 if one was
+ * Outgoing message to be delivered to host, returns >0 if one was
  * returned and m/ip/port set
  */
 int mdnsd_out(mdns_daemon_t *d, struct message *m, struct in_addr *ip, unsigned short *port);
diff --git a/src/lib/mdnsd/src/mdnsd.c b/src/lib/mdnsd/src/mdnsd.c
index 4ff37e55..cb68028a 100644
--- a/src/lib/mdnsd/src/mdnsd.c
+++ b/src/lib/mdnsd/src/mdnsd.c
@@ -45,10 +45,10 @@
 /**
  * Messy, but it's the best/simplest balance I can find at the moment
  *
- * Some internal data types, and a few hashes: querys, answers, cached,
+ * Some internal data types, and a few hashes: queries, answers, cached,
  * and records (published, unique and shared).  Each type has different
  * semantics for processing, both for timeouts, incoming, and outgoing
- * I/O.  They inter-relate too, like records affect the querys they are
+ * I/O.  They inter-relate too, like records affect the queries they are
  * relevant to.  Nice things about MDNS: we only publish once (and then
  * ask asked), and only query once, then just expire records we've got
  * cached
@@ -66,7 +66,7 @@ struct query {
 
 struct unicast {
     int id;
-    unsigned long to;    /* Modifed by Plume */
+    unsigned long to;    /* Modified by Plume */
     unsigned short port;
     mdns_record_t *r;
     struct unicast *next;
@@ -515,7 +515,7 @@ static int _cache(mdns_daemon_t *d, struct resource *r)
      */
     ttl = (unsigned long)d->now.tv_sec + (r->ttl / 2) + 8;
 
-    /* If entry already exists, only udpate TTL value */
+    /* If entry already exists, only update TTL value */
     c = NULL;
     while ((c = _c_next(d, c, r->name, r->type))) {
         if (r->type == QTYPE_PTR && strcmp(c->rr.rdname, r->known.ns.name)) {
@@ -716,7 +716,7 @@ void mdnsd_shutdown(mdns_daemon_t *d)
 void mdnsd_flush(mdns_daemon_t *d)
 {
     (void)d;
-    /* - Set all querys to 0 tries
+    /* - Set all queries to 0 tries
      * - Free whole cache
      * - Set all mdns_record_t *to probing
      * - Reset all answer lists
@@ -857,7 +857,7 @@ int mdnsd_in(mdns_daemon_t *d, struct message *m, struct sockaddr_storage *from)
 
                 DBG("Should we send answer? j: %d, m->ancount: %d", j, m->ancount);
                 if (j == m->ancount) {
-                    DBG("Yes we should, enquing %s for outbound", r->rr.name);
+                    DBG("Yes we should, enqueuing %s for outbound", r->rr.name);
                     _r_send(d, r);
                 }
             }
diff --git a/src/lib/ndp_parse/inc/ndp_parse.h b/src/lib/ndp_parse/inc/ndp_parse.h
index b64d5641..a844bac0 100644
--- a/src/lib/ndp_parse/inc/ndp_parse.h
+++ b/src/lib/ndp_parse/inc/ndp_parse.h
@@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "os_types.h"
 
 /**
- * @brief ehternet ARP
+ * @brief ethernet ARP
  */
 struct eth_arp
 {
diff --git a/src/lib/neigh_table/ut/test_neigh_table.c b/src/lib/neigh_table/ut/test_neigh_table.c
index 37092a0c..8bd79724 100644
--- a/src/lib/neigh_table/ut/test_neigh_table.c
+++ b/src/lib/neigh_table/ut/test_neigh_table.c
@@ -1916,7 +1916,7 @@ test_process_link_event(void)
     cache_size = neigh_table_get_cache_size();
     TEST_ASSERT_EQUAL(1, cache_size);
 
-    /* Now we whould be removing the entry */
+    /* Now we would be removing the entry */
     process_link_event(&neigh_info);
     cache_size = neigh_table_get_cache_size();
     TEST_ASSERT_EQUAL(0, cache_size);
diff --git a/src/lib/network_metadata/inc/network_metadata.h b/src/lib/network_metadata/inc/network_metadata.h
index cf038ef6..914f3bad 100644
--- a/src/lib/network_metadata/inc/network_metadata.h
+++ b/src/lib/network_metadata/inc/network_metadata.h
@@ -250,7 +250,7 @@ void free_packed_buffer(struct packed_buffer *pb);
  * @brief Generates an observation point serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
@@ -524,7 +524,7 @@ void free_pb_flowstats(Traffic__FlowStats *pb);
  * @brief Generates a flow stats serialized protobuf
  *
  * Uses the information pointed by the stats parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
@@ -538,7 +538,7 @@ struct packed_buffer * serialize_flow_stats(struct flow_stats *stats);
  * @brief Generates an observation window serialized protobuf
  *
  * Uses the information pointed by the window parameter to generate
- * a serialized obervation window buffer.
+ * a serialized observation window buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
diff --git a/src/lib/network_metadata/inc/network_metadata_report.h b/src/lib/network_metadata/inc/network_metadata_report.h
index a77c9959..2667a71a 100644
--- a/src/lib/network_metadata/inc/network_metadata_report.h
+++ b/src/lib/network_metadata/inc/network_metadata_report.h
@@ -227,7 +227,7 @@ struct net_md_aggregator_set
 {
     struct node_info *info; /* pointer to the node info */
     size_t num_windows;     /* the max # of windows the report will contain */
-    int acc_ttl;            /* how long an incative accumulator is kept around */
+    int acc_ttl;            /* how long an inactive accumulator is kept around */
     int report_type;        /* absolute or relative */
     int report_stats_type;
 
diff --git a/src/lib/network_metadata/inc/network_metadata_utils.h b/src/lib/network_metadata/inc/network_metadata_utils.h
index 29938517..ed85dcf6 100644
--- a/src/lib/network_metadata/inc/network_metadata_utils.h
+++ b/src/lib/network_metadata/inc/network_metadata_utils.h
@@ -45,7 +45,7 @@ enum acc_state
 {
     ACC_STATE_INIT = 0,           /* Not accessed yet */
     ACC_STATE_WINDOW_ACTIVE = 1,  /* Updated in the current observation window */
-    ACC_STATE_WINDOW_RESET = 2,   /* Resetted for the current window */
+    ACC_STATE_WINDOW_RESET = 2,   /* Reset for the current window */
 };
 
 
diff --git a/src/lib/network_metadata/src/network_metadata.c b/src/lib/network_metadata/src/network_metadata.c
index 28e92bce..ad695014 100644
--- a/src/lib/network_metadata/src/network_metadata.c
+++ b/src/lib/network_metadata/src/network_metadata.c
@@ -174,7 +174,7 @@ static void free_pb_op(Traffic__ObservationPoint *pb)
  * @brief Generates an observation point serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
@@ -1871,7 +1871,7 @@ void free_pb_window(Traffic__ObservationWindow *pb)
  * @brief Generates an observation window serialized protobuf
  *
  * Uses the information pointed by the window parameter to generate
- * a serialized obervation window buffer.
+ * a serialized observation window buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
diff --git a/src/lib/network_metadata/src/network_metadata_report.c b/src/lib/network_metadata/src/network_metadata_report.c
index 1815b242..3f8ed756 100644
--- a/src/lib/network_metadata/src/network_metadata_report.c
+++ b/src/lib/network_metadata/src/network_metadata_report.c
@@ -327,7 +327,7 @@ bool net_md_send_report(struct net_md_aggregator *aggr, char *mqtt_topic)
 
     /*
      * Reset the counter indicating the # of inactive flows with
-     * a reference count. It will be updateed while building the report.
+     * a reference count. It will be updated while building the report.
      */
     aggr->held_flows = 0;
 
diff --git a/src/lib/network_telemetry/inc/wc_telemetry.h b/src/lib/network_telemetry/inc/wc_telemetry.h
index 9985d4a5..015dab0d 100644
--- a/src/lib/network_telemetry/inc/wc_telemetry.h
+++ b/src/lib/network_telemetry/inc/wc_telemetry.h
@@ -161,7 +161,7 @@ wc_free_packed_buffer(struct wc_packed_buffer *pb);
  * @brief Generates an observation point serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
@@ -175,8 +175,8 @@ wc_serialize_observation_point(struct wc_observation_point *op);
 /**
  * @brief Generates an observation window serialized protobuf
  *
- * Uses the information pointed by the inpu parameter to generate
- * a serialized obervation window buffer.
+ * Uses the information pointed by the input parameter to generate
+ * a serialized observation window buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
diff --git a/src/lib/network_telemetry/src/wc_telemetry.c b/src/lib/network_telemetry/src/wc_telemetry.c
index 8231f9ac..de42734b 100644
--- a/src/lib/network_telemetry/src/wc_telemetry.c
+++ b/src/lib/network_telemetry/src/wc_telemetry.c
@@ -153,7 +153,7 @@ wc_free_pb_op(Wc__Stats__ObservationPoint *pb)
  * @brief Generates an observation point serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
@@ -258,7 +258,7 @@ wc_free_pb_ow(Wc__Stats__ObservationWindow *pb)
  * @brief Generates an observation point serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
diff --git a/src/lib/network_zone/src/network_zone.c b/src/lib/network_zone/src/network_zone.c
index 38d989c8..0d8c38e0 100644
--- a/src/lib/network_zone/src/network_zone.c
+++ b/src/lib/network_zone/src/network_zone.c
@@ -510,7 +510,7 @@ network_zone_add_mac(struct network_zone_mac *mac)
     entry = CALLOC(1, sizeof(*entry));
     if (entry == NULL) return false;
 
-    /* Convert the mac adress from a string to a os_macaddr_t structure */
+    /* Convert the mac address from a string to a os_macaddr_t structure */
     ret = os_nif_macaddr_from_str(&entry->mac, mac->val);
     if (ret == false) goto out_on_err;
 
diff --git a/src/lib/oms/inc/oms.h b/src/lib/oms/inc/oms.h
index fe934742..3201c3e5 100644
--- a/src/lib/oms/inc/oms.h
+++ b/src/lib/oms/inc/oms.h
@@ -76,7 +76,7 @@ struct oms_mgr
     ds_tree_t config;               /* DS tree of configs */
     ds_tree_t state;                /* DS tree of states */
     ds_tree_t *mqtt_headers;        /* DS tree of mqtt info */
-    char *location_id;              /* platfrom's location id */
+    char *location_id;              /* platform's location id */
     char *node_id;                  /* platform's node id */
     size_t num_states;              /* Number of status nodes in the DS tree */
     size_t num_reports;             /* Number of status node to report */
@@ -89,7 +89,7 @@ struct oms_mgr
 
 
 /**
- * oms initialization paramaters container
+ * oms initialization parameters container
  */
 struct oms_ovsdb_set
 {
diff --git a/src/lib/oms/src/oms_report.c b/src/lib/oms/src/oms_report.c
index 7ffcd8d5..5dc950a6 100644
--- a/src/lib/oms/src/oms_report.c
+++ b/src/lib/oms/src/oms_report.c
@@ -138,7 +138,7 @@ oms_report_free_pb_op(ObjectManager__Status__ObservationPoint *pb)
  * @brief Generates an observation point serialized protobuf
  *
  * Uses the information pointed by the info parameter to generate
- * a serialized obervation point buffer.
+ * a serialized observation point buffer.
  * The caller is responsible for freeing to the returned serialized data,
  * @see free_packed_buffer() for this purpose.
  *
diff --git a/src/lib/os_url/src/os_url.c b/src/lib/os_url/src/os_url.c
index a1e74d70..bc15e01d 100644
--- a/src/lib/os_url/src/os_url.c
+++ b/src/lib/os_url/src/os_url.c
@@ -65,7 +65,7 @@ static const CURLcode curl_stop_list[] =
  * it is a zero terminated string holding the list of ciphers to use
  * for the SSL connection. The list must be syntactically correct, it
  * consists of one or more cipher strings separated by commas, spaces
- * or colons (prefered). !, -, + can be used as operators
+ * or colons (preferred). !, -, + can be used as operators
  */
 static const char enforce_cipher_list[] =        TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256
                                               ":"TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256
diff --git a/src/lib/osa/src/os_backtrace.c b/src/lib/osa/src/os_backtrace.c
index d6c63ae1..0bdd4a3b 100644
--- a/src/lib/osa/src/os_backtrace.c
+++ b/src/lib/osa/src/os_backtrace.c
@@ -347,7 +347,7 @@ static bool sig_crash_report_mem_max_exists(pid_t pid, int32_t *pss)
         fclose(fp);
 
         if (scanned != 2) {
-            LOG(ERR, "Error parsing temporay file: %s\n", strerror(errno));
+            LOG(ERR, "Error parsing temporary file: %s\n", strerror(errno));
             continue;
         }
 
diff --git a/src/lib/osbus/osbus_msg/src/osbus_msg.c b/src/lib/osbus/osbus_msg/src/osbus_msg.c
index 124cb990..55e8b4e8 100644
--- a/src/lib/osbus/osbus_msg/src/osbus_msg.c
+++ b/src/lib/osbus/osbus_msg/src/osbus_msg.c
@@ -401,7 +401,7 @@ bool _osbus_msg_append_item(osbus_msg_t *data, osbus_msg_t *e)
     if (!data || !e) return false;
     if (!osbus_msg_is_container(data)) return false;
     // val.list array is used also for object properties, so that
-    // the order is maintaned - same behvaiour as in jansson
+    // the order is maintained - same behaviour as in jansson
     // resize
     data->val.list = REALLOC(data->val.list, sizeof(osbus_msg_t*) * (data->num + 1));
     // append item
@@ -535,7 +535,7 @@ osbus_msg_t* osbus_msg_set_prop(osbus_msg_t *data, const char *name, osbus_msg_t
     osbus_msg_t *x;
     x = osbus_msg_get_prop(data, name);
     if (x != NULL) {
-        // overwite existing key
+        // overwrite existing key
         i = x->idx;
         ASSERT(data->val.list[i] == x, "idx %d", i);
         osbus_msg_free(x);
diff --git a/src/lib/osn/inc/osn_map.h b/src/lib/osn/inc/osn_map.h
index a99349a8..f337e788 100644
--- a/src/lib/osn/inc/osn_map.h
+++ b/src/lib/osn/inc/osn_map.h
@@ -216,7 +216,7 @@ bool osn_map_rule_set(osn_map_t *self, const osn_map_rule_t *bmr);
 /**
  * Set end-user IPv6 prefix.
  *
- * Typically, but not neccessarily, the end-user IPv6 prefix configured for MAP would be
+ * Typically, but not necessarily, the end-user IPv6 prefix configured for MAP would be
  * a delegated IPv6 prefix (IA_PD).
  *
  * @param[in] self           A valid @ref osn_map_t object.
@@ -228,7 +228,7 @@ bool osn_map_enduser_IPv6_prefix_set(osn_map_t *self, const osn_ip6_addr_t *ipv6
 
 /**
  * Use legacy MAP RFC draft3 when calculating MAP IPv6 address
- * (it's interface-indentifier part).
+ * (it's interface-identifier part).
  *
  * @param[in] self          A valid @ref osn_map_t object.
  * @param[in] use_draft3    If true MAP IPv6 address will be calculated according to legacy
@@ -280,7 +280,7 @@ bool osn_map_uplink_set(osn_map_t *self, const char *uplink_if_name);
 bool osn_map_apply(osn_map_t *self);
 
 /**
- * Get the mathing MAP rule i.e. the configured MAP rule that matched to the configured End-user
+ * Get the matching MAP rule i.e. the configured MAP rule that matched to the configured End-user
  * IPv6 prefix.
  *
  * @param[in]  self           A valid @ref osn_map_t object.
diff --git a/src/lib/osn/inc/osn_qos.h b/src/lib/osn/inc/osn_qos.h
index 834bb41f..e351ad46 100644
--- a/src/lib/osn/inc/osn_qos.h
+++ b/src/lib/osn/inc/osn_qos.h
@@ -96,13 +96,13 @@ struct osn_qos_other_config
 struct osn_qos_queue_status
 {
     uint32_t    qqs_fwmark;                         /**< The firewall mark */
-    char        qqs_class[OSN_QOS_QUEUE_CLASS_LEN]; /**< Class definiton, to be used with CLASSIFY iptables rules */
+    char        qqs_class[OSN_QOS_QUEUE_CLASS_LEN]; /**< Class definition, to be used with CLASSIFY iptables rules */
 };
 
 /**
  * QoS event reporting callback type
  *
- * @param[in]   if_name      Interface for which the event occured
+ * @param[in]   if_name      Interface for which the event occurred
  * @param[in]   event        QoS event
  */
 typedef void osn_qos_event_fn_t(const char *if_name, enum osn_qos_event event);
diff --git a/src/lib/osn/inc/osn_route_rule.h b/src/lib/osn/inc/osn_route_rule.h
index 9bf83b2e..70fd0e90 100644
--- a/src/lib/osn/inc/osn_route_rule.h
+++ b/src/lib/osn/inc/osn_route_rule.h
@@ -181,7 +181,7 @@ bool osn_route_rule_del(osn_route_rule_t *self);
  * Add a policy routing rule.
  *
  * @note After adding rules with this function you should call @ref osn_route_rule_apply()
- * to ensure the configuration has been commited to the system.
+ * to ensure the configuration has been committed to the system.
  *
  * @param[in] self            A valid @ref osn_route_rule_t object
  *
@@ -195,7 +195,7 @@ bool osn_route_rule_add(osn_route_rule_t *self, const osn_route_rule_cfg_t *rout
  * Remove/delete a policy routing rule.
  *
  * @note After removing rules with this function you should call @ref osn_route_rule_apply()
- * to ensure the configuration has been commited to the system.
+ * to ensure the configuration has been committed to the system.
  *
  * @param[in] self            A valid @ref osn_route_rule_t object
  *
diff --git a/src/lib/osn/kconfig/Kconfig.osn.map_v6plus b/src/lib/osn/kconfig/Kconfig.osn.map_v6plus
index d1d6bf1a..fc4d46ce 100644
--- a/src/lib/osn/kconfig/Kconfig.osn.map_v6plus
+++ b/src/lib/osn/kconfig/Kconfig.osn.map_v6plus
@@ -7,7 +7,7 @@ if OSN_BACKEND_MAP_LINUX
                 v6Plus Manufacturer code string used to construct the URL
                 for fetching MAP rules from a rule distribution server.
                 The Kconfig-configured manufacturer code is used by default,
-                unless overriden by OVSDB setting in MAP_Config.
+                unless overridden by OVSDB setting in MAP_Config.
 
                 Manufacturer code is issued for each manufacturer,
                 and universal for a product.
diff --git a/src/lib/osn/src/linux/lnx_route.c b/src/lib/osn/src/linux/lnx_route.c
index 8d26339f..117ce657 100644
--- a/src/lib/osn/src/linux/lnx_route.c
+++ b/src/lib/osn/src/linux/lnx_route.c
@@ -217,7 +217,7 @@ static void lnx_route_state_poll_ev(struct ev_loop *loop, struct ev_debounce *ev
     lnx_route_cache_reset();
 
     /* Poll for route states. Existing routes present in our cache will be simply
-     * flaged as valid again and no further action taken. New routes will be
+     * flagged as valid again and no further action taken. New routes will be
      * added into the cache and reported upstream via notification callback. */
     lnx_route_state_poll(route_state);
 
diff --git a/src/lib/osn/src/linux/lnx_route6.c b/src/lib/osn/src/linux/lnx_route6.c
index abd22429..97f7adbd 100644
--- a/src/lib/osn/src/linux/lnx_route6.c
+++ b/src/lib/osn/src/linux/lnx_route6.c
@@ -182,7 +182,7 @@ static void lnx_route6_state_poll_ev(struct ev_loop *loop, struct ev_debounce *e
     lnx_route6_cache_reset();
 
     /* Poll for route states. Existing routes present in our cache will be simply
-     * flaged as valid again and no further action taken. New routes will be
+     * flagged as valid again and no further action taken. New routes will be
      * added into the cache and reported upstream via notification callback. */
     lnx_route6_state_poll(route_state);
 
diff --git a/src/lib/osn/src/linux/lnx_route6_state.h b/src/lib/osn/src/linux/lnx_route6_state.h
index f46a3c0e..a8150628 100644
--- a/src/lib/osn/src/linux/lnx_route6_state.h
+++ b/src/lib/osn/src/linux/lnx_route6_state.h
@@ -69,7 +69,7 @@ typedef struct lnx_route6_state lnx_route6_state_t;
  *                                    for each route on the system. In that callback
  *                                    the API user has a chance to update its
  *                                    cache of the routes on the system and perform
- *                                    any other neccessary actions (for instance
+ *                                    any other necessary actions (for instance
  *                                    notify the upper layer of any new or deleted
  *                                    routes).
  *
diff --git a/src/lib/osn/src/linux/lnx_route6_state_nl.c b/src/lib/osn/src/linux/lnx_route6_state_nl.c
index b83395ed..0db9e8b7 100644
--- a/src/lib/osn/src/linux/lnx_route6_state_nl.c
+++ b/src/lib/osn/src/linux/lnx_route6_state_nl.c
@@ -247,7 +247,7 @@ static uint32_t gen_local_port(void)
 
 /**
  * Poll route states with netlink/libnl3. This should:
- * - Provide addtional info such as report routes from non-main routing tables
+ * - Provide additional info such as report routes from non-main routing tables
  *   and report other route attributes (preferred src IP, etc).
  * - Provide better performance.
  */
diff --git a/src/lib/osn/src/linux/lnx_route_config.c b/src/lib/osn/src/linux/lnx_route_config.c
index a0f98875..3ffa038e 100644
--- a/src/lib/osn/src/linux/lnx_route_config.c
+++ b/src/lib/osn/src/linux/lnx_route_config.c
@@ -155,7 +155,7 @@ static char *find_dev_name(char *str)
 
 bool lnx_route_find_dev(osn_ip_addr_t addr, char *buf, size_t bufSize)
 {
-    /* Get interafce name from linux routing table */
+    /* Get interface name from linux routing table */
     char cmd[256];
     (void)snprintf(cmd, sizeof(cmd), 
         "ip -4 -o route get %s 2>&1",
diff --git a/src/lib/osn/src/linux/lnx_route_state.h b/src/lib/osn/src/linux/lnx_route_state.h
index 7021f187..508e99ef 100644
--- a/src/lib/osn/src/linux/lnx_route_state.h
+++ b/src/lib/osn/src/linux/lnx_route_state.h
@@ -69,7 +69,7 @@ typedef struct lnx_route_state lnx_route_state_t;
  *                                    for each route on the system. In that callback
  *                                    the API user has a chance to update its
  *                                    cache of the routes on the system and perform
- *                                    any other neccessary actions (for instance
+ *                                    any other necessary actions (for instance
  *                                    notify the upper layer of any new or deleted
  *                                    routes).
  *
diff --git a/src/lib/osn/src/linux/lnx_route_state_nl.c b/src/lib/osn/src/linux/lnx_route_state_nl.c
index 08f51f82..9a7d9b84 100644
--- a/src/lib/osn/src/linux/lnx_route_state_nl.c
+++ b/src/lib/osn/src/linux/lnx_route_state_nl.c
@@ -228,7 +228,7 @@ static uint32_t gen_local_port(void)
 
 /**
  * Poll route states with netlink/libnl3. This should:
- * - Provide addtional info such as report routes from non-main routing tables
+ * - Provide additional info such as report routes from non-main routing tables
  *   and report other route attributes (preferred src IP, etc).
  * - Provide better performance.
  */
diff --git a/src/lib/osn/src/linux/lnx_tc.c b/src/lib/osn/src/linux/lnx_tc.c
index 403d79fe..5ae06523 100644
--- a/src/lib/osn/src/linux/lnx_tc.c
+++ b/src/lib/osn/src/linux/lnx_tc.c
@@ -190,7 +190,7 @@ static bool lnx_tc_reset_if_needed(lnx_tc_t *self)
 
     /*
      * Always reset ingress qdiscs. Ingress qdiscs are used only by tc-filters (this module),
-     * thus they can alway be reset independently of egress qdiscs.
+     * thus they can always be reset independently of egress qdiscs.
      */
     LOG(INFO, "tc: %s: Resetting clsact/ingress", self->lt_ifname);
     rc = execsh_log(LOG_SEVERITY_DEBUG, lnx_tc_qdisc_clsact_reset, self->lt_ifname);
diff --git a/src/lib/osn/src/linux/udhcp_client.h b/src/lib/osn/src/linux/udhcp_client.h
index 24681f58..72d9f407 100644
--- a/src/lib/osn/src/linux/udhcp_client.h
+++ b/src/lib/osn/src/linux/udhcp_client.h
@@ -101,7 +101,7 @@ bool udhcp_client_is_supported_option(int id);
 /**
  * @brief Gets option name for specified option index
  * @param opt_id option index in 1..255 range
- * @return ptr to opton name string or empty string when not found
+ * @return ptr to option name string or empty string when not found
  */
 const char* dhcp_option_name(int opt_id);
 
diff --git a/src/lib/osn/src/osn_map_v6plus.c b/src/lib/osn/src/osn_map_v6plus.c
index beb41ca9..6844bbb7 100644
--- a/src/lib/osn/src/osn_map_v6plus.c
+++ b/src/lib/osn/src/osn_map_v6plus.c
@@ -439,7 +439,7 @@ bool osn_map_v6plus_operation_report(
     long response_code;
     char status_str[32];
 
-    /* Prepare URL paramters: */
+    /* Prepare URL parameters: */
     STRSCAT(cfg.vp_endpoint_url, "?action=");
     snprintf(status_str, sizeof(status_str), "%d", status_action);
     STRSCAT(cfg.vp_endpoint_url, status_str);
diff --git a/src/lib/osn/src/osn_upnp.c b/src/lib/osn/src/osn_upnp.c
index 1761e5cb..44f64bfb 100644
--- a/src/lib/osn/src/osn_upnp.c
+++ b/src/lib/osn/src/osn_upnp.c
@@ -153,7 +153,7 @@ static bool prepare_start(osn_upnp_t *self)
             break;
     }
 
-    // update real active status when attachment succesfull
+    // update real active status when attachment successful
     if (rv)
     {
         self->mode_a = self->mode_p;
diff --git a/src/lib/osp/inc/osp_pki.h b/src/lib/osp/inc/osp_pki.h
index 1af6a43d..15c72e36 100644
--- a/src/lib/osp/inc/osp_pki.h
+++ b/src/lib/osp/inc/osp_pki.h
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * Check if the certificate denoted by `label` and return the expire date
  * and subject line.
  *
- * If `label` is NULL, the defualt certificate is checked.
+ * If `label` is NULL, the default certificate is checked.
  *
  * @return It returns true if the certificate exists and is correct,
  *         otherwise it returns false.
diff --git a/src/lib/osp/kconfig/Kconfig.osp_dl.backend b/src/lib/osp/kconfig/Kconfig.osp_dl.backend
index 61264a9d..2359ebf9 100644
--- a/src/lib/osp/kconfig/Kconfig.osp_dl.backend
+++ b/src/lib/osp/kconfig/Kconfig.osp_dl.backend
@@ -11,4 +11,4 @@ config OSP_DL_CURL
 
         Note: cURL to be fully asynchronous must be compiled with c-ares
         support. Otherwise it will use the system resolver which may block on
-        DNS quieries.
+        DNS queries.
diff --git a/src/lib/osp/kconfig/Kconfig.osp_l2uf.backend b/src/lib/osp/kconfig/Kconfig.osp_l2uf.backend
index 0614d4f3..862f1fd2 100644
--- a/src/lib/osp/kconfig/Kconfig.osp_l2uf.backend
+++ b/src/lib/osp/kconfig/Kconfig.osp_l2uf.backend
@@ -8,4 +8,4 @@ config OSP_L2UF_LIBPCAP
     bool "libpcap"
 
     help
-        Use the libpcap l2uf imlementation
+        Use the libpcap l2uf implementation
diff --git a/src/lib/osp/kconfig/Kconfig.osp_pki b/src/lib/osp/kconfig/Kconfig.osp_pki
index 290221e2..2a894a46 100644
--- a/src/lib/osp/kconfig/Kconfig.osp_pki
+++ b/src/lib/osp/kconfig/Kconfig.osp_pki
@@ -18,7 +18,7 @@ if OSP_PKI_PS
             config OSP_PKI_PS_ALGO_ED25519
                 bool "ED25519"
                 help
-                    Edwards 25519 eliptic curve
+                    Edwards 25519 elliptic curve
 
             config OSP_PKI_PS_ALGO_RSA4096
                 bool "RSA 4096"
diff --git a/src/lib/osp/src/osp_dl_curl.c b/src/lib/osp/src/osp_dl_curl.c
index 5127cec3..2d2ba279 100644
--- a/src/lib/osp/src/osp_dl_curl.c
+++ b/src/lib/osp/src/osp_dl_curl.c
@@ -72,7 +72,7 @@ typedef void osp_dl_curl_dl_fn_t(struct osp_dl_curl *dc, enum osp_dl_status stat
 /*
  * Curl I/O callback.
  *
- * This funciton must return the number of bytes written. If this value is lower
+ * This function must return the number of bytes written. If this value is lower
  * than `data_sz` it assumes an error occurred and the download is aborted.
  *
  * Note: data or data_sz may be NULL or 0 respectively when downloading a file
@@ -201,7 +201,7 @@ bool osp_dl_download(char *url, char *dst_dir, int timeout, osp_dl_cb dl_cb, voi
             url,
             dd->dd_dst_path);
 
-    /* Start asynchronous downloas */
+    /* Start asynchronous downloads */
     if (!osp_dl_curl_start(&dd->dd_curl))
     {
         LOG(ERR, "curl: Error starting download of: %s", url);
@@ -274,7 +274,7 @@ bool osp_dl_download_init_files(struct osp_dl_download *dd, const char *dst_dir)
     }
 
     /*
-     * Deleteing the file is safer than using O_TRUNC as O_TRUNC may fail if the
+     * Deleting the file is safer than using O_TRUNC as O_TRUNC may fail if the
      * file is read-only
      */
     (void)unlink(dst_dir);
@@ -457,7 +457,7 @@ bool osp_dl_curl_start(struct osp_dl_curl *dc)
     }
 
     /*
-     * Create a cURL multi handle -- mutli handles are the only way cURL can
+     * Create a cURL multi handle -- multi handles are the only way cURL can
      * work truly asynchronously.
      */
     dc->dc_multi = curl_multi_init();
@@ -546,7 +546,7 @@ void osp_dl_curl_stop_download(struct osp_dl_curl *dc)
      * The proper teardown sequence of a multi curl handle is as follows:
      *
      * - remove all easy handles using curl_multi_remove_handle()
-     * - destroy the multi handle using curl_mutli_cleanup()
+     * - destroy the multi handle using curl_multi_cleanup()
      * - destroy individual easy handles using curl_easy_cleanup()
      */
     if (dc->dc_multi != NULL)
diff --git a/src/lib/osp/src/osp_otbr_cli_lib.c b/src/lib/osp/src/osp_otbr_cli_lib.c
index 6b8af9ce..e1598f79 100644
--- a/src/lib/osp/src/osp_otbr_cli_lib.c
+++ b/src/lib/osp/src/osp_otbr_cli_lib.c
@@ -354,7 +354,7 @@ static bool NONNULL(1, 3) parse_network_diag_peer_tlvs(
                 {
                     const otIp6Address *const addr = &tlv->mData.mIp6AddrList.mList[i_addr];
                     osn_ip6_addr_t ip_addr = OSN_IP6_ADDR_INIT;
-                    C_STATIC_ASSERT(sizeof(ip_addr.ia6_addr) == sizeof(addr->mFields), "IPv6 address struct missmatch");
+                    C_STATIC_ASSERT(sizeof(ip_addr.ia6_addr) == sizeof(addr->mFields), "IPv6 address struct mismatch");
 
                     memcpy(&ip_addr.ia6_addr, addr->mFields.m8, sizeof(ip_addr.ia6_addr));
                     ARRAY_APPEND_COPY(device->ip_addresses.addr, device->ip_addresses.count, ip_addr);
diff --git a/src/lib/osp/src/osp_pki_ps.c b/src/lib/osp/src/osp_pki_ps.c
index 5dffa7f3..6f4f9b35 100644
--- a/src/lib/osp/src/osp_pki_ps.c
+++ b/src/lib/osp/src/osp_pki_ps.c
@@ -155,7 +155,7 @@ char *osp_pki_cert_request(const char *label, const char *subject)
     }
 
     /*
-     * Genereate the CSR -- in newer version of openssl (3.x) it is impossible to read the private key from stdin
+     * Generate the CSR -- in newer version of openssl (3.x) it is impossible to read the private key from stdin
      * as `-key -` does not work. The workaround is to use `-key /dev/stdin`, however, `/dev/stdin` is not present
      * on many systems. Since `/dev/stdin` is usually just a symlink to `/proc/self/fd/0`, just use that directly.
      */
@@ -311,7 +311,7 @@ bool osp_pki_cert_remove(const char *label)
 
 /*
  * Install certificates and keys to tmpfs. This function will rename existing
- * certficates/keys by adding the ".defualt" extension. Certificates from the
+ * certficates/keys by adding the ".default" extension. Certificates from the
  * persistent store will be copied to the destination folder using the ".new"
  * extension. Finally it will symlink the certificate/private keys filenames
  * to the ".new" files.
@@ -814,7 +814,7 @@ bool pki_cert_info(const char *crt, time_t *expire_date, char *sub, size_t sub_s
     char *crtinfo = execssl_arena(scratch, crt, "x509", "-enddate", "-subject", "-nameopt", "compat", "-noout");
     if (crtinfo == NULL)
     {
-        LOG(ERR, "osp_pki: Error retriving certificate information.");
+        LOG(ERR, "osp_pki: Error retrieving certificate information.");
         return false;
     }
 
diff --git a/src/lib/osp/src/osp_sec_openssl.c b/src/lib/osp/src/osp_sec_openssl.c
index d678a5b4..79a454f4 100644
--- a/src/lib/osp/src/osp_sec_openssl.c
+++ b/src/lib/osp/src/osp_sec_openssl.c
@@ -47,7 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AES256_IV_SIZE      16
 
 /**
- * Get a random initialization vector to be used for encription.
+ * Get a random initialization vector to be used for encryption.
  *
  */
 static bool osp_sec_get_iv(void *iv, int iv_len)
@@ -117,7 +117,7 @@ static ssize_t osp_sec_cipher(void *out, size_t out_len,
         return out_needed_len;
     }
 
-    /* Get encription key (assumed to be unique per device): */
+    /* Get encryption key (assumed to be unique per device): */
     if (!osp_sec_get_key(key, sizeof(key)))
     {
         LOG(ERROR, "Failed to get encryption key");
diff --git a/src/lib/osw/inc/osw_drv.h b/src/lib/osw/inc/osw_drv.h
index 8aae4ceb..aeb853b5 100644
--- a/src/lib/osw/inc/osw_drv.h
+++ b/src/lib/osw/inc/osw_drv.h
@@ -630,7 +630,7 @@ osw_drv_report_vif_channel_change_started(struct osw_drv *drv,
 /* When STA link is active and the root AP advertises a CSA
  * - either through Beacon or Action frame - then this
  * function shall be called, regardless of whether the
- * target channel is serviciable by the STA link's radio or
+ * target channel is serviceable by the STA link's radio or
  * not.
  */
 void
diff --git a/src/lib/osw/src/nl80211_copy.h b/src/lib/osw/src/nl80211_copy.h
index c14a91bb..6e4fef91 100644
--- a/src/lib/osw/src/nl80211_copy.h
+++ b/src/lib/osw/src/nl80211_copy.h
@@ -511,7 +511,7 @@
  *	%NL80211_ATTR_SCHED_SCAN_PLANS. If %NL80211_ATTR_SCHED_SCAN_PLANS is
  *	not specified and only %NL80211_ATTR_SCHED_SCAN_INTERVAL is specified,
  *	scheduled scan will run in an infinite loop with the specified interval.
- *	These attributes are mutually exculsive,
+ *	These attributes are mutually exclusive,
  *	i.e. NL80211_ATTR_SCHED_SCAN_INTERVAL must not be passed if
  *	NL80211_ATTR_SCHED_SCAN_PLANS is defined.
  *	If for some reason scheduled scan is aborted by the driver, all scan
@@ -542,7 +542,7 @@
  *	%NL80211_CMD_STOP_SCHED_SCAN command is received or when the interface
  *	is brought down while a scheduled scan was running.
  *
- * @NL80211_CMD_GET_SURVEY: get survey resuls, e.g. channel occupation
+ * @NL80211_CMD_GET_SURVEY: get survey results, e.g. channel occupation
  *      or noise level
  * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
  *	NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
diff --git a/src/lib/osw/src/osw_bss_map.c b/src/lib/osw/src/osw_bss_map.c
index 77b8c7a5..2573f5a4 100644
--- a/src/lib/osw/src/osw_bss_map.c
+++ b/src/lib/osw/src/osw_bss_map.c
@@ -379,7 +379,7 @@ osw_bss_map_register_observer(struct osw_bss_map_observer *observer)
      * worked_on_at_least_once is true, because otherwise
      * the set_fn/unset_fn would go out of whack between
      * different observers if some bss entries are
-     * immediatelly removed. Better safe then
+     * immediately removed. Better safe then
      * sorry. The set_fn() callee needs to be
      * prepared for repeated calls, even when
      * there are no changes, anyway.
diff --git a/src/lib/osw/src/osw_confsync.c b/src/lib/osw/src/osw_confsync.c
index 69f7b722..d2bca27b 100644
--- a/src/lib/osw/src/osw_confsync.c
+++ b/src/lib/osw/src/osw_confsync.c
@@ -81,7 +81,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* FIXME: This is temporary solution to avoid changing too
  * many things at once.  Before OSW_MODULE can be fully
- * utilized a way to mock-up for UT is necessarry.
+ * utilized a way to mock-up for UT is necessary.
  */
 typedef struct ds_tree *osw_confsync_build_conf_fn_t(void);
 
@@ -1294,7 +1294,7 @@ osw_confsync_vif_ap_mark_changed(struct osw_drv_vif_config *dvif,
                                && (dvif->u.ap.mode_changed == false);
 
         if (csa_eligible && (cac_running || cac_bugged)) {
-            /* This shouldn't be a common occurance, so keep it
+            /* This shouldn't be a common occurrence, so keep it
              * at INFO so it's visible when it happens.
              */
             const char *vif_name = cvif->vif_name;
@@ -1830,7 +1830,7 @@ osw_confsync_build_drv_conf_vif_sta_op(struct osw_drv_vif_config *dvif,
      * the current channel before it can be changed.  For
      * that to happen the STA link needs to be dropped.
      *
-     * RECONNECT would do that, but it would immediatelly
+     * RECONNECT would do that, but it would immediately
      * start connecting. Normally this would result in no
      * link for some time, and channel would eventually be
      * changed before the target parent can actually be
@@ -2540,7 +2540,7 @@ osw_confsync_state_changed(struct osw_confsync *cs)
      * may go through transient state changes before
      * reaching a final state. To avoid needlessly
      * re-issuing configuration commands, and possibly
-     * making configuration inadvertantly longer, move to
+     * making configuration inadvertently longer, move to
      * CHECKING only when IDLE.
      */
     switch (cs->state) {
@@ -2754,7 +2754,7 @@ osw_confsync_conf_mutated_cb(struct osw_conf_observer *o)
 static void osw_confsync_phy_tree_timeout_cb(EV_P_  ev_timer *arg, int events)
 {
     struct osw_confsync *cs = container_of(arg, struct osw_confsync, last_phy_tree_timeout);
-    LOGT("osw: confsync: last phy tree timer expired, flusing last phy_tree");
+    LOGT("osw: confsync: last phy tree timer expired, flushing last phy_tree");
     osw_conf_free(cs->last_phy_tree);
     cs->last_phy_tree = NULL;
     ev_timer_stop(EV_DEFAULT_ &cs->last_phy_tree_timeout);
diff --git a/src/lib/osw/src/osw_drv.c b/src/lib/osw/src/osw_drv.c
index d1c70bac..c1c5ce31 100644
--- a/src/lib/osw/src/osw_drv.c
+++ b/src/lib/osw/src/osw_drv.c
@@ -76,7 +76,7 @@ static bool g_osw_drv_settled;
     LOGI("osw: drv: retrying sta state request: drv=%s phy=%s vif=%s sta=" OSW_HWADDR_FMT, \
          sta->vif->phy->drv->ops->name, sta->vif->phy->phy_name, sta->vif->vif_name, OSW_HWADDR_ARG(&(sta)->mac_addr));
 #define osw_log_drv_watchdog() \
-    LOGW("osw: drv: watchdog trigerred: system has not settled for %.2f seconds", \
+    LOGW("osw: drv: watchdog triggered: system has not settled for %.2f seconds", \
          OSW_DRV_WORK_ALL_WATCHDOG_SECONDS);
 
 #define ARRDUP(src, dst, memb_ptr, memb_len) \
@@ -3458,7 +3458,7 @@ osw_drv_frame_tx_process_frames(struct osw_drv *drv)
 
         switch (desc->state) {
             case OSW_DRV_FRAME_TX_STATE_UNUSED:
-                LOGD("osw: drv: unused frame tx on pedning list, resetting frame");
+                LOGD("osw: drv: unused frame tx on pending list, resetting frame");
                 break;
             case OSW_DRV_FRAME_TX_STATE_PENDING:
                 vif_name = strlen(desc->vif_name.buf) > 0 ? desc->vif_name.buf : NULL;
@@ -3482,7 +3482,7 @@ osw_drv_frame_tx_process_frames(struct osw_drv *drv)
                 break;
             case OSW_DRV_FRAME_TX_STATE_SUBMITTED:
             case OSW_DRV_FRAME_TX_STATE_FAILED:
-                LOGD("osw: drv: submitted/failed frame tx at the beginning of pedning list, resetting frame");
+                LOGD("osw: drv: submitted/failed frame tx at the beginning of pending list, resetting frame");
                 osw_timer_disarm(&desc->expiry);
                 break;
         }
diff --git a/src/lib/osw/src/osw_drv_wifihal_3_0.c b/src/lib/osw/src/osw_drv_wifihal_3_0.c
index e8a72d7f..63e4bc5a 100644
--- a/src/lib/osw/src/osw_drv_wifihal_3_0.c
+++ b/src/lib/osw/src/osw_drv_wifihal_3_0.c
@@ -269,7 +269,7 @@ osw_conf_mutate_errata_2ghz_vht(struct wifihal_3_0_priv *priv,
             const enum osw_band band = osw_freq_to_band(freq);
 
             /* FIXME: 11ac is not allowed on 2.4G by the
-             * vanilla spec but vendors have extenstions to do that
+             * vanilla spec but vendors have extensions to do that
              * anyway. Setting 11ac alone (without 11ax) variant to
              * Wifi HAL works as expected, but setting both 11ax and
              * 11ac flags ends up with 11ax being reported back, but
@@ -280,7 +280,7 @@ osw_conf_mutate_errata_2ghz_vht(struct wifihal_3_0_priv *priv,
              * specific 11ac mode).
              *
              * This should be addressed by allowing OSW drivers to
-             * advertise capabilites so that osw_confsync can make an
+             * advertise capabilities so that osw_confsync can make an
              * educated decision on what to do with a setup like this.
              *
              * This override makes sure that only a valid config will
@@ -1538,7 +1538,7 @@ osw_drv_request_vif_state_cb(struct osw_drv *drv,
     // WIFI_80211_VARIANT_AD = 0x40,
     // mode.wps
 
-    /* FIXME: Is the radio_params using Transmision Units or Milliseconds? */
+    /* FIXME: Is the radio_params using Transmission Units or Milliseconds? */
     ap->beacon_interval_tu = radio_params.beaconInterval;
     ap->channel = radio_build_chan(&radio_params);
 
@@ -2101,7 +2101,7 @@ osw_drv_request_config_cb(struct osw_drv *drv,
             };
             /* FIXME: Some of the actions taken by vap_configure_cb()
              * call wifi hal api - this might not be a good idea
-             * because some parameters may only be changable when
+             * because some parameters may only be changeable when
              * interface is already UP, ie. bringing interface up
              * would require 2 rounds of reconfigs (with 30s timeout
              * in between by osw_confsync). This is fine for initial
diff --git a/src/lib/osw/src/osw_rrm_bcn_meas_rpt_cache_ut.c b/src/lib/osw/src/osw_rrm_bcn_meas_rpt_cache_ut.c
index 3b574c13..2434250f 100644
--- a/src/lib/osw/src/osw_rrm_bcn_meas_rpt_cache_ut.c
+++ b/src/lib/osw/src/osw_rrm_bcn_meas_rpt_cache_ut.c
@@ -100,7 +100,7 @@ OSW_UT(osw_rrm_bcn_meas_rpt_cache_lifetime)
                                        &meas_rpt_ie_fixed_bssid1_rpt,
                                        &meas_rpt_ie_beacon_bssid1_rpt);
 
-    /* Both BSSID 0 and 1 should be availabe for STA 0 */
+    /* Both BSSID 0 and 1 should be available for STA 0 */
     rpt = osw_rrm_bcn_meas_rpt_cache_lookup(&cache, &ref_sta_addr, &ref_bssid0);
     OSW_UT_EVAL(rpt != NULL);
     OSW_UT_EVAL(rpt->op_class == meas_rpt_ie_beacon_bssid0_rpt.op_class);
diff --git a/src/lib/osw/src/osw_rrm_ut.c b/src/lib/osw/src/osw_rrm_ut.c
index 079d1ce7..9a84ac05 100644
--- a/src/lib/osw/src/osw_rrm_ut.c
+++ b/src/lib/osw/src/osw_rrm_ut.c
@@ -261,7 +261,7 @@ osw_rrm_ut_process_empty_report(struct osw_rrm_rpt_observer *observer,
 
 OSW_UT(osw_rrm_process_empty_report)
 {
-    /* Measurment Report Mode: Refused */
+    /* Measurement Report Mode: Refused */
     const uint8_t ref_frame[] = {
         0xd0, 0x00, 0x3c, 0x00, 0x52, 0xb4, 0xf7, 0xf0, 0x1a, 0xbe, 0xd4, 0x61, 0x9d, 0x53, 0x75, 0x05,
         0x52, 0xb4, 0xf7, 0xf0, 0x1a, 0xbe, 0xc0, 0x9a, 0x05, 0x01, 0x01, 0x27, 0x03, 0x02, 0x04, 0x05,
diff --git a/src/lib/osw/src/osw_util.c b/src/lib/osw/src/osw_util.c
index 7f920c96..d521a434 100644
--- a/src/lib/osw/src/osw_util.c
+++ b/src/lib/osw/src/osw_util.c
@@ -555,7 +555,7 @@ osw_parse_supported_op_classes(const struct element *elem,
          * also a valid opclass. Some client STAs do not take it into account
          * and simply list supported op classes which might include 130.
          * It creates ambiguity as it is not always possible to detect
-         * if it is a valid Current Operating Class Extention Sequence
+         * if it is a valid Current Operating Class Extension Sequence
          * or simply a continuation of such (spec incompliant) op class list.
          * Example Supported Operating Classes IE dump with malformed list from
          * Samsung Galaxy phone:
diff --git a/src/lib/otbr_cli/src/otbr_cli.c b/src/lib/otbr_cli/src/otbr_cli.c
index cda10fca..b398d186 100644
--- a/src/lib/otbr_cli/src/otbr_cli.c
+++ b/src/lib/otbr_cli/src/otbr_cli.c
@@ -149,7 +149,7 @@ const char *otbr_cli_cmd(const char *const fmt, ...)
  *
  * @param[in]  line   Response line to check.
  * @param[out] error  Where to write the beginning of the error message located in `line`.
- *                    Only writen this line is an error/status line or if the error message is not empty.
+ *                    Only written this line is an error/status line or if the error message is not empty.
  *
  * @return `OT_ERROR_INVALID` if this line is not a status line, any other value if
  *         this is a status line representing a final line of a complete response.
diff --git a/src/lib/ovsdb/inc/ovsdb_utils.h b/src/lib/ovsdb/inc/ovsdb_utils.h
index eae5b5da..95a0d669 100644
--- a/src/lib/ovsdb/inc/ovsdb_utils.h
+++ b/src/lib/ovsdb/inc/ovsdb_utils.h
@@ -77,7 +77,7 @@ struct str_ipair
  *
  * @param a the first string of the comparison
  * @param b the second string of the comparison
- * @return the string comparision result
+ * @return the string comparison result
  */
 int
 str_tree_cmp(const void *a, const void *b);
@@ -132,7 +132,7 @@ schema2tree(size_t key_size, size_t val_size, size_t nelems,
  *
  * @param key the key element of the pair
  * @param value the value element of the pair
- * @return a string pair pointer if successfull, NULL otherwise.
+ * @return a string pair pointer if successful, NULL otherwise.
  */
 struct str_pair *
 get_pair(const char *key, const char *value);
diff --git a/src/lib/ovsdb/src/ovsdb_sync_api.c b/src/lib/ovsdb/src/ovsdb_sync_api.c
index 98e997f2..64823baf 100644
--- a/src/lib/ovsdb/src/ovsdb_sync_api.c
+++ b/src/lib/ovsdb/src/ovsdb_sync_api.c
@@ -414,7 +414,7 @@ int ovsdb_sync_update_where(const char *table, json_t *where, json_t *row)
     json_get_str(where, where_str, sizeof(where_str));
     LOG(DEBUG, "Table %s where: '%s' update: %s", table, where_str, json_dumps_static(row, 0));
     result = ovsdb_tran_call_s(table, OTR_UPDATE, where, row);
-    // successfull result: [{}, {"count": 1}]
+    // successful result: [{}, {"count": 1}]
     // errors handled by:
     rc =  ovsdb_get_update_result_count(result, table, "update");
     if (rc == 0)
diff --git a/src/lib/ovsdb/src/ovsdb_update.c b/src/lib/ovsdb/src/ovsdb_update.c
index e623a613..42ccbdb5 100644
--- a/src/lib/ovsdb/src/ovsdb_update.c
+++ b/src/lib/ovsdb/src/ovsdb_update.c
@@ -184,7 +184,7 @@ bool ovsdb_update_monitor_ex(
     memset(self, 0, sizeof(*self));
     self->mon_cb = callback;
 
-    /* Regiter update handler */
+    /* Register update handler */
     int monid = ovsdb_register_update_cb(
             ovsdb_update_monitor_call_cbk,
             self);
diff --git a/src/lib/ovsdb/src/ovsdb_utils.c b/src/lib/ovsdb/src/ovsdb_utils.c
index b5b1715a..df82893d 100644
--- a/src/lib/ovsdb/src/ovsdb_utils.c
+++ b/src/lib/ovsdb/src/ovsdb_utils.c
@@ -114,7 +114,7 @@ free_str_set(struct str_set *set)
  *
  * @param a the first string of the comparison
  * @param b the second string of the comparison
- * @return the string comparision result
+ * @return the string comparison result
  */
 int
 str_tree_cmp(const void *a, const void *b)
@@ -131,7 +131,7 @@ str_tree_cmp(const void *a, const void *b)
  *
  * @param key the key element of the pair
  * @param value the value element of the pair
- * @return a string pair pointer if successfull, NULL otherwise
+ * @return a string pair pointer if successful, NULL otherwise
  */
 struct str_pair *
 get_pair(const char *key, const char *value)
@@ -312,7 +312,7 @@ free_int_set(struct int_set *set)
  *
  * @param key the key element of the pair
  * @param value the value element of the pair
- * @return a string pair pointer if successfull, NULL otherwise
+ * @return a string pair pointer if successful, NULL otherwise
  */
 struct str_ipair *
 get_ipair(const char *key, int value)
diff --git a/src/lib/ovsdb/ut/test_ovsdb_utils.c b/src/lib/ovsdb/ut/test_ovsdb_utils.c
index d08acfde..616d4b6e 100644
--- a/src/lib/ovsdb/ut/test_ovsdb_utils.c
+++ b/src/lib/ovsdb/ut/test_ovsdb_utils.c
@@ -99,7 +99,7 @@ test_schema2str_set(void)
     char **out;
     size_t i;
 
-    /* Gather the conversion paramters */
+    /* Gather the conversion parameters */
     elem_size = sizeof(str_arrays[0][0]);
     nelems = 3;
 
@@ -137,7 +137,7 @@ test_schema2tree(void)
     char *in_key;
     size_t i;
 
-    /* Gather the conversion paramters */
+    /* Gather the conversion parameters */
     elem_size = sizeof(str_pairs[0][0][0]);
     nelems = 3;
 
@@ -176,7 +176,7 @@ test_schema2int_set(void)
     size_t i;
     int *out;
 
-    /* Gather the conversion paramters */
+    /* Gather the conversion parameters */
     nelems = 3;
 
     /* Execute the conversion */
@@ -200,7 +200,7 @@ test_schema2int_set(void)
 /**
  * @brief test schema2itree
  *
- * Validates the conversion of an OVSDB interger map to a str_ipair structure.
+ * Validates the conversion of an OVSDB integer map to a str_ipair structure.
  */
 void
 test_schema2itree(void)
@@ -211,7 +211,7 @@ test_schema2itree(void)
     int in_value;
     char *in_key;
 
-    /* Gather the conversion paramters */
+    /* Gather the conversion parameters */
     elem_size = sizeof(str_pairs[0][0][0]);
     nelems = 3;
 
diff --git a/src/lib/ovsdb_bridge/src/ovsdb_bridge.c b/src/lib/ovsdb_bridge/src/ovsdb_bridge.c
index d26d95cf..0facedde 100644
--- a/src/lib/ovsdb_bridge/src/ovsdb_bridge.c
+++ b/src/lib/ovsdb_bridge/src/ovsdb_bridge.c
@@ -131,7 +131,7 @@ static json_t *ovsdb_bridge_br_name(void)
  *
  * @param if_name   Interface name
  *
- * @return json object specifing default Interface table vales
+ * @return json object specifying default Interface table vales
  */
 static json_t *ovsdb_bridge_interface_row(const char *if_name)
 {
@@ -167,7 +167,7 @@ static json_t *ovsdb_bridge_interface_row(const char *if_name)
  *
  * @param port_name   Port name
  *
- * @return json object specifing default Port table vales
+ * @return json object specifying default Port table vales
  */
 static json_t *ovsdb_bridge_port_row(const char *port_name)
 {
@@ -183,7 +183,7 @@ static json_t *ovsdb_bridge_port_row(const char *port_name)
  *
  * @param br_name   Bridge name
  *
- * @return json object specifing default Bridge table vales
+ * @return json object specifying default Bridge table vales
  */
 static json_t *ovsdb_bridge_br_row(const char *br_name)
 {
@@ -213,10 +213,10 @@ static json_t *ovsdb_bridge_br_row(const char *br_name)
 }
 
 /**
- * @brief creates the row parameter value for modifing the Open_vSwitch table.
+ * @brief creates the row parameter value for modifying the Open_vSwitch table.
  * Open_vSwitch table's "bridges" will be set to the default bridge name
  *
- * @return json object specifing the bridges value
+ * @return json object specifying the bridges value
  */
 static json_t *ovsdb_bridge_ovswitch_row(void)
 {
diff --git a/src/lib/ow/inc/ow_conf_barrier.h b/src/lib/ow/inc/ow_conf_barrier.h
index 65cbe525..f38dd8f0 100644
--- a/src/lib/ow/inc/ow_conf_barrier.h
+++ b/src/lib/ow/inc/ow_conf_barrier.h
@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * This is intended to be called from a non-mainloop threads
  * to synchronize against osw_confsync and ow_conf work.
  *
- * It is safe to call this immediatelly after ow_conf_*()
+ * It is safe to call this immediately after ow_conf_*()
  * calls that modify a steady-state system into possible
  * non-steady state that needs a reconfig.
  *
diff --git a/src/lib/ow/src/ow_acl_kick.c b/src/lib/ow/src/ow_acl_kick.c
index a2bd9f46..24988b26 100644
--- a/src/lib/ow/src/ow_acl_kick.c
+++ b/src/lib/ow/src/ow_acl_kick.c
@@ -47,7 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * This modules makes sure that ACLs configured via ow_conf
  * are enforced at all times, ie. regardless of the ordering
  * of ACL mutation and stations connecting/disconnecting, a
- * client that is effectivelly banned through the ACL, will
+ * client that is effectively banned through the ACL, will
  * be kicked if necessary.
  *
  * This could be improved by looking at osw_state as well.
diff --git a/src/lib/ow/src/ow_core.c b/src/lib/ow/src/ow_core.c
index b3f26325..70032a10 100644
--- a/src/lib/ow/src/ow_core.c
+++ b/src/lib/ow/src/ow_core.c
@@ -82,7 +82,7 @@ ow_core_run(EV_P)
 
     /* FIXME: This is a little clunky. osw_ev is supposed to
      * be _the_ ev loop provider. However with the current
-     * state of affiars it needs a bit more work to clean
+     * state of affairs it needs a bit more work to clean
      * this up.
     */
     assert(OSW_MODULE_LOAD(osw_ev) == EV_A);
diff --git a/src/lib/ow/src/ow_dfs_chan_clip.c b/src/lib/ow/src/ow_dfs_chan_clip.c
index 2ddc66eb..7e4fd276 100644
--- a/src/lib/ow/src/ow_dfs_chan_clip.c
+++ b/src/lib/ow/src/ow_dfs_chan_clip.c
@@ -51,13 +51,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Description:
  *
- * Sometimes the configuraton data model will end
+ * Sometimes the configuration data model will end
  * up requesting an invalid channel, most often
  * tied to DFS NOL states.
  *
  * Sometimes the PHY will run away to an undesired
  * channel, whereas it could've kept some
- * resemblence to the original config.
+ * resemblance to the original config.
  *
  * As such it is always preferred to maintain the
  * primary channel of the original configuration
@@ -430,7 +430,7 @@ ow_dfs_chan_clip_vif_chan(struct ow_dfs_chan_clip *m,
     /* PHY channel states are reported independently to VIF
      * channels. When DFS radar is seen VIFs can report
      * channel updates as staggered. osw_confsync could see
-     * this incosistency and start reconfiguring channels
+     * this inconsistency and start reconfiguring channels
      * unnecessarily. This below is used to temporarily
      * ignore DFS NOL states and stick to the VIF's channel
      * states to keep osw_confsync idle. Once system
diff --git a/src/lib/ow/src/ow_mbss_prefer_nonhidden.c b/src/lib/ow/src/ow_mbss_prefer_nonhidden.c
index 14001e57..6710fc47 100644
--- a/src/lib/ow/src/ow_mbss_prefer_nonhidden.c
+++ b/src/lib/ow/src/ow_mbss_prefer_nonhidden.c
@@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * What it does
  *
- * It applies a mutation somwhere at the end of osw_conf
+ * It applies a mutation somewhere at the end of osw_conf
  * mutation chain making sure that the configuration is
  * pointing to a non-hidden AP VIF if Multi BSSID is
  * detected to be operational.
diff --git a/src/lib/ow/src/ow_ovsdb.c b/src/lib/ow/src/ow_ovsdb.c
index 157829b8..a15140a4 100644
--- a/src/lib/ow/src/ow_ovsdb.c
+++ b/src/lib/ow/src/ow_ovsdb.c
@@ -1130,7 +1130,7 @@ ow_ovsdb_phystate_to_schema(struct ow_ovsdb_phy *owo_phy,
     /* FIXME: Some parameters don't really are driver-driven
      * states, but will be handled internally in OW, eg.
      * fallback_parents, so there can be just copied.
-     * However some arguably should be dervied from the
+     * However some arguably should be derived from the
      * state, eg. freq_band.
      */
     if (rconf != NULL) {
@@ -3584,7 +3584,7 @@ ow_ovsdb_vconf_to_ow_conf_ap(const struct schema_Wifi_VIF_Config *vconf,
         }
     }
 
-    /* schema value for MBO controlls also OCE internally */
+    /* schema value for MBO controls also OCE internally */
     if (is_new == true || vconf->mbo_changed == true) {
         if (vconf->mbo_exists == true) {
             const bool x = vconf->mbo;
@@ -4302,7 +4302,7 @@ static void
 ow_ovsdb_flush(void)
 {
     /* FIXME: This shouldn't be necessary. The code should actually sync not
-     * only rows, but also (non)existance of rows. One idea would be to employ
+     * only rows, but also (non)existence of rows. One idea would be to employ
      * ovsdb ping and/or ev_idle (to allow real ovsdb transactions to be
      * delivered to the process) and then - based on what rows are reported -
      * remove those that shouldn't be there.
diff --git a/src/lib/ow/src/ow_ovsdb_dfs_backup.c b/src/lib/ow/src/ow_ovsdb_dfs_backup.c
index bd7664bb..4de31e40 100644
--- a/src/lib/ow/src/ow_ovsdb_dfs_backup.c
+++ b/src/lib/ow/src/ow_ovsdb_dfs_backup.c
@@ -64,7 +64,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * This does 2 things actually, arguably unnecessarily. It
  * feeds ow_dfs_backup with ovsdb (data model) configuration
  * _and_ acts upon backup trigger. These could be done
- * separately, but given how tighly coupled these are it
+ * separately, but given how tightly coupled these are it
  * would probably be problematic to consider them separate
  * anyway.
  */
diff --git a/src/lib/ow/src/ow_ovsdb_wps.c b/src/lib/ow/src/ow_ovsdb_wps.c
index be631784..ef3afe24 100644
--- a/src/lib/ow/src/ow_ovsdb_wps.c
+++ b/src/lib/ow/src/ow_ovsdb_wps.c
@@ -61,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * The (B) case means "start".
  *  - If WPS PBC job is already under way it is cancelled
- *    and a new one is startd.
+ *    and a new one is started.
  *  - If WPS PBC job was not running a new job is started.
  *  - Wifi_VIF_Config::wps_pbc is self-cleared
  *
diff --git a/src/lib/ow/src/ow_sta_channel_override.c b/src/lib/ow/src/ow_sta_channel_override.c
index 378d4422..79b2f021 100644
--- a/src/lib/ow/src/ow_sta_channel_override.c
+++ b/src/lib/ow/src/ow_sta_channel_override.c
@@ -41,7 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * This module provides logic that mutates the
  * osw_conf/osw_confsync so that if there's an active
  * OSW_VIF_STA link then any OSW_VIF_AP channel
- * configurations will be overriden with the root AP
+ * configurations will be overridden with the root AP
  * operational channel.
  *
  * Rationale:
@@ -160,7 +160,7 @@ ow_sta_channel_override_ap_settling_cb(struct osw_timer *t)
      * - that is expected to disarm the settling.
      */
     ap->settle_timeout_count++;
-    LOGN(LOG_PREFIX_AP(ap, "failed to converge channels (total occurances = %lu",
+    LOGN(LOG_PREFIX_AP(ap, "failed to converge channels (total occurrences = %lu",
                        ap->settle_timeout_count));
 }
 
diff --git a/src/lib/ow/src/ow_sta_log_snr.c b/src/lib/ow/src/ow_sta_log_snr.c
index 21c05f96..7cd579ac 100644
--- a/src/lib/ow/src/ow_sta_log_snr.c
+++ b/src/lib/ow/src/ow_sta_log_snr.c
@@ -53,7 +53,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * used to auto-tune tx power on backhaul links when "too
  * strong" signal condition is detected. This is beyond just
  * steering. If possible, per-sta tx power could be also
- * adjusted (if supported by unerlying driver) not only for
+ * adjusted (if supported by underlying driver) not only for
  * backhaul links, but also for regular clients if they
  * happen to find themselves too close to the AP.
  */
diff --git a/src/lib/ow/src/ow_stats_conf.c b/src/lib/ow/src/ow_stats_conf.c
index 727dd01a..f82d0501 100644
--- a/src/lib/ow/src/ow_stats_conf.c
+++ b/src/lib/ow/src/ow_stats_conf.c
@@ -76,13 +76,13 @@ threshold          : ["map",[["max_delay",600],["util",10]]]
  *
  * This is intended to simplify integration to some
  * configuration systems like OVSDB (Wifi_Stats_Config).
- * It bakes in some of the pecularities of how the
+ * It bakes in some of the peculiarities of how the
  * polling/sampling/reporting times are set.
  *
  * Ideally this should be renamed to ow_stats_pb (protobuf)
  * and the publishing should be abstracted, so that
  * ow_stats_pb_qm could be used to publish the generated
- * protobuf over QM (unix socket). The alternate trasnport
+ * protobuf over QM (unix socket). The alternate transport
  * would be ow_stats_pb_rbus for example.
  */
 
@@ -892,7 +892,7 @@ ow_stats_conf_sub_report_sta(struct ow_stats_conf_entry *e,
      * connects as report is about to be scheduled it's
      * possible that driver will deliver stats, but won't go
      * through all the motions of reporting sta_state. In
-     * that case the report will be posponed until another
+     * that case the report will be postponed until another
      * report target time. This could be re-tried sooner
      * upon sta_connected_cb, although that would violate
      * the reporting interval a little bit.
diff --git a/src/lib/ow/src/ow_steer_executor_action.c b/src/lib/ow/src/ow_steer_executor_action.c
index 1550248f..508151c9 100644
--- a/src/lib/ow/src/ow_steer_executor_action.c
+++ b/src/lib/ow/src/ow_steer_executor_action.c
@@ -203,7 +203,7 @@ ow_steer_executor_action_get_kick_action_bss(const struct ow_steer_executor_acti
             break;
     };
 
-    /* Check if there's a avaiable candidate with higher metric */
+    /* Check if there's a available candidate with higher metric */
     const unsigned int vif_candidate_metric = ow_steer_candidate_get_metric(vif_candidate);
     size_t i;
     for (i = 0; i < ow_steer_candidate_list_get_length(candidate_list); i++) {
diff --git a/src/lib/ow/src/ow_steer_policy_force_kick_ut.c b/src/lib/ow/src/ow_steer_policy_force_kick_ut.c
index 903b5c88..05e3aa0e 100644
--- a/src/lib/ow/src/ow_steer_policy_force_kick_ut.c
+++ b/src/lib/ow/src/ow_steer_policy_force_kick_ut.c
@@ -178,7 +178,7 @@ OSW_UT(ow_steer_policy_force_kick_successful_ut)
     OSW_UT_EVAL(ow_steer_candidate_get_preference(neighbor_candidate) == OW_STEER_CANDIDATE_PREFERENCE_NONE);
 
     /*
-     * Disonnect STA
+     * Disconnect STA
      */
     force_policy->state_observer.sta_disconnected_fn(&force_policy->state_observer, &g_sta_info_1);
     osw_ut_time_advance(0);
diff --git a/src/lib/ow/src/ow_steer_policy_pre_assoc_ut.c b/src/lib/ow/src/ow_steer_policy_pre_assoc_ut.c
index 69ea536c..973e9948 100644
--- a/src/lib/ow/src/ow_steer_policy_pre_assoc_ut.c
+++ b/src/lib/ow/src/ow_steer_policy_pre_assoc_ut.c
@@ -900,7 +900,7 @@ OSW_UT(ow_steer_policy_pre_assoc_ut_timer_mode_connect_to_blocked)
     OSW_UT_EVAL(ow_steer_candidate_get_preference(candidate_0) == OW_STEER_CANDIDATE_PREFERENCE_SOFT_BLOCKED);
     OSW_UT_EVAL(ow_steer_candidate_get_preference(candidate_1) == OW_STEER_CANDIDATE_PREFERENCE_NONE);
 
-    /* Wait unitl backoff */
+    /* Wait until backoff */
     osw_ut_time_advance(OSW_TIME_SEC(4));
     counter_policy->state_observer.vif_probe_req_fn(&counter_policy->state_observer, &ctx->vif_0, &ctx->probe_req);
     ow_steer_candidate_list_clear(ctx->candidate_list);
@@ -1137,7 +1137,7 @@ OSW_UT(ow_steer_policy_pre_assoc_ut_timer_mode_connect_to_blocked_auth_only)
     OSW_UT_EVAL(mediator_cnt.schedule_recalc_cnt == 1);
     OSW_UT_EVAL(mediator_cnt.dismiss_executor_cnt == 0);
 
-    /* STA send auth to initiate backoff immediatelly period */
+    /* STA send auth to initiate backoff immediately period */
     counter_policy->state_observer.vif_frame_rx_fn(&counter_policy->state_observer,
                                                    &ctx->vif_0,
                                                    (const void *)&ctx->auth_frame,
@@ -1277,7 +1277,7 @@ OSW_UT(ow_steer_policy_pre_assoc_ut_timer_mode_connect_to_blocked_auth_only_bypa
     OSW_UT_EVAL(mediator_cnt.schedule_recalc_cnt == 1);
     OSW_UT_EVAL(mediator_cnt.dismiss_executor_cnt == 0);
 
-    /* STA send auth to initiate backoff immediatelly period */
+    /* STA send auth to initiate backoff immediately period */
     counter_policy->state_observer.vif_frame_rx_fn(&counter_policy->state_observer,
                                                    &ctx->vif_0,
                                                    (const void *)&ctx->auth_frame,
diff --git a/src/lib/ow/src/ow_steer_policy_snr_level.c b/src/lib/ow/src/ow_steer_policy_snr_level.c
index ed4e30a0..dfa0c250 100644
--- a/src/lib/ow/src/ow_steer_policy_snr_level.c
+++ b/src/lib/ow/src/ow_steer_policy_snr_level.c
@@ -735,7 +735,7 @@ ow_steer_policy_snr_level_recalc_cb(struct ow_steer_policy *base,
                 /* This could collide with other policies,
                  * eg. cloud controller client steering
                  * (inbound, kick). At least log the
-                 * occurance.
+                 * occurrence.
                  */
                 LOGI(LOG_WITH_PREFIX(policy, "candidate "OSW_HWADDR_FMT
                                         " is already marked as %s, can't hard block",
diff --git a/src/lib/ow/src/ow_telog.c b/src/lib/ow/src/ow_telog.c
index faa95ed3..59049dc1 100644
--- a/src/lib/ow/src/ow_telog.c
+++ b/src/lib/ow/src/ow_telog.c
@@ -227,7 +227,7 @@ static void ow_telog_vif_free(struct ow_telog *telog, char *vif_name)
 {
     /* When interface is removed from state, there is no need to keep it
      * in the ow_telog->vifs list.
-     * Since conf is based on state, if an interface dissapears
+     * Since conf is based on state, if an interface disappears
      * from state, it should also be removed from conf, so there will
      * be no more subsequent config entries for this interface.
      * Even if the telog_vif was created implicitly on conf_completed,
diff --git a/src/lib/pasync/src/pasync.c b/src/lib/pasync/src/pasync.c
index 45a3abf5..f4a351bd 100644
--- a/src/lib/pasync/src/pasync.c
+++ b/src/lib/pasync/src/pasync.c
@@ -202,7 +202,7 @@ bool pasync_ropen(struct ev_loop *loop,
 /*
  * Open the process, and get its output in callback.
  *
- * The callback will additionaly pass user context data
+ * The callback will additionally pass user context data
  * and cmd exit code.
  */
 bool pasync_ropenx(struct ev_loop *loop,
diff --git a/src/lib/pjs/src/pjs_array.c b/src/lib/pjs/src/pjs_array.c
index 8092f022..4eca8293 100644
--- a/src/lib/pjs/src/pjs_array.c
+++ b/src/lib/pjs/src/pjs_array.c
@@ -620,7 +620,7 @@ bool pjs_string_array_to_json(
  */
 
 /**
- * Optinal Sub ARRAY handler
+ * Optional Sub ARRAY handler
  */
 bool pjs_sub_array_q_from_json(
         pjs_sub_from_json_cb_t *out_cb,
diff --git a/src/lib/policy_tags/src/policy_tag_list.c b/src/lib/policy_tags/src/policy_tag_list.c
index b4e2d75d..2b8dceb9 100644
--- a/src/lib/policy_tags/src/policy_tag_list.c
+++ b/src/lib/policy_tags/src/policy_tag_list.c
@@ -195,7 +195,7 @@ om_tag_list_apply_diff(ds_tree_t *list, om_tag_list_diff_t *diff)
         }
     }
 
-    // Update entires
+    // Update entries
     ds_tree_foreach(&diff->updated, dtle) {
         if ((tle = om_tag_list_entry_find_by_value(list, dtle->value))) {
             tle->flags = dtle->flags;
diff --git a/src/lib/policy_tags/ut/test_schema_tags.c b/src/lib/policy_tags/ut/test_schema_tags.c
index 7cf5571c..d4c75ff0 100644
--- a/src/lib/policy_tags/ut/test_schema_tags.c
+++ b/src/lib/policy_tags/ut/test_schema_tags.c
@@ -310,7 +310,7 @@ void test_val_in_tag_group(void)
 
     /*
      * tag_1 is listed in the tag group for its cloud values,
-     * tag_2 is listed in the tag group for its device vaues,
+     * tag_2 is listed in the tag group for its device values,
      * tag_3 is listed in the tag group for all its values
      */
 
diff --git a/src/lib/procfs/src/procfs.c b/src/lib/procfs/src/procfs.c
index 9de102e3..89296b3c 100644
--- a/src/lib/procfs/src/procfs.c
+++ b/src/lib/procfs/src/procfs.c
@@ -91,7 +91,7 @@ procfs_entry_t *procfs_read(procfs_t *self)
 
         if (!__procfs_entry_getpid(&self->pf_entry, pid))
         {
-            /* XXX: The error below may happen if a PID disappers as we're reading it, silently ignore such cases */
+            /* XXX: The error below may happen if a PID disappears as we're reading it, silently ignore such cases */
             //LOG(ERR, "procfs: Error retrieving entry for pid %jd.", (intmax_t)pid);
             continue;
         }
diff --git a/src/lib/protobuf/cell_info.proto b/src/lib/protobuf/cell_info.proto
index 5ce61006..346d160b 100644
--- a/src/lib/protobuf/cell_info.proto
+++ b/src/lib/protobuf/cell_info.proto
@@ -389,7 +389,7 @@ message CellularInfoReport {
   NetCarrierAggInfo lte_primary_carrier_agg_info = 6; // "Primary" is actually the serving cell
 
   /* Secondary LTE cells */
-  repeated NetCarrierAggInfo lte_secondary_carrier_agg_info = 7; // Currrently up to 4
+  repeated NetCarrierAggInfo lte_secondary_carrier_agg_info = 7; // Currently up to 4
 
   /* PDP context info */
   repeated PdpContextInfo pdp_context = 8; // PDP/PDU
diff --git a/src/lib/psfs/src/psfs.c b/src/lib/psfs/src/psfs.c
index dfccb69a..f11b9da5 100644
--- a/src/lib/psfs/src/psfs.c
+++ b/src/lib/psfs/src/psfs.c
@@ -363,7 +363,7 @@ bool psfs_sync(psfs_t *ps, bool force_prune)
             return false;
         }
         /*
-         * If we're getting short on filesystem space, start prunning more aggresively
+         * If we're getting short on filesystem space, start prunning more aggressively
          */
         else if (fs_avail < (ps->psfs_used * 2) && ps->psfs_wasted > 0)
         {
@@ -1108,7 +1108,7 @@ ssize_t psfs_record_read(int fd, struct psfs_record *pr)
     if ((coff & 0x3) != 0)
     {
         padlen = PSFS_PAD_LEN(coff);
-        /* Align to 4 byets */
+        /* Align to 4 bytes */
         rc = read(fd, &wdata, (size_t)padlen);
         if (rc == 0)
         {
diff --git a/src/lib/read_until/src/read_until.c b/src/lib/read_until/src/read_until.c
index 239016e6..b8f4d251 100644
--- a/src/lib/read_until/src/read_until.c
+++ b/src/lib/read_until/src/read_until.c
@@ -45,7 +45,7 @@ ssize_t read_until(read_until_t *self, char **out, int fd, char *dm)
     {
         self->tail[0] = '\0';
 
-        /* Find first occurence of a delimiter character */
+        /* Find first occurrence of a delimiter character */
         ns = strcspn(self->head, dm);
         if (self->head[ns] != '\0')
         {
diff --git a/src/lib/reboot_flags/ut/test_no_reboot.c b/src/lib/reboot_flags/ut/test_no_reboot.c
index 0d670622..8b4f0ed0 100644
--- a/src/lib/reboot_flags/ut/test_no_reboot.c
+++ b/src/lib/reboot_flags/ut/test_no_reboot.c
@@ -86,7 +86,7 @@ void test_set_two_clear_one()
     TEST_ASSERT_TRUE(!directory_is_empty("/tmp/.no_reboot"));
 }
 
-/* Creates two diffeent files, then deletes all */
+/* Creates two different files, then deletes all */
 void test_set_two_clear_all()
 {
     no_reboot_set("module_ut1");
diff --git a/src/lib/reflink/src/reflink.c b/src/lib/reflink/src/reflink.c
index e40691ff..76816006 100644
--- a/src/lib/reflink/src/reflink.c
+++ b/src/lib/reflink/src/reflink.c
@@ -107,7 +107,7 @@ bool reflink_connect(reflink_t *src, reflink_t *dst)
 }
 
 /*
- * Sever the connection between a and b, decrese the reference count
+ * Sever the connection between a and b, decrease the reference count
  *
  * src will no longer be subscribed to events from dst.
  */
diff --git a/src/lib/revssh/kconfig/Kconfig.libs b/src/lib/revssh/kconfig/Kconfig.libs
index 8b46e8a2..cbda0b00 100644
--- a/src/lib/revssh/kconfig/Kconfig.libs
+++ b/src/lib/revssh/kconfig/Kconfig.libs
@@ -19,16 +19,16 @@ if REVSSH_ENABLED
     help
         Default RevSSH session inactivity/idle timeout.
         In minutes. This configures the default, the value can be
-        overriden by OVSDB config. If a user ssh session is idle
+        overridden by OVSDB config. If a user ssh session is idle
         (inactive) for this amount of time, it is automatically closed.
 
     config REVSSH_DEFAULT_SESSION_MAX_TIME
     int "Default RevSSH session maximum time"
     default 480
     help
-        Default RevSSH session maximum time regardles if active or not.
+        Default RevSSH session maximum time regardless if active or not.
         In minutes. This configures the default, the value can be
-        overriden by OVSDB config. If this time is reached, regardless
+        overridden by OVSDB config. If this time is reached, regardless
         if user session is active or not, the whole RevSSH session is
         destroyed and resources cleaned up.
 
diff --git a/src/lib/rq/inc/rq.h b/src/lib/rq/inc/rq.h
index a6c69c26..0cab95f7 100644
--- a/src/lib/rq/inc/rq.h
+++ b/src/lib/rq/inc/rq.h
@@ -66,7 +66,7 @@ typedef void
 rq_task_cancel_fn_t(struct rq_task *task);
 
 /** Called when task needs to be killed without waiting for
- *  anything. The task will immediatelly be
+ *  anything. The task will immediately be
  *  rq_task_complete() too. Can be either explicitly killed
  *  via rq_task_kill() or when cancel_timeout_msec elapses.
  */
diff --git a/src/lib/rts/src/rts_vm.c b/src/lib/rts/src/rts_vm.c
index 5ebf5f68..0d62679d 100644
--- a/src/lib/rts/src/rts_vm.c
+++ b/src/lib/rts/src/rts_vm.c
@@ -533,7 +533,7 @@ rts_vm_exit(struct rts_vm *vm)
 
     rts_assert(vm->sp == 0 || vm->resume_fun);
 
-    /* The eval stack wasn't clean on exit. Should be a rare occurance
+    /* The eval stack wasn't clean on exit. Should be a rare occurrence
      * but difficult to prevent when binops that rely on memory fail.
      */
     while (vm->sp) {
@@ -887,7 +887,7 @@ eop(struct rts_states *s, unsigned sid, struct rts_trans *t, unsigned *dst, unsi
     /* Unlike next(), eop() must return NULL if there isn't
      * actually a eop transition, otherwise we cannot detect
      * the difference between no-eop and eop-with-code-jump
-     * becuase in both cases, t->dst is 0. */
+     * because in both cases, t->dst is 0. */
     if (!(tid & F_EOP))
         return -1;
 
@@ -1009,7 +1009,7 @@ rts_vm_scan_buffer_forward(struct rts_vm *vm, struct rts_data *data, struct rts_
         if (vm->resume) {
 
             /* The value of @vm->resume is the vm instruction pointer to resume after
-             * the skip is fullfilled; */
+             * the skip is fulfilled; */
             rts_assert(rts_buffer_empty(buffer));
 
         /* Done */
diff --git a/src/lib/schema/schema.py b/src/lib/schema/schema.py
index d4063034..35ea6445 100755
--- a/src/lib/schema/schema.py
+++ b/src/lib/schema/schema.py
@@ -183,7 +183,7 @@ def parse_column_type(obj):
 def parse_column_value(obj):
     if isinstance(obj, dict):
         if not 'type' in obj:
-            print("Object does not contain required 'type' vlaue:", str(obj))
+            print("Object does not contain required 'type' value:", str(obj))
 
         return obj['type']
     else:
diff --git a/src/lib/schema/tools/schema2dot.py b/src/lib/schema/tools/schema2dot.py
index 6415ce13..8839fe19 100755
--- a/src/lib/schema/tools/schema2dot.py
+++ b/src/lib/schema/tools/schema2dot.py
@@ -216,7 +216,7 @@ def parse_column_type(obj):
 def parse_column_value(obj):
     if isinstance(obj, dict):
         if not 'type' in obj:
-            print("Object does not contain required 'type' vlaue:", str(obj))
+            print("Object does not contain required 'type' value:", str(obj))
 
         return obj['type']
     else:
diff --git a/src/lib/stam/README.md b/src/lib/stam/README.md
index 67be562a..bd026e74 100644
--- a/src/lib/stam/README.md
+++ b/src/lib/stam/README.md
@@ -415,7 +415,7 @@ action must be issued.
 digraph {
     ....
 
-    EX_TIMEOUT[label="The TIMEOUT exceptions occurrs after 30 seconds."];
+    EX_TIMEOUT[label="The TIMEOUT exceptions occurs after 30 seconds."];
     EX_TIMEOUT -> EXCEPTION [label="!TIMEOUT"];
     EX_HARD_RESET[label="Forcibly restart the sequence."];
     EX_HARD_RESET -> EXCEPTION [label="!HARD_RESET"];
diff --git a/src/lib/tailf/src/tailf.c b/src/lib/tailf/src/tailf.c
index 0b42932e..06a46903 100644
--- a/src/lib/tailf/src/tailf.c
+++ b/src/lib/tailf/src/tailf.c
@@ -198,7 +198,7 @@ ssize_t tailf_read(tailf_t *self, void *buf, ssize_t bufsz)
             /*   File was rotated, close current file and restart the loop */
             PRIV(tailf_end)(self);
 
-            /*If return on truncate is set, return currenly read bytes from previous file*/
+            /*If return on truncate is set, return currently read bytes from previous file*/
             if(!self->tf_ret_trunc)
             {
                 continue;
diff --git a/src/lib/target/inc/target_common.h b/src/lib/target/inc/target_common.h
index 1ecbbd04..4314b374 100644
--- a/src/lib/target/inc/target_common.h
+++ b/src/lib/target/inc/target_common.h
@@ -228,7 +228,7 @@ struct target_radio_ops {
      *  MHz operation use chan_width_mhz=8080.
      *  When this is not NULL the target implementation shall no
      *  longer perform any implicit CSA between PHYs. It may, but does
-     *  not need to, still perform inheritence of CSA from STA to AP
+     *  not need to, still perform inheritance of CSA from STA to AP
      *  interfaces.
      */
     void (*op_csa_rx)(const char *phy_name,
diff --git a/src/lib/target/ut/target_unit_test.c b/src/lib/target/ut/target_unit_test.c
index f34fd0ee..9084dbb9 100644
--- a/src/lib/target/ut/target_unit_test.c
+++ b/src/lib/target/ut/target_unit_test.c
@@ -233,7 +233,7 @@ void test_target_map_ifname_exists()
     ret = target_map_ifname_exists(if_name);
     test_target_map_init();
     TEST_ASSERT_FALSE_MESSAGE(ret, "Failed, to check existence of if_name, because map is closed");
-    /*Input is correct and map is openned*/
+    /*Input is correct and map is opened*/
     ret = target_map_insert(if_name, map_name);
     TEST_ASSERT_FALSE_MESSAGE(!ret, "Failed, map is not initialized");
     ret = target_map_ifname_exists(if_name);
diff --git a/src/lib/timevt/src/timevt_msg_link.c b/src/lib/timevt/src/timevt_msg_link.c
index ca6e8b33..6051d74e 100644
--- a/src/lib/timevt/src/timevt_msg_link.c
+++ b/src/lib/timevt/src/timevt_msg_link.c
@@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define TECLI_SOCKET_ADDR "@timevt-client"
 #endif
 
-/* Implemntation of the factory of ipc_msg_link_t objects for unix datagram sockets
+/* Implementation of the factory of ipc_msg_link_t objects for unix datagram sockets
  * Objects are specialized for use in time-event logging application */
 
 static ipc_msg_link_t *te_uds_link_open(const char *addr, void *data, int link_id)
@@ -87,7 +87,7 @@ static ipc_msg_link_t *te_uds_link_open(const char *addr, void *data, int link_i
 #define TE_MQ_LINK_FILE "/telog.mq"
 #endif
 
-/* Implemntation of the factory of ipc_msg_link_t objects for unix message queue
+/* Implementation of the factory of ipc_msg_link_t objects for unix message queue
  * Objects are specialized for use in time-event logging application */
 
 static ipc_msg_link_t *te_mq_link_open(const char *addr, void *data, int link_id)
diff --git a/src/lib/unity/src/unity.c b/src/lib/unity/src/unity.c
index a9f8cf1e..402fb8f3 100644
--- a/src/lib/unity/src/unity.c
+++ b/src/lib/unity/src/unity.c
@@ -14,7 +14,7 @@
 #define PROGMEM
 #endif
 
-/* If omitted from header, declare overrideable prototypes here so they're ready for use */
+/* If omitted from header, declare overridable prototypes here so they're ready for use */
 #ifdef UNITY_OMIT_OUTPUT_CHAR_HEADER_DECLARATION
 void UNITY_OUTPUT_CHAR(int);
 #endif
diff --git a/src/lib/ustack/inc/net_header_parse.h b/src/lib/ustack/inc/net_header_parse.h
index f5d6313a..28d1312f 100644
--- a/src/lib/ustack/inc/net_header_parse.h
+++ b/src/lib/ustack/inc/net_header_parse.h
@@ -330,7 +330,7 @@ net_header_log(int log_level, struct net_header_parser *parser);
 
 
 /**
- * @brief logs the network header contetn at LOG_SEVERITY_INFO level
+ * @brief logs the network header content at LOG_SEVERITY_INFO level
  *
  * @param parser the parsed data container
  * @return none
diff --git a/src/lib/ustack/src/net_header_parse.c b/src/lib/ustack/src/net_header_parse.c
index 2b00bb50..a8e8a117 100644
--- a/src/lib/ustack/src/net_header_parse.c
+++ b/src/lib/ustack/src/net_header_parse.c
@@ -401,7 +401,7 @@ bool net_header_ip_str(struct net_header_parser *parser, bool src,
     }
     if (ip == NULL) return false;
 
-    /* Get the source IP as a string for furthe message content lookup */
+    /* Get the source IP as a string for further message content lookup */
     ret = inet_ntop(parser->ip_version == 4 ? AF_INET : AF_INET6,
                     ip, ip_buf, ip_buf_len);
 
diff --git a/src/lib/wc_null_plugin/inc/wc_null_service.h b/src/lib/wc_null_plugin/inc/wc_null_service.h
index 08708c52..774b062b 100644
--- a/src/lib/wc_null_plugin/inc/wc_null_service.h
+++ b/src/lib/wc_null_plugin/inc/wc_null_service.h
@@ -158,7 +158,7 @@ fsm_wc_null_report_cat(struct fsm_session *session,
  * @brief check if a fqdn category matches the policy's category rule
  *
  * @param session the request being processed
- * @param req the policy beig processed
+ * @param req the policy being processed
  * @param policy the policy being checked against
  *
  */
@@ -172,7 +172,7 @@ fsm_wc_null_cat_check(struct fsm_policy_req *req,
  * @brief check if a fqdn risk level matches the policy's category rule
  *
  * @param session the request being processed
- * @param req the policy beig processed
+ * @param req the policy being processed
  * @param policy the policy being checked against
  *
  */
diff --git a/src/lib/wc_null_plugin/src/wc_null_policy.c b/src/lib/wc_null_plugin/src/wc_null_policy.c
index 3b23968e..64f376ab 100644
--- a/src/lib/wc_null_plugin/src/wc_null_policy.c
+++ b/src/lib/wc_null_plugin/src/wc_null_policy.c
@@ -76,7 +76,7 @@ fsm_wc_null_init(struct fsm_session *session)
  * @brief check if a fqdn category matches the policy's category rule
  *
  * @param session the request being processed
- * @param req the policy beig processed
+ * @param req the policy being processed
  * @param policy the policy being checked against
  *
  */
@@ -93,7 +93,7 @@ fsm_wc_null_cat_check(struct fsm_policy_req *req,
  * @brief check if a fqdn risk level matches the policy's category rule
  *
  * @param session the request being processed
- * @param req the policy beig processed
+ * @param req the policy being processed
  * @param policy the policy being checked against
  *
  */
diff --git a/src/lib/we/vm.c b/src/lib/we/vm.c
index d80fc9b5..588ef2c8 100644
--- a/src/lib/we/vm.c
+++ b/src/lib/we/vm.c
@@ -972,7 +972,7 @@ static int we_op_res(struct we_arr **arr, void *arg)
  *
  * An extension should return 0 to continue execution of the program. Positive
  * return values are treated as the posix errno. These errors will be
- * propogated to the host program.
+ * propagated to the host program.
  */
 static int (*we_ext[256])(struct we_arr *, void *) = {};
 
diff --git a/src/nfm/src/nfm_ipset.c b/src/nfm/src/nfm_ipset.c
index 50dfa6c3..eda4ccba 100644
--- a/src/nfm/src/nfm_ipset.c
+++ b/src/nfm/src/nfm_ipset.c
@@ -439,7 +439,7 @@ bool nfm_ipset_objm_json_parse(struct nfm_ipset *ips, json_t *jvalues)
 
     if (!nfm_ipset_type_from_str(&type, stype))
     {
-        LOG(DEBUG, "nfm_ipset: %s: Unkown IPSET type: %s (from json).",
+        LOG(DEBUG, "nfm_ipset: %s: Unknown IPSET type: %s (from json).",
                 ips->ni_name, stype);
         return false;
     }
diff --git a/src/nfm/src/nfm_osfw.c b/src/nfm/src/nfm_osfw.c
index 4eecd7b0..abc477cb 100644
--- a/src/nfm/src/nfm_osfw.c
+++ b/src/nfm/src/nfm_osfw.c
@@ -175,7 +175,7 @@ static void nfm_osfw_hook_schedule(osfw_hook_target_t target)
     ds_list_t *list;
 
     /*
-     * When NFM starts, it clears all previous rules in the sytem.
+     * When NFM starts, it clears all previous rules in the system.
      * At that time rules cache is empty (there is no specific rule addition/removal
      * caused by Netfilter or Openflow_Tag callback) so there is no MAC to flush.
      */
@@ -269,7 +269,7 @@ bool nfm_osfw_fini(void)
 
 	errcode = osfw_fini();
 	if (!errcode) {
-		LOGE("Finilize the OpenSync firewall API failed");
+		LOGE("Finalize the OpenSync firewall API failed");
 		return false;
 	}
 
@@ -285,7 +285,7 @@ bool nfm_osfw_eb_fini(void)
 
 	errcode = osfw_eb_fini();
 	if (!errcode) {
-		LOGE("Finilize the OpenSync firewall API failed");
+		LOGE("Finalize the OpenSync firewall API failed");
 		return false;
 	}
 
diff --git a/src/nm2/kconfig/Kconfig.managers b/src/nm2/kconfig/Kconfig.managers
index ccbf254c..b9e98b04 100644
--- a/src/nm2/kconfig/Kconfig.managers
+++ b/src/nm2/kconfig/Kconfig.managers
@@ -28,7 +28,7 @@ menuconfig MANAGER_NM
             value, calculate the metric value by using the interface type and the
             the value of this option.
 
-            A metric modifier is calcualted from the interface type in this
+            A metric modifier is calculated from the interface type in this
             order of priority:
                 - bridge, eth, vlan
                 - gre
@@ -38,7 +38,7 @@ menuconfig MANAGER_NM
                 - LTE
                 - Everything else
 
-            The metric is then calculated by adding the modifer to the
+            The metric is then calculated by adding the modifier to the
             MANAGER_NM_ROUTE_BASE_METRIC value.
 
             This ensures proper WAN priority across different interface types.
diff --git a/src/nm2/src/nm2_4in6_map.c b/src/nm2/src/nm2_4in6_map.c
index ba9c3702..4f2a3877 100644
--- a/src/nm2/src/nm2_4in6_map.c
+++ b/src/nm2/src/nm2_4in6_map.c
@@ -1882,7 +1882,7 @@ static const char *util_v6plus_hgw_status_to_str(osn_map_v6plus_hgw_status_t hgw
 
 /*
  * HGW status change action handler: To be called when the actual HGW status change is determined
- * to take apropriate actions: restart MAP configuration to reconfigure according to the
+ * to take appropriate actions: restart MAP configuration to reconfigure according to the
  * new HGW status.
  */
 static void nm2_mapcfg_v6plus_hgw_status_change_action(struct nm2_mapcfg *mapcfg)
diff --git a/src/nm2/src/nm2_dhcp_lease.c b/src/nm2/src/nm2_dhcp_lease.c
index 088d08a1..4b509d2c 100644
--- a/src/nm2/src/nm2_dhcp_lease.c
+++ b/src/nm2/src/nm2_dhcp_lease.c
@@ -144,7 +144,7 @@ void *osn_dhcp_server_lease_sync(synclist_t *sync, void *_old, void *_new)
     }
 
     /*
-     * Comapre hostname, vendorclass and fingerprint, issue an update if they
+     * Compare hostname, vendorclass and fingerprint, issue an update if they
      * differ
      */
     if (pold->dl_updated)
@@ -167,7 +167,7 @@ static synclist_t dhcp_lease_synclist = SYNCLIST_INIT(
         dl_snode,
         osn_dhcp_server_lease_sync);
 /*
- * Hijack the nm2_dhcp_lease_notify funciton to handle unique macs properly.
+ * Hijack the nm2_dhcp_lease_notify function to handle unique macs properly.
  */
 bool nm2_dhcp_lease_notify(
         void *data,
@@ -298,7 +298,7 @@ bool nm2_dhcp_lease_notify(
 
     if (!nm2_dhcp_table_update(&sdl))
     {
-        LOG(WARN, "dhcp_lease: Error processing DCHP lease entry "PRI_osn_mac_addr" ("PRI_osn_ip_addr"), %s)",
+        LOG(WARN, "dhcp_lease: Error processing DHCP lease entry "PRI_osn_mac_addr" ("PRI_osn_ip_addr"), %s)",
                 FMT_osn_mac_addr(dl->dl_hwaddr),
                 FMT_osn_ip_addr(dl->dl_ipaddr),
                 dl->dl_hostname);
diff --git a/src/nm2/src/nm2_fqdn.c b/src/nm2/src/nm2_fqdn.c
index 7a5c6425..e77cd187 100644
--- a/src/nm2/src/nm2_fqdn.c
+++ b/src/nm2/src/nm2_fqdn.c
@@ -160,7 +160,7 @@ fqdn_entry_t *nm2_fqdn_entry_new(struct schema_FQDN_Resolve *rec)
     if (rec->interval_exists)
     {
         // interval defined: override ttl value,
-        // inverval 0 means never update
+        // interval 0 means never update
         e->interval = rec->interval;
     }
     else
@@ -584,7 +584,7 @@ bool nm2_fqdn_update_active_entry(fqdn_entry_t *e, double *delay)
             // resolve error, check schedule for retry
             goto L_check_schedule;
         default:
-            LOGW("%s unexpeted state %d '%s'", __func__, e->state, e->fqdn);
+            LOGW("%s unexpected state %d '%s'", __func__, e->state, e->fqdn);
     }
     return true;
 
diff --git a/src/nm2/src/nm2_nb_interface.c b/src/nm2/src/nm2_nb_interface.c
index 6d711983..a7b54fc8 100644
--- a/src/nm2/src/nm2_nb_interface.c
+++ b/src/nm2/src/nm2_nb_interface.c
@@ -222,7 +222,7 @@ void nm2_if_update_netif_obj(struct nm2_interface *intf, char *if_name)
         return;
     }
 
-    /* register for notifing us when interface config changes */
+    /* register for notifying us when interface config changes */
     osn_netif_status_notify(intf->if_netif, nm2_if_netif_status_fn);
 }
 
diff --git a/src/nm2/src/nm2_nb_port.c b/src/nm2/src/nm2_nb_port.c
index 77eaa054..a7d81432 100644
--- a/src/nm2/src/nm2_nb_port.c
+++ b/src/nm2/src/nm2_nb_port.c
@@ -338,7 +338,7 @@ void nm2_inet_bridge_config_reapply(struct nm2_iface *pif)
     struct nm2_port *port;
 
     TRACE();
-    /* If the interface is found in Ports table, that means Bridge update is recevied,
+    /* If the interface is found in Ports table, that means Bridge update is received,
      * before being added Wifi_inet table.  So it needs to be configured */
     port = nm2_port_get_by_name(pif->if_name);
     if (port == NULL) return;
diff --git a/src/nm2/src/nm2_portfw.c b/src/nm2/src/nm2_portfw.c
index 8ed44a9c..127e671d 100644
--- a/src/nm2/src/nm2_portfw.c
+++ b/src/nm2/src/nm2_portfw.c
@@ -86,7 +86,7 @@ bool nm2_portfw_init(void)
 }
 
 /*
- * OVSDB monitoring functon for the IP_Port_Forward table
+ * OVSDB monitoring function for the IP_Port_Forward table
  */
 void nm2_portfw_monitor_fn(ovsdb_update_monitor_t *self)
 {
diff --git a/src/nm2/src/nm2_route.c b/src/nm2/src/nm2_route.c
index 915babae..007939f6 100644
--- a/src/nm2/src/nm2_route.c
+++ b/src/nm2/src/nm2_route.c
@@ -98,7 +98,7 @@ void nm2_route_update(struct schema_Wifi_Route_State *rts)
      *
      * An update or delete with where by cached _uuid. Alternatively we could
      * do a where by columns that determine equal routes (dest_addr, dest_mask,
-     * gateway, interface, routing table), however in the schema 'table' columnn
+     * gateway, interface, routing table), however in the schema 'table' column
      * is optional and due to a bug (or limitation) in OVSDB implementation
      * ["table", "==", ["set", []]] condition does not match.
      */
diff --git a/src/nm2/src/nm2_route6.c b/src/nm2/src/nm2_route6.c
index 8898a949..ad35c05d 100644
--- a/src/nm2/src/nm2_route6.c
+++ b/src/nm2/src/nm2_route6.c
@@ -101,7 +101,7 @@ void nm2_route6_update(struct schema_Wifi_Route6_State *rts)
      *
      * An update or delete with where by cached _uuid. Alternatively we could
      * do a where by columns that determine equal routes (dest_addr, dest_mask,
-     * gateway, interface, routing table), however in the schema 'table' columnn
+     * gateway, interface, routing table), however in the schema 'table' column
      * is optional and due to a bug (or limitation) in OVSDB implementation
      * ["table", "==", ["set", []]] condition does not match.
      */
diff --git a/src/nm2/src/nm2_route_rule.c b/src/nm2/src/nm2_route_rule.c
index f09bd7df..0e5323d6 100644
--- a/src/nm2/src/nm2_route_rule.c
+++ b/src/nm2/src/nm2_route_rule.c
@@ -185,7 +185,7 @@ static bool nm2_route_rule_remove(struct nm2_route_rule_cfg *nm2_rrule_cfg)
 
     if (rv)
     {
-        /* Not really neccessary as this rule config will be removed
+        /* Not really necessary as this rule config will be removed
          * from our cache anyway, but set the flag for consistency: */
         nm2_rrule_cfg->nr_enabled = false;
     }
diff --git a/src/nm2/ut/test_nm2_native_bridge.c b/src/nm2/ut/test_nm2_native_bridge.c
index 6d202aec..83614afd 100644
--- a/src/nm2/ut/test_nm2_native_bridge.c
+++ b/src/nm2/ut/test_nm2_native_bridge.c
@@ -313,7 +313,7 @@ void test_bridge_port_first(void)
     TEST_ASSERT_NOT_NULL(br);
 
     /* Modify Bridge port uuid_port_1 is removed */
-    LOGT("%s(): modifing bridge port", __func__);
+    LOGT("%s(): modifying bridge port", __func__);
     g_mon.mon_type = OVSDB_UPDATE_MODIFY;
     callback_Bridge(&g_mon, &br_schema[0], &modify_br);
 
@@ -381,7 +381,7 @@ void test_bridge_port_second(void)
     TEST_ASSERT_NOT_NULL(port);
 
     /* Modify Bridge port uuid_port_1 is removed */
-    LOGT("%s(): modifing bridge port", __func__);
+    LOGT("%s(): modifying bridge port", __func__);
     g_mon.mon_type = OVSDB_UPDATE_MODIFY;
     callback_Bridge(&g_mon, &br_schema[0], &modify_br);
 
@@ -448,7 +448,7 @@ void test_interface_table(void)
     TEST_ASSERT_NOT_NULL(port);
 
     /* Modify Port both the interfaces are removed.*/
-    LOGT("%s(): modifing bridge port", __func__);
+    LOGT("%s(): modifying bridge port", __func__);
     g_mon.mon_type = OVSDB_UPDATE_MODIFY;
     callback_Port(&g_mon, &port_schema[0], &modify_port);
 
@@ -540,7 +540,7 @@ void test_wifi_inet_table(void)
     ev_wait1(NULL, 10.0);
 
     /* Modify Bridge port uuid_port_1 is removed */
-    LOGT("%s(): modifing bridge port", __func__);
+    LOGT("%s(): modifying bridge port", __func__);
     g_mon.mon_type = OVSDB_UPDATE_MODIFY;
     callback_Bridge(&g_mon, &br_schema[0], &modify_br);
 
diff --git a/src/pkim/src/pkim_cert.c b/src/pkim/src/pkim_cert.c
index 2c41c27e..3f063ce7 100644
--- a/src/pkim/src/pkim_cert.c
+++ b/src/pkim/src/pkim_cert.c
@@ -270,7 +270,7 @@ enum pkim_cert_state pkim_cert_state_EST_RESET(pkim_cert_state_t *state, enum pk
 
     if (!pkim_cert_timeout(self, pkim_cert_do_TIMEOUT, (double)PKIM_CERT_EST_TIMEOUT))
     {
-        LOG(ERR, "pkim: %s: Error initializing timout handler.", self->pc_label);
+        LOG(ERR, "pkim: %s: Error initializing timeout handler.", self->pc_label);
         return pkim_cert_EST_RETRY;
     }
 
@@ -278,7 +278,7 @@ enum pkim_cert_state pkim_cert_state_EST_RESET(pkim_cert_state_t *state, enum pk
 }
 
 /*
- * Fetch certificate authority and move to EST_ENROLL if successfull. Otherwise
+ * Fetch certificate authority and move to EST_ENROLL if successful. Otherwise
  * move to EST_RETRY.
  */
 enum pkim_cert_state pkim_cert_state_EST_CACERTS(pkim_cert_state_t *state, enum pkim_cert_action action, void *data)
@@ -352,7 +352,7 @@ enum pkim_cert_state pkim_cert_state_EST_ENROLL(pkim_cert_state_t *state, enum p
             return pkim_cert_EST_DONE;
 
         case pkim_cert_do_EST_ERROR:
-            LOG(ERR, "pkim: %s: EST request error ocurred on server: %s", self->pc_label, self->pc_est_server);
+            LOG(ERR, "pkim: %s: EST request error occurred on server: %s", self->pc_label, self->pc_est_server);
             pkim_ovsdb_status_set(self->pc_label, "error_enroll");
             break;
 
@@ -443,7 +443,7 @@ enum pkim_cert_state pkim_cert_state_EST_RETRY(pkim_cert_state_t *state, enum pk
 
             if (!pkim_cert_timeout(self, pkim_cert_do_TIMEOUT, retry_timeout))
             {
-                LOG(ERR, "pkim: %s: Error initializing timout handler.", self->pc_label);
+                LOG(ERR, "pkim: %s: Error initializing timeout handler.", self->pc_label);
                 break;
             }
 
@@ -698,7 +698,7 @@ char *pkim_cert_get_subject(arena_t *arena)
 
     if (subj == NULL)
     {
-        LOG(ERR, "est_util: Error allocating subject stirng.");
+        LOG(ERR, "est_util: Error allocating subject string.");
         return NULL;
     }
 
@@ -794,7 +794,7 @@ uint32_t pkim_cert_get_stable_random(struct pkim_cert *self)
 
     /*
      * Concatenate the bootid and the certificate label and calculate a FNV-1a
-     * hash. This should yield a pesudo random number that stays stable across
+     * hash. This should yield a pseudo random number that stays stable across
      * reboots and is unique for each certificate.
      */
     char *hstr = arena_sprintf(scratch, "%s.%s", self->pc_label, buf);
diff --git a/src/pm/kconfig/Kconfig.managers b/src/pm/kconfig/Kconfig.managers
index f25df1f7..062b5878 100644
--- a/src/pm/kconfig/Kconfig.managers
+++ b/src/pm/kconfig/Kconfig.managers
@@ -31,7 +31,7 @@ if MANAGER_PM
             Enable or disable acceleration.
 
     config PM_ENABLE_FF_OVSDB_PS
-        bool "Enable support for feature flags persitent storage to be updated by OVSDB"
+        bool "Enable support for feature flags persistent storage to be updated by OVSDB"
         default y
         help
            Monitor OVSDB for changes in feature flags and reflect them in persistent storage
@@ -120,7 +120,7 @@ if MANAGER_PM
                 default n
                 help
                     Thermal states table(which is usually compiled into the Platform
-                    Manager) can be overriden by writing the fields into Node_Config
+                    Manager) can be overridden by writing the fields into Node_Config
                     OVSDB table. This option disables the ability to override the
                     default configuration values.
 
@@ -132,14 +132,14 @@ if MANAGER_PM
 
                 if PM_ENABLE_FAN_DUTY_CYCLE
                     config PM_TM_FAN_DUTY_CYCLE_ON_PERIOD
-                        int "Fan duty cyle on period"
+                        int "Fan duty cycle on period"
                         default 270
                         help
                             The amount of seconds the fan should be turned on in a state when
                             duty cycling for that state is enabled.
 
                     config PM_TM_FAN_DUTY_CYCLE_OFF_PERIOD
-                        int "Fan duty cyle off period"
+                        int "Fan duty cycle off period"
                         default 240
                         help
                             The amount of seconds the fan should be turned off in a state when
diff --git a/src/pm/src/pm_gw_offline_cfg.c b/src/pm/src/pm_gw_offline_cfg.c
index 31695b75..32a37099 100644
--- a/src/pm/src/pm_gw_offline_cfg.c
+++ b/src/pm/src/pm_gw_offline_cfg.c
@@ -824,7 +824,7 @@ static void callback_Node_Config(
 
             if (gw_offline_stat == status_active)
             {
-                /* If active gw_offline mode successfuly entered, enable
+                /* If active gw_offline mode successfully entered, enable
                  * eth clients handling:  */
                 gw_offline_enable_eth_clients_handling();
 
@@ -941,7 +941,7 @@ static bool gw_offline_cfg_set_radio_if_names(struct gw_offline_cfg *cfg)
         const char *radio_if_name = find_radio_if_name_for_vif_with_uuid(cfg, vif_str_uuid);
         if (radio_if_name == NULL)
         {
-            /* A valid VIF that is up should have a correspoinding radio that
+            /* A valid VIF that is up should have a corresponding radio that
              * is referencing that VIF with uuiid, so issue at least a warning. */
             LOG(WARN, "offline_cfg: NOT FOUND radio if_name for VIF with uuid=%s", vif_str_uuid);
             return false;
diff --git a/src/pm/src/pm_hw_acc.c b/src/pm/src/pm_hw_acc.c
index d33c4231..e3bf4390 100644
--- a/src/pm/src/pm_hw_acc.c
+++ b/src/pm/src/pm_hw_acc.c
@@ -368,7 +368,7 @@ pm_hw_acc_ovsdb_enable_set(ovsdb_update_monitor_t *mon, const char *value)
 
     /* FIXME: It is unclear to me what to do here. This
      * is adapting prior iteration of the code that
-     * automatically implied peristence reporting only
+     * automatically implied persistence reporting only
      * in the status with nothing to respect the Config
      * input.
      *
diff --git a/src/pm/src/pm_hw_acc_load.h b/src/pm/src/pm_hw_acc_load.h
index 2e53b65f..819f1ba3 100644
--- a/src/pm/src/pm_hw_acc_load.h
+++ b/src/pm/src/pm_hw_acc_load.h
@@ -39,7 +39,7 @@ enum pm_hw_acc_load_mode
 
     /* The system had reached a level of activity high
      * enough and is not considered busy. The suggestion is
-     * to keep the accelerato _enabled_ while in this state.
+     * to keep the acceleration _enabled_ while in this state.
      */
     PM_HW_ACC_LOAD_ACTIVE,
 
diff --git a/src/pm/src/pm_objm.c b/src/pm/src/pm_objm.c
index 5efd3c12..8e364360 100644
--- a/src/pm/src/pm_objm.c
+++ b/src/pm/src/pm_objm.c
@@ -536,7 +536,7 @@ static bool install(struct pm_objm_ctx_t *d_ctx)
     {
         if (!oms_ps_save_last_downloaded_version(&s_entry))
         {
-            LOGE("%s: failed to save last downlaod", __func__);
+            LOGE("%s: failed to save last download", __func__);
         }
     }
 
@@ -777,7 +777,7 @@ static void callback_Object_Store_Config(ovsdb_update_monitor_t *mon,
     {
         case OVSDB_UPDATE_NEW:
             // If dl_url is empty assume loading object info from
-            // persistance storage (at boot), no action needed.
+            // persistence storage (at boot), no action needed.
             if (strcmp(new->dl_url, "") == 0)
             {
                 break;
@@ -861,7 +861,7 @@ static void oms_state_cb(struct oms_state_entry *entry, int event)
 
     if (strncmp(entry->state, PM_OBJS_ACTIVE, strlen(PM_OBJS_ACTIVE)) == 0)
     {
-        // Save last active version to persistant storage
+        // Save last active version to persistent storage
         oms_ps_save_last_active_version(entry);
     }
 
diff --git a/src/pm/src/pm_tm_ovsdb.c b/src/pm/src/pm_tm_ovsdb.c
index 60ce2d69..a1690093 100644
--- a/src/pm/src/pm_tm_ovsdb.c
+++ b/src/pm/src/pm_tm_ovsdb.c
@@ -147,7 +147,7 @@ int pm_tm_ovsdb_thermtbl_get_radio_temp(unsigned int state, unsigned int radio_i
     struct schema_Node_Config *node_config;
     char key[TM_OVSDBG_MAX_KEY_LEN];
 
-    /* If Node_Config overrride is disabled, return */
+    /* If Node_Config override is disabled, return */
     if (kconfig_enabled(CONFIG_PM_TM_DISABLE_NODE_CONFIG_OVERRIDE))  return -1;
 
     snprintf(key, TM_OVSDBG_MAX_KEY_LEN, "%s_%s%d_%s%d_%s",
@@ -172,7 +172,7 @@ int pm_tm_ovsdb_thermtbl_get_radio_txchainmask(unsigned int state, unsigned int
     struct schema_Node_Config *node_config;
     char key[TM_OVSDBG_MAX_KEY_LEN];
 
-    /* If Node_Config overrride is disabled, return */
+    /* If Node_Config override is disabled, return */
     if (kconfig_enabled(CONFIG_PM_TM_DISABLE_NODE_CONFIG_OVERRIDE))  return -1;
 
     snprintf(key, sizeof(key), "%s_%s%d_%s%d_%s",
@@ -197,7 +197,7 @@ int pm_tm_ovsdb_thermtbl_get_fan_rpm(unsigned int state, unsigned int *rpm)
     struct schema_Node_Config *node_config;
     char key[TM_OVSDBG_MAX_KEY_LEN];
 
-    /* If Node_Config overrride is disabled, return */
+    /* If Node_Config override is disabled, return */
     if (kconfig_enabled(CONFIG_PM_TM_DISABLE_NODE_CONFIG_OVERRIDE))  return -1;
 
     snprintf(key, sizeof(key), "%s_%s%d_%s",
diff --git a/src/psm/src/psm.h b/src/psm/src/psm.h
index eb0c2d8b..6aee93ef 100644
--- a/src/psm/src/psm.h
+++ b/src/psm/src/psm.h
@@ -38,9 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define PSM_DEBOUNCE_TIME_MAX       3.0
 /*
  * The first debounce interval must way larger in order to absorb in all OVS
- * changes without cuasing too much rewrites of the current persistent data.
+ * changes without causing too much rewrites of the current persistent data.
  * This is the factor that PSM_DEBOUNCE_TIME and PSM_DEBOUNCE_TIME_MAX are
- * multiplied to caclulate the initial timers.
+ * multiplied to calculate the initial timers.
  */
 #define PSM_DEBOUNCE_INIT_FACTOR    10.0
 
diff --git a/src/psm/src/psm_ovsdb_row.c b/src/psm/src/psm_ovsdb_row.c
index d764138a..0d00bc51 100644
--- a/src/psm/src/psm_ovsdb_row.c
+++ b/src/psm/src/psm_ovsdb_row.c
@@ -47,7 +47,7 @@ struct psm_ovsdb_row_key
 
 /*
  * The in memory representation of a single row. Each row has an associated key
- * (which is calulated from the data).
+ * (which is calculated from the data).
  *
  * The pr_uuid field is valid only when there's an associated table in OVSDB. A
  * row with an empty UUID is considered "orphaned" -- scheduled for deletion.
@@ -126,7 +126,7 @@ bool psm_ovsdb_row_init(void)
  *      - compare key values, if they are the same return
  *      - orphan the current entry (unset uuid) so a sync operation will remove
  *        it from persistent storage and memory
- *  - if os_presist is false, return now
+ *  - if os_persist is false, return now
  *  - lookup by key and if a row with the same key is found:
  *      - if the row uuid is empty (orphaned entry), assign the uuid to this
  *        row and return
@@ -212,7 +212,7 @@ bool psm_ovsdb_row_update(const char *table, json_t *row)
         {
             /*
              * Same uuid and same key -- in theory this should never happen.
-             * In the future we can skip a resync operation and exit immediatelly.
+             * In the future we can skip a resync operation and exit immediately.
              */
             LOG(NOTICE, "Identical row update with uuid: %s", uuid.uuid);
         }
@@ -698,7 +698,7 @@ json_t *psm_ovsdb_row_filter(const char *table, json_t *row)
 }
 
 /*
- * Exctract the uuid from the row data
+ * Extract the uuid from the row data
  */
 bool psm_ovsdb_row_uuid_get(ovs_uuid_t *uuid, json_t *row)
 {
diff --git a/src/psm/src/psm_ovsdb_schema.c b/src/psm/src/psm_ovsdb_schema.c
index c27e7116..6d24ab89 100644
--- a/src/psm/src/psm_ovsdb_schema.c
+++ b/src/psm/src/psm_ovsdb_schema.c
@@ -108,7 +108,7 @@ bool psm_ovsdb_schema_init(bool monitor)
 }
 
 /*
- * Return true wheter table:column exists in the schema definition
+ * Return true whether table:column exists in the schema definition
  */
 bool psm_ovsdb_schema_column_exists(const char *table, const char *column)
 {
@@ -125,7 +125,7 @@ bool psm_ovsdb_schema_column_exists(const char *table, const char *column)
 }
 
 /*
- * Return true wheter table:column is an ephemeral column
+ * Return true whether table:column is an ephemeral column
  *
  * This function returns false if the column doesn't exist
  */
diff --git a/src/qm/src/qm_ovsdb.c b/src/qm/src/qm_ovsdb.c
index de9dbd04..15073d70 100644
--- a/src/qm/src/qm_ovsdb.c
+++ b/src/qm/src/qm_ovsdb.c
@@ -112,7 +112,7 @@ void callback_AWLAN_Node(ovsdb_update_monitor_t *mon,
             }
             else
             {
-                LOG(ERR, "Unkown MQTT option: %s", key);
+                LOG(ERR, "Unknown MQTT option: %s", key);
             }
         }
     }
diff --git a/src/qosm/inc/qosm_filter_internal.h b/src/qosm/inc/qosm_filter_internal.h
index 04eb0aaa..5a99d586 100644
--- a/src/qosm/inc/qosm_filter_internal.h
+++ b/src/qosm/inc/qosm_filter_internal.h
@@ -64,7 +64,7 @@ struct qosm_intf_classifier
 {
     ovs_uuid_t ic_uuid;           /* UUID of this object */
     reflink_t ic_reflink;         /* Reflink of this object */
-    struct qosm_ip_iface *parent; /* backpointer reference to nmb_ip_iface struc */
+    struct qosm_ip_iface *parent; /* backpointer reference to nmb_ip_iface struct */
     char *ic_token;               /* token name */
     char *ic_match;               /* match to be applied to TC */
     char *ic_action;              /* action parameter required for TC command */
diff --git a/src/qosm/inc/qosm_internal.h b/src/qosm/inc/qosm_internal.h
index 4e408c94..36bc3b52 100644
--- a/src/qosm/inc/qosm_internal.h
+++ b/src/qosm/inc/qosm_internal.h
@@ -137,7 +137,7 @@ struct qosm_linux_queue
 
     char                que_params[256];            /**  qdisc-specific parameters */
 
-    bool                que_applied;                /**< Successfully aplied? */
+    bool                que_applied;                /**< Successfully applied? */
 
     ds_tree_node_t      que_tnode;                  /**< Tree node */
 
diff --git a/src/qosm/src/qosm_ip_iface.c b/src/qosm/src/qosm_ip_iface.c
index 2007422e..b38194f7 100644
--- a/src/qosm/src/qosm_ip_iface.c
+++ b/src/qosm/src/qosm_ip_iface.c
@@ -142,7 +142,7 @@ qosm_os_tc_commit(osn_tc_t *ipi_tc, struct qosm_intf_classifier *ic, bool ingres
     ret |= osn_tc_filter_end(ipi_tc);
 
 done:
-    LOGT("%s(): commiting TC configuration for %s %s",
+    LOGT("%s(): committing TC configuration for %s %s",
          __func__, ic->ic_token,
          (ret != 0 ? "success" : "failed"));
 
diff --git a/src/sm/kconfig/Kconfig.managers b/src/sm/kconfig/Kconfig.managers
index c006f7b7..4a672979 100644
--- a/src/sm/kconfig/Kconfig.managers
+++ b/src/sm/kconfig/Kconfig.managers
@@ -32,7 +32,7 @@ menuconfig MANAGER_SM
                 It does nothing. Just satisfying build time and
                 linking mechanics.
 
-                This isn't all that useful except for developent and
+                This isn't all that useful except for development and
                 testing of core logic that ingests configuration and
                 to check plumbing.
 
diff --git a/src/sm/src/sm.h b/src/sm/src/sm.h
index 090c388d..9246fc28 100644
--- a/src/sm/src/sm.h
+++ b/src/sm/src/sm.h
@@ -348,7 +348,7 @@ unsigned int sm_radius_collect_data (const char *vif_name);
 sm_radius_stats_t* sm_radius_new_stats_object (const char *vifname);
 
 /* If data is successfully obtained it shall the implementation shall call
- * sm_radius_add_stats_object, if failure occurrs after new stats object was
+ * sm_radius_add_stats_object, if failure occurs after new stats object was
  * acquired, it shall call sm_radius_del_stats_object, passing the received
  * stats object pointer to any of the two.
  */
diff --git a/src/sm/src/sm_lat_sys_epping.c b/src/sm/src/sm_lat_sys_epping.c
index 9aac03b5..bdbcbf9a 100644
--- a/src/sm/src/sm_lat_sys_epping.c
+++ b/src/sm/src/sm_lat_sys_epping.c
@@ -345,7 +345,7 @@ static void sm_lat_sys_ifname_retry_cb(EV_P_ ev_timer *arg, int events)
 
 static void sm_lat_sys_ifname_kill_cb(EV_P_ ev_timer *arg, int events)
 {
-    /* If SIGTERM and child_cb were succesful we don't enter here due to ev_timer_stop() */
+    /* If SIGTERM and child_cb were successful we don't enter here due to ev_timer_stop() */
     struct sm_lat_sys_ifname *sif = CONTAINER_OF(arg, struct sm_lat_sys_ifname, kill);
 
     /* SIGTERM worked and child_cb() is pending */
@@ -539,7 +539,7 @@ static int sm_lat_sys_ifname_buf_read(struct sm_lat_sys_ifname *sif, int fd)
     /* Read chunk of data from process pipe
      * if failed there are 2 scenarios:
      * - process is already dead, stopping it makes no harm
-     * - other error occured; if service is enabled, stop will initiate process restart
+     * - other error occurred; if service is enabled, stop will initiate process restart
      */
     n = read(fd, chunk, sizeof(chunk));
     if (n <= 0)
diff --git a/src/sm/src/sm_ovsdb.c b/src/sm/src/sm_ovsdb.c
index 7ae8bfbe..5df82caf 100644
--- a/src/sm/src/sm_ovsdb.c
+++ b/src/sm/src/sm_ovsdb.c
@@ -228,7 +228,7 @@ void sm_update_awlan_node_cbk(ovsdb_update_monitor_t *self)
         }
         else
         {
-            LOG(ERR, "Unkown MQTT option: %s", key);
+            LOG(ERR, "Unknown MQTT option: %s", key);
         }
     }
 
@@ -297,7 +297,7 @@ bool sm_enumerate_stats_config(sm_stats_config_t *stats)
         stats->radio_type = RADIO_TYPE_NONE;
     }
 
-    /* All reprots are raw by default */
+    /* All reports are raw by default */
     stats->report_type = REPORT_TYPE_RAW;
     if (strcmp(schema->report_type, "average") == 0) {
         stats->report_type = REPORT_TYPE_AVERAGE;
@@ -666,7 +666,7 @@ void sm_radio_cfg_update(void)
         }
         else {
             LOG(DEBUG,
-                "Radio Config: Unkown protocol: %s",
+                "Radio Config: Unknown protocol: %s",
                 radio->schema.hw_mode);
             radio_cfg.protocol = RADIO_802_11_AUTO;
         }
diff --git a/src/tools/ovsh/src/ovsh.c b/src/tools/ovsh/src/ovsh.c
index b22aa22e..46327bcf 100644
--- a/src/tools/ovsh/src/ovsh.c
+++ b/src/tools/ovsh/src/ovsh.c
@@ -1952,7 +1952,7 @@ bool ovsdb_json_show_result_output(json_t *jrows, json_t *columns)
 
         if (systemvp("printf", argv) != 0)
         {
-            fprintf(stderr, "Exernal command failed: printf");
+            fprintf(stderr, "External command failed: printf");
             return false;
         }
     }
diff --git a/src/tools/pwdmask/src/pwdmask.c b/src/tools/pwdmask/src/pwdmask.c
index 2b4a8af3..e826267f 100644
--- a/src/tools/pwdmask/src/pwdmask.c
+++ b/src/tools/pwdmask/src/pwdmask.c
@@ -178,7 +178,7 @@ static void print_usage(void)
     fprintf(stderr, 
          "Pwdmask password masking utility\n"
          "This tool is used to fetch Passwords from the OVSDB tables\n"
-         "and masks every occurence of password inside of provided files.\n"
+         "and masks every occurrence of password inside of provided files.\n"
          "If file is a symlink, it gets replaced by masked\n"
          "copy of the file symlink was pointing to.\n"
          "Usage: pwdmask [-h] [-o OBFUSCSTR] [--] <FILE>...\n"
diff --git a/src/tpsm/src/tpsm_st_iperf.c b/src/tpsm/src/tpsm_st_iperf.c
index 41a28579..05f6233e 100644
--- a/src/tpsm/src/tpsm_st_iperf.c
+++ b/src/tpsm/src/tpsm_st_iperf.c
@@ -101,7 +101,7 @@ static bool iperf_parse_json(json_t *js_root, struct st_context *st_ctx)
     json_t *js_sec;
     json_t *js_bw;
 
-    /* If "error" key present in json, an error occured, log the error string: */
+    /* If "error" key present in json, an error occurred, log the error string: */
     const char *str_error = NULL;
     if (json_unpack(js_root, "{s:s}", "error", &str_error) == 0)
     {
diff --git a/src/vpnm/src/vpnm_ipsec.c b/src/vpnm/src/vpnm_ipsec.c
index 252a6298..cbac8b4b 100644
--- a/src/vpnm/src/vpnm_ipsec.c
+++ b/src/vpnm/src/vpnm_ipsec.c
@@ -644,7 +644,7 @@ static bool vpnm_ipsec_config_set(
         }
         else
         {
-            LOG(WARN, "vpnm_ipsec: Invalid mark value specified: %d. Setting ingored.", new->mark);
+            LOG(WARN, "vpnm_ipsec: Invalid mark value specified: %d. Setting ignored.", new->mark);
         }
     }
     else
diff --git a/src/wano/kconfig/Kconfig.managers b/src/wano/kconfig/Kconfig.managers
index fc54a820..7f7937d8 100644
--- a/src/wano/kconfig/Kconfig.managers
+++ b/src/wano/kconfig/Kconfig.managers
@@ -37,7 +37,7 @@ if MANAGER_WANO
             This is the amount of time that the pipeline is allowed to do an
             immediate restart without using a backoff timer. After the amount of
             seconds defined in this variable, the pipeline will sleep for an
-            increasing amout of time before restarting plug-ins.
+            increasing amount of time before restarting plug-ins.
 
     config MANAGER_WANO_PLUGIN_DHCPV4
         bool "WANO IPv4 DHCP plugin"
@@ -70,7 +70,7 @@ if MANAGER_WANO
         default y
         help
             WANO pppoe plug-in for interface configuration via the pppoe
-            protocol. Configuration is read from persistant storage.
+            protocol. Configuration is read from persistent storage.
 
     config MANAGER_WANO_PLUGIN_VLAN
         bool "WANO VLAN plugin"
diff --git a/src/wano/src/wano_main.c b/src/wano/src/wano_main.c
index c583d4b6..d0b69fc3 100644
--- a/src/wano/src/wano_main.c
+++ b/src/wano/src/wano_main.c
@@ -127,7 +127,7 @@ void wano_start_builtin_ifaces(void)
     /*
      * ii != wano_builtin_len if, for some reason, some pipelines failed to
      * initialize where ii contains the number of successfully initialized
-     * pipeliens
+     * pipelines
      */
     wano_builtin_len = ii;
 }
diff --git a/src/wano/src/wano_ppline.c b/src/wano/src/wano_ppline.c
index 24e382c4..1d9306f1 100644
--- a/src/wano/src/wano_ppline.c
+++ b/src/wano/src/wano_ppline.c
@@ -395,7 +395,7 @@ void wano_ppline_plugin_reset(wano_ppline_t *self, bool force)
  * Find all plug-ins that are eligible for running and schedule them.
  *
  * The function below finds all plug-ins in the PENDING state that do not
- * conflict with any currrently running plug-in (by checking the run-mask)
+ * conflict with any currently running plug-in (by checking the run-mask)
  * and schedules them.
  *
  * Note that plug-ins that are in the SCHEDULED state are not started yet.
diff --git a/src/wano/src/wano_wan.c b/src/wano/src/wano_wan.c
index 36447990..78d7d2b8 100644
--- a/src/wano/src/wano_wan.c
+++ b/src/wano/src/wano_wan.c
@@ -326,7 +326,7 @@ void wano_wan_status_set(
 }
 
 /*
- * Udpate the status of the WAN type `type` with priority `priority`
+ * Update the status of the WAN type `type` with priority `priority`
  */
 bool wano_wan_status_update(enum wano_wan_config_type type, int64_t priority)
 {
diff --git a/src/wano/src/wanp_dhcpv6.c b/src/wano/src/wanp_dhcpv6.c
index a6f2bd7b..1ae243e3 100644
--- a/src/wano/src/wanp_dhcpv6.c
+++ b/src/wano/src/wanp_dhcpv6.c
@@ -328,7 +328,7 @@ bool wanp_dhcpv6_ovsdb_enable(struct wanp_dhcpv6 *self)
 }
 
 /* Enable IP unnumbered option: In this case, the WAN DHPCv6 plugin could succeed even if no
- * global IPv6 address (recived and assigned) on the interface, but a route-able prefix was
+ * global IPv6 address (received and assigned) on the interface, but a route-able prefix was
  * received and a global IPv6 address from the prefix was assigned to the LAN interface.
  *
  * To enable that we need an IP_Interface row for the LAN interface to get LAN interface IPv6
diff --git a/src/wano/src/wanp_ethclient.c b/src/wano/src/wanp_ethclient.c
index 2559c220..93056b33 100644
--- a/src/wano/src/wanp_ethclient.c
+++ b/src/wano/src/wanp_ethclient.c
@@ -569,7 +569,7 @@ void wanp_ethclient_handle_detected(struct wanp_ethclient *self)
      * Due to packet injection, the client might be incorrectly shown as being
      * connected to one of the parent nodes instead of the current one.
      *
-     * This happens becuase the DHCP packet is re-injected with the the FLOOD
+     * This happens because the DHCP packet is re-injected with the the FLOOD
      * action, which bypasses the FDB. This also means that the FDB database
      * (and consequentially the OVS_MAC_Learning table) is not updated until
      * the client actually sends a real packet.
@@ -710,7 +710,7 @@ void wanp_ethclient_dhcp_timeout(struct ev_loop *loop, ev_timer *ev, int revent)
  */
 
 /*
- * Schedule packet for re-inejction; currently there can be only one packet
+ * Schedule packet for re-injection; currently there can be only one packet
  * scheduled per interface. If there's a packet already scheduled, overwrite it
  * with the most recent packet.
  *
diff --git a/src/wano/src/wanp_static_ipv4.c b/src/wano/src/wanp_static_ipv4.c
index 1bd74000..17b0e528 100644
--- a/src/wano/src/wanp_static_ipv4.c
+++ b/src/wano/src/wanp_static_ipv4.c
@@ -467,7 +467,7 @@ void wanp_static_ipv4_run(wano_plugin_handle_t *wh)
     wanp_static_ipv4_handle_t *wsh = CONTAINER_OF(wh, wanp_static_ipv4_handle_t, handle);
 
     /*
-     * Load static configration
+     * Load static configuration
      */
     wsh->have_config = wano_wan_config_get(
                 wano_wan_from_plugin_handle(wh),
diff --git a/src/wpd/kconfig/Kconfig b/src/wpd/kconfig/Kconfig
index 1ab7b021..ca3fdbf3 100644
--- a/src/wpd/kconfig/Kconfig
+++ b/src/wpd/kconfig/Kconfig
@@ -31,7 +31,7 @@ menuconfig WPD_ENABLED
             int "Watchdog timeout"
             default 30
             help
-                WPD will setup watchdog device to trigger a harware reset after
+                WPD will setup watchdog device to trigger a hardware reset after
                 this number of seconds, if WPD crashes and stops pinging the
                 device.