Index: uspace/srv/net/inetsrv/icmpv6.c
===================================================================
--- uspace/srv/net/inetsrv/icmpv6.c	(revision 956d42816cbf5fd14e6440905bfa3626ab82a05b)
+++ uspace/srv/net/inetsrv/icmpv6.c	(revision a940f1dcf5626a006fa01e20dc0acc32434f7b83)
@@ -84,5 +84,5 @@
 	rdgram.size = size;
 	
-	icmpv6_pseudo_header phdr;
+	icmpv6_phdr_t phdr;
 	
 	host2addr128_t_be(dest_v6, phdr.src_addr);
@@ -94,5 +94,5 @@
 	uint16_t cs_phdr =
 	    inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
-	    sizeof(icmpv6_pseudo_header));
+	    sizeof(icmpv6_phdr_t));
 	
 	uint16_t cs_all = inet_checksum_calc(cs_phdr, reply, size);
@@ -186,5 +186,5 @@
 	dgram.size = rsize;
 	
-	icmpv6_pseudo_header phdr;
+	icmpv6_phdr_t phdr;
 	
 	host2addr128_t_be(sdu->src, phdr.src_addr);
@@ -196,5 +196,5 @@
 	uint16_t cs_phdr =
 	    inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
-	    sizeof(icmpv6_pseudo_header));
+	    sizeof(icmpv6_phdr_t));
 	
 	uint16_t cs_all = inet_checksum_calc(cs_phdr, rdata, rsize);
Index: uspace/srv/net/inetsrv/icmpv6_std.h
===================================================================
--- uspace/srv/net/inetsrv/icmpv6_std.h	(revision 956d42816cbf5fd14e6440905bfa3626ab82a05b)
+++ uspace/srv/net/inetsrv/icmpv6_std.h	(revision a940f1dcf5626a006fa01e20dc0acc32434f7b83)
@@ -104,5 +104,5 @@
 	/** Next header */
 	uint8_t next;
-} icmpv6_pseudo_header;
+} icmpv6_phdr_t;
 
 /** NDP neighbour body */
Index: uspace/srv/net/inetsrv/ndp.h
===================================================================
--- uspace/srv/net/inetsrv/ndp.h	(revision 956d42816cbf5fd14e6440905bfa3626ab82a05b)
+++ uspace/srv/net/inetsrv/ndp.h	(revision a940f1dcf5626a006fa01e20dc0acc32434f7b83)
@@ -35,6 +35,6 @@
  */
 
-#ifndef ETH_NDP_H_
-#define ETH_NDP_H_
+#ifndef NDP_H_
+#define NDP_H_
 
 #include <sys/types.h>
Index: uspace/srv/net/inetsrv/pdu.c
===================================================================
--- uspace/srv/net/inetsrv/pdu.c	(revision 956d42816cbf5fd14e6440905bfa3626ab82a05b)
+++ uspace/srv/net/inetsrv/pdu.c	(revision a940f1dcf5626a006fa01e20dc0acc32434f7b83)
@@ -464,5 +464,5 @@
 	addr48(ndp->sender_hw_addr, message->mac);
 	
-	icmpv6_pseudo_header phdr;
+	icmpv6_phdr_t phdr;
 	
 	host2addr128_t_be(ndp->sender_proto_addr, phdr.src_addr);
@@ -474,5 +474,5 @@
 	uint16_t cs_phdr =
 	    inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
-	    sizeof(icmpv6_pseudo_header));
+	    sizeof(icmpv6_phdr_t));
 	
 	uint16_t cs_all = inet_checksum_calc(cs_phdr, dgram->data,
Index: uspace/srv/net/tcp/pdu.c
===================================================================
--- uspace/srv/net/tcp/pdu.c	(revision 956d42816cbf5fd14e6440905bfa3626ab82a05b)
+++ uspace/srv/net/tcp/pdu.c	(revision a940f1dcf5626a006fa01e20dc0acc32434f7b83)
@@ -172,5 +172,5 @@
 		phdr6->tcp_length =
 		    host2uint32_t_be(pdu->header_size + pdu->text_size);
-		memset(phdr6->zero, 0, 3);
+		memset(phdr6->zeroes, 0, 3);
 		phdr6->next = IP_PROTO_TCP;
 		break;
Index: uspace/srv/net/tcp/std.h
===================================================================
--- uspace/srv/net/tcp/std.h	(revision 956d42816cbf5fd14e6440905bfa3626ab82a05b)
+++ uspace/srv/net/tcp/std.h	(revision a940f1dcf5626a006fa01e20dc0acc32434f7b83)
@@ -75,5 +75,5 @@
 };
 
-/** TCP IPv4 pseudo header */
+/** TCP over IPv4 checksum pseudo header */
 typedef struct {
 	/** Source address */
@@ -89,5 +89,5 @@
 } tcp_phdr_t;
 
-/** TCP IPv6 pseudo header */
+/** TCP over IPv6 checksum pseudo header */
 typedef struct {
 	/** Source address */
@@ -98,5 +98,5 @@
 	uint32_t tcp_length;
 	/** Zeroes */
-	uint8_t zero[3];
+	uint8_t zeroes[3];
 	/** Next header */
 	uint8_t next;
Index: uspace/srv/net/udp/pdu.c
===================================================================
--- uspace/srv/net/udp/pdu.c	(revision 956d42816cbf5fd14e6440905bfa3626ab82a05b)
+++ uspace/srv/net/udp/pdu.c	(revision a940f1dcf5626a006fa01e20dc0acc32434f7b83)
@@ -110,5 +110,5 @@
 		host2addr128_t_be(dest_v6, phdr6->dest_addr);
 		phdr6->udp_length = host2uint32_t_be(pdu->data_size);
-		memset(phdr6->zero, 0, 3);
+		memset(phdr6->zeroes, 0, 3);
 		phdr6->next = IP_PROTO_UDP;
 		break;
Index: uspace/srv/net/udp/std.h
===================================================================
--- uspace/srv/net/udp/std.h	(revision 956d42816cbf5fd14e6440905bfa3626ab82a05b)
+++ uspace/srv/net/udp/std.h	(revision a940f1dcf5626a006fa01e20dc0acc32434f7b83)
@@ -54,5 +54,5 @@
 } udp_header_t;
 
-/** UDP IPv4 pseudo header */
+/** UDP over IPv4 checksum pseudo header */
 typedef struct {
 	/** Source address */
@@ -68,5 +68,5 @@
 } udp_phdr_t;
 
-/** UDP IPv6 pseudo header */
+/** UDP over IPv6 checksum pseudo header */
 typedef struct {
 	/** Source address */
@@ -76,6 +76,6 @@
 	/** UDP length */
 	uint32_t udp_length;
-	/** Reserved */
-	uint8_t zero[3];
+	/** Zeroes */
+	uint8_t zeroes[3];
 	/** Next header */
 	uint8_t next;