diff --git a/rules/decoder-events.rules b/rules/decoder-events.rules
index 19ae61d6c4..61a316fbd8 100644
--- a/rules/decoder-events.rules
+++ b/rules/decoder-events.rules
@@ -23,7 +23,7 @@ alert pkthdr any any -> any any (msg:"SURICATA IPv6 duplicated Hop-By-Hop Option
 alert pkthdr any any -> any any (msg:"SURICATA IPv6 duplicated Destination Options extension header"; decode-event:ipv6.exthdr_dupl_dh; classtype:protocol-command-decode; sid:2200018; rev:2;)
 alert pkthdr any any -> any any (msg:"SURICATA IPv6 duplicated Authentication Header extension header"; decode-event:ipv6.exthdr_dupl_ah; classtype:protocol-command-decode; sid:2200019; rev:2;)
 alert pkthdr any any -> any any (msg:"SURICATA IPv6 duplicate ESP extension header"; decode-event:ipv6.exthdr_dupl_eh; classtype:protocol-command-decode; sid:2200020; rev:2;)
-alert pkthdr any any -> any any (msg:"SURICATA IPv6 invalid option lenght in header"; decode-event:ipv6.exthdr_invalid_optlen; classtype:protocol-command-decode; sid:2200021; rev:2;)
+alert pkthdr any any -> any any (msg:"SURICATA IPv6 invalid option length in header"; decode-event:ipv6.exthdr_invalid_optlen; classtype:protocol-command-decode; sid:2200021; rev:3;)
 alert pkthdr any any -> any any (msg:"SURICATA IPv6 wrong IP version"; decode-event:ipv6.wrong_ip_version; classtype:protocol-command-decode; sid:2200022; rev:2;)
 # RFC 4302 states the reserved field should be 0.
 alert pkthdr any any -> any any (msg:"SURICATA IPv6 AH reserved field not 0"; decode-event:ipv6.exthdr_ah_res_not_null; classtype:protocol-command-decode; sid:2200081; rev:2;)
diff --git a/rust/src/smb/nbss_records.rs b/rust/src/smb/nbss_records.rs
index e63862cdcb..894896ce44 100644
--- a/rust/src/smb/nbss_records.rs
+++ b/rust/src/smb/nbss_records.rs
@@ -191,7 +191,7 @@ mod tests {
         let buff:&[u8] = &[
         /* message type */  0x00,
         /* length */        0x00, 0x00, 0x29,
-        /* data < lenght*/  0xff, 0x53, 0x4d, 0x42, 0x04, 0x00, 0x00, 0x00,
+        /* data < length*/  0xff, 0x53, 0x4d, 0x42, 0x04, 0x00, 0x00, 0x00,
                             0x00, 0x18, 0x43, 0xc8, 0x00, 0x00, 0x00, 0x00,
                             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                             0x02, 0x08, 0xbd, 0x20, 0x02, 0x08, 0x06, 0x00,
diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c
index 265756ad7e..41855f61b5 100644
--- a/src/app-layer-ssl.c
+++ b/src/app-layer-ssl.c
@@ -2022,7 +2022,7 @@ static int SSLv2Decode(uint8_t direction, SSLState *ssl_state,
         return -1;
     }
 
-    /* record_lenghts_length should never be zero */
+    /* record_lengths_length should never be zero */
     if (ssl_state->curr_connp->record_lengths_length == 0) {
         SCLogDebug("SSLv2 record lengths length is zero");
         SSLSetEvent(ssl_state, TLS_DECODER_EVENT_INVALID_SSLV2_HEADER);
diff --git a/src/decode.c b/src/decode.c
index 96b21b7df2..4c2a6fccd3 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -376,7 +376,7 @@ Packet *PacketDefragPktSetup(Packet *parent, const uint8_t *pkt, uint32_t len, u
     else
         p->root = parent;
 
-    /* copy packet and set lenght, proto */
+    /* copy packet and set length, proto */
     if (pkt && len) {
         PacketCopyData(p, pkt, len);
     }
diff --git a/src/tests/detect-engine-content-inspection.c b/src/tests/detect-engine-content-inspection.c
index ead4d34c07..aea1c95c9d 100644
--- a/src/tests/detect-engine-content-inspection.c
+++ b/src/tests/detect-engine-content-inspection.c
@@ -219,7 +219,7 @@ static int DetectEngineContentInspectionTest09(void) {
 /** \test mix in byte_extract */
 static int DetectEngineContentInspectionTest10(void) {
     TEST_HEADER;
-    /* extract first byte as lenght field and check with isdataat */
+    /* extract first byte as length field and check with isdataat */
     TEST_RUN("9abcdefghi", 10, "byte_extract:1,0,data_size,string; isdataat:data_size;", true, 2);
     TEST_RUN("9abcdefgh", 9, "byte_extract:1,0,data_size,string; isdataat:!data_size;", true, 2);
     /* anchor len field to pattern 'x' to test recursion */
diff --git a/src/util-print.c b/src/util-print.c
index 1f772a267d..cd1da1db7f 100644
--- a/src/util-print.c
+++ b/src/util-print.c
@@ -54,7 +54,7 @@ void PrintBufferRawLineHex(char *nbuf, int *offset, int max_size, const uint8_t
  *  Prints in the format "00 AA BB"
  *
  *  \param retbuf pointer to the buffer which will have the result
- *  \param rebuflen lenght of the buffer
+ *  \param rebuflen length of the buffer
  *  \param buf buffer to print from
  *  \param buflen length of the input buffer
  */