diff --git a/drivers/include/net/netdev/ieee802154.h b/drivers/include/net/netdev/ieee802154.h
index 7af8c5dd90..e1a0b4b608 100644
--- a/drivers/include/net/netdev/ieee802154.h
+++ b/drivers/include/net/netdev/ieee802154.h
@@ -119,7 +119,7 @@ typedef struct {
     uint8_t page;                           /**< channel page */
     uint16_t flags;                         /**< flags as defined above */
     int16_t txpower;                        /**< tx power in dBm */
-#if IS_USED(MODULE_IEEE802154_SECURITY) || defined (Doxygen)
+#if IS_USED(MODULE_IEEE802154_SECURITY) || defined(DOXYGEN)
     ieee802154_sec_context_t sec_ctx;       /**< security context */
 #endif
     /** @} */
diff --git a/sys/include/net/ieee802154_security.h b/sys/include/net/ieee802154_security.h
index 58ca1327c3..04dc4863ac 100644
--- a/sys/include/net/ieee802154_security.h
+++ b/sys/include/net/ieee802154_security.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Otto-von-Gericke-Universität Magdeburg
+ * Copyright (C) 2020 Otto-von-Guericke-Universität Magdeburg
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -34,7 +34,7 @@ extern "C" {
 #endif
 
 /**
- * @brief   Forward declaration of an IEEE802.15.4 abstract security device
+ * @brief   Forward declaration of an IEEE 802.15.4 abstract security device
  */
 typedef struct ieee802154_sec_dev ieee802154_sec_dev_t;
 
@@ -88,7 +88,7 @@ typedef struct ieee802154_radio_cipher_ops {
 } ieee802154_radio_cipher_ops_t;
 
 /**
- * @brief IEEE802.15.4 security device descriptor
+ * @brief IEEE 802.15.4 security device descriptor
  */
 struct ieee802154_sec_dev {
     /**
@@ -206,7 +206,7 @@ typedef enum {
  * |                |             |                  | short source address               |
  * |                |             |                  | of the originator of the frame.    |
  * +----------------+-------------+------------------+------------------------------------+
- * | HX_INDEX       | 8 bytes     | 1 byte           | The key can be determined          |
+ * | HW_INDEX       | 8 bytes     | 1 byte           | The key can be determined          |
  * |                |             |                  | from the key index and             |
  * |                |             |                  | the long address of the originator |
  * |                |             |                  | of the frame.                      |
@@ -217,7 +217,7 @@ typedef enum {
     IEEE802154_SCF_KEYMODE_INDEX                = 0x01, /**< Key is determined from key index */
     IEEE802154_SCF_KEYMODE_SHORT_INDEX          = 0x02, /**< Key is determined from 4 byte key source and key index */
     IEEE802154_SCF_KEYMODE_HW_INDEX             = 0x03  /**< Key is determined from 8 byte key source and key index */
-} ieee802154_scr_keymode_t;
+} ieee802154_scf_keymode_t;
 
 /**
  * @brief   IEEE 802.15.4 security error codes
@@ -376,7 +376,7 @@ typedef struct __attribute__((packed)) {
 /**
  * @brief   Initialize IEEE 802.15.4 security context with default values
  *
- * @param[out]      ctx                     security context
+ * @param[out]      ctx                     IEEE 802.15.4 security context
  */
 void ieee802154_sec_init(ieee802154_sec_context_t *ctx);
 
diff --git a/sys/net/link_layer/ieee802154/security.c b/sys/net/link_layer/ieee802154/security.c
index 40a63e874b..482210a08a 100644
--- a/sys/net/link_layer/ieee802154/security.c
+++ b/sys/net/link_layer/ieee802154/security.c
@@ -221,9 +221,9 @@ static uint8_t _set_aux_hdr(const ieee802154_sec_context_t *ctx,
  * @brief   Construct the first block A0 for CTR
  */
 static inline void _init_ctr_A0(ieee802154_ccm_block_t *A0,
-                               uint32_t frame_counter,
-                               uint8_t security_level,
-                               const uint8_t *src_address)
+                                uint32_t frame_counter,
+                                uint8_t security_level,
+                                const uint8_t *src_address)
 {
     A0->flags = _ccm_flag(0, 2);
     A0->nonce.frame_counter = htonl(frame_counter);
@@ -244,11 +244,11 @@ static inline void _advance_ctr_Ai(ieee802154_ccm_block_t *Ai)
  * @brief   Construct the first block B0 for CBC-MAC
  */
 static inline void _init_cbc_B0(ieee802154_ccm_block_t *B0,
-                               uint32_t frame_counter,
-                               uint8_t security_level,
-                               uint16_t m_len,
-                               uint8_t mic_size,
-                               const uint8_t *src_address)
+                                uint32_t frame_counter,
+                                uint8_t security_level,
+                                uint16_t m_len,
+                                uint8_t mic_size,
+                                const uint8_t *src_address)
 {
     B0->flags = _ccm_flag(mic_size, 2);
     B0->nonce.frame_counter = htonl(frame_counter),