diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index 40ffa64602..d5729c8596 100644
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -387,7 +387,7 @@ static TmEcode LogDnsLogThreadInit(ThreadVars *t, const void *initdata, void **d
         goto error_exit;
     }
 
-    /* Use the Ouptut Context (file pointer and mutex) */
+    /* Use the Output Context (file pointer and mutex) */
     aft->dnslog_ctx = ((OutputCtx *)initdata)->data;
     aft->ctx = CreateEveThreadCtx(t, aft->dnslog_ctx->eve_ctx);
     if (!aft->ctx) {
diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index 962358ab61..4e6048b533 100644
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -200,7 +200,7 @@ static TmEcode JsonDropLogThreadInit(ThreadVars *t, const void *initdata, void *
         goto error_exit;
     }
 
-    /** Use the Ouptut Context (file pointer and mutex) */
+    /** Use the Output Context (file pointer and mutex) */
     aft->drop_ctx = ((OutputCtx *)initdata)->data;
     aft->ctx = CreateEveThreadCtx(t, aft->drop_ctx->eve_ctx);
     if (!aft->ctx) {
diff --git a/src/output-json-email-common.c b/src/output-json-email-common.c
index cb21a85e7d..31d8557585 100644
--- a/src/output-json-email-common.c
+++ b/src/output-json-email-common.c
@@ -285,9 +285,9 @@ static bool EveEmailLogJsonData(const Flow *f, void *state, void *vtx, uint64_t
         }
 
         entity = (MimeDecEntity *)mime_state->stack->top->data;
-        int attch_cnt = 0;
+        int attach_cnt = 0;
         int url_cnt = 0;
-        JsonBuilder *js_attch = jb_new_array();
+        JsonBuilder *js_attach = jb_new_array();
         JsonBuilder *js_url = jb_new_array();
         if (entity->url_list != NULL) {
             MimeDecUrl *url;
@@ -318,9 +318,9 @@ static bool EveEmailLogJsonData(const Flow *f, void *state, void *vtx, uint64_t
 
                 char *s = BytesToString((uint8_t *)entity->filename,
                                         (size_t)entity->filename_len);
-                jb_append_string(js_attch, s);
+                jb_append_string(js_attach, s);
                 SCFree(s);
-                attch_cnt += 1;
+                attach_cnt += 1;
             }
             if (entity->url_list != NULL) {
                 MimeDecUrl *url;
@@ -335,11 +335,11 @@ static bool EveEmailLogJsonData(const Flow *f, void *state, void *vtx, uint64_t
                 }
             }
         }
-        if (attch_cnt > 0) {
-            jb_close(js_attch);
-            jb_set_object(sjs, "attachment", js_attch);
+        if (attach_cnt > 0) {
+            jb_close(js_attach);
+            jb_set_object(sjs, "attachment", js_attach);
         }
-        jb_free(js_attch);
+        jb_free(js_attach);
         if (url_cnt > 0) {
             jb_close(js_url);
             jb_set_object(sjs, "url", js_url);
diff --git a/src/output-json-file.c b/src/output-json-file.c
index 2f23ac1785..540e1be001 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -243,7 +243,7 @@ static TmEcode JsonFileLogThreadInit(ThreadVars *t, const void *initdata, void *
         goto error_exit;
     }
 
-    /* Use the Ouptut Context (file pointer and mutex) */
+    /* Use the Output Context (file pointer and mutex) */
     aft->filelog_ctx = ((OutputCtx *)initdata)->data;
     aft->ctx = CreateEveThreadCtx(t, aft->filelog_ctx->eve_ctx);
     if (!aft->ctx) {
diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index 29d96839a5..de9dbdb4ec 100644
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -20,7 +20,7 @@
  *
  * \author Victor Julien <victor@inliniac.net>
  *
- * Implements Unidirectiontal NetFlow JSON logging portion of the engine.
+ * Implements Unidirectional NetFlow JSON logging portion of the engine.
  */
 
 #include "suricata-common.h"