diff --git a/doc/code_structure.doxygen b/doc/code_structure.doxygen
index 3a3b21b72..927ea4e85 100644
--- a/doc/code_structure.doxygen
+++ b/doc/code_structure.doxygen
@@ -62,7 +62,7 @@ with with hostapd. The following C files are currently used:
 	Definitions shared by multiple files
 
 \ref l2_packet.h, \ref l2_packet_linux.c, and \ref l2_packet_pcap.c
-	Layer 2 (link) access wrapper (includes native Linux implementation
+	Layer 2 (link) access wrapper (includes Linux packet socket
 	and wrappers for libdnet/libpcap). A new l2_packet implementation
 	may need to be added when porting to new operating systems that are
 	not supported by libdnet/libpcap. Makefile can be used to select which
diff --git a/doc/p2p.doxygen b/doc/p2p.doxygen
index d4d86e3ed..6ab6e9e05 100644
--- a/doc/p2p.doxygen
+++ b/doc/p2p.doxygen
@@ -274,8 +274,8 @@ for removing the group interface for the failed group.
 P2P protocol includes service discovery functionality that can be used
 to discover which services are provided by the peers before forming a
 group. This leverages the Generic Advertisement Service (GAS) protocol
-from IEEE 802.11u and P2P vendor-specific contents inside the Native
-GAS messages.
+from IEEE 802.11u and P2P vendor-specific contents inside the GAS
+messages.
 
 The P2P module takes care of GAS encapsulation, fragmentation, and
 actual transmission and reception of the Action frames needed for
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index a06a93b22..5ca82457a 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -1864,7 +1864,8 @@ ChangeLog for wpa_supplicant
 	  generate, e.g., man pages
 	* l2_packet_linux: use socket type SOCK_DGRAM instead of SOCK_RAW for
 	  PF_PACKET in order to prepare for network devices that do not use
-	  Ethernet headers (e.g., network stack with native IEEE 802.11 frames)
+	  Ethernet headers (e.g., network stack that includes IEEE 802.11
+	  header in the frames)
 	* use receipt of EAPOL-Key frame as a lower layer success indication
 	  for EAP state machine to allow recovery from dropped EAP-Success
 	  frame