diff --git a/depends.d b/depends.d
index 6813251..8e50536 100644
--- a/depends.d
+++ b/depends.d
@@ -1,5 +1,5 @@
 src/arp.o: src/arp.cpp include/arp.h include/pdu.h include/endianness.h \
- include/hwaddress.h include/ipaddress.h include/ip.h \
+ include/hw_address.h include/ip_address.h include/ip.h \
  include/small_uint.h include/pdu_option.h include/ethernetII.h \
  include/network_interface.h include/rawpdu.h include/constants.h \
  include/network_interface.h
@@ -10,9 +10,9 @@ include/pdu.h:
 
 include/endianness.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/ip.h:
 
@@ -30,7 +30,7 @@ include/constants.h:
 
 include/network_interface.h:
 src/bootp.o: src/bootp.cpp include/bootp.h include/pdu.h \
- include/endianness.h include/ipaddress.h include/hwaddress.h
+ include/endianness.h include/ip_address.h include/hw_address.h
 
 include/bootp.h:
 
@@ -38,13 +38,13 @@ include/pdu.h:
 
 include/endianness.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 src/dhcp.o: src/dhcp.cpp include/endianness.h include/dhcp.h \
- include/bootp.h include/pdu.h include/endianness.h include/ipaddress.h \
- include/hwaddress.h include/ethernetII.h include/network_interface.h \
- include/ipaddress.h
+ include/bootp.h include/pdu.h include/endianness.h include/ip_address.h \
+ include/hw_address.h include/pdu_option.h include/ethernetII.h \
+ include/network_interface.h
 
 include/endianness.h:
 
@@ -56,17 +56,17 @@ include/pdu.h:
 
 include/endianness.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
-include/hwaddress.h:
+include/hw_address.h:
+
+include/pdu_option.h:
 
 include/ethernetII.h:
 
 include/network_interface.h:
-
-include/ipaddress.h:
 src/dns.o: src/dns.cpp include/dns.h include/pdu.h include/endianness.h \
- include/ipaddress.h
+ include/ip_address.h
 
 include/dns.h:
 
@@ -74,12 +74,12 @@ include/pdu.h:
 
 include/endianness.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 src/dot11.o: src/dot11.cpp include/dot11.h include/pdu.h \
- include/endianness.h include/hwaddress.h include/small_uint.h \
- include/network_interface.h include/ipaddress.h include/rawpdu.h \
- include/radiotap.h include/rsn_information.h include/packet_sender.h \
- include/snap.h
+ include/endianness.h include/hw_address.h include/small_uint.h \
+ include/pdu_option.h include/network_interface.h include/ip_address.h \
+ include/rawpdu.h include/radiotap.h include/rsn_information.h \
+ include/packet_sender.h include/snap.h
 
 include/dot11.h:
 
@@ -87,13 +87,15 @@ include/pdu.h:
 
 include/endianness.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
 include/small_uint.h:
 
+include/pdu_option.h:
+
 include/network_interface.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/rawpdu.h:
 
@@ -106,8 +108,8 @@ include/packet_sender.h:
 include/snap.h:
 src/eapol.o: src/eapol.cpp include/eapol.h include/pdu.h \
  include/small_uint.h include/endianness.h include/dot11.h \
- include/hwaddress.h include/network_interface.h include/ipaddress.h \
- include/rsn_information.h
+ include/hw_address.h include/pdu_option.h include/network_interface.h \
+ include/ip_address.h include/rsn_information.h
 
 include/eapol.h:
 
@@ -119,16 +121,18 @@ include/endianness.h:
 
 include/dot11.h:
 
-include/hwaddress.h:
+include/hw_address.h:
+
+include/pdu_option.h:
 
 include/network_interface.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/rsn_information.h:
 src/ethernetII.o: src/ethernetII.cpp include/ethernetII.h include/pdu.h \
- include/endianness.h include/hwaddress.h include/network_interface.h \
- include/ipaddress.h include/packet_sender.h include/rawpdu.h \
+ include/endianness.h include/hw_address.h include/network_interface.h \
+ include/ip_address.h include/packet_sender.h include/rawpdu.h \
  include/ip.h include/small_uint.h include/pdu_option.h include/arp.h
 
 include/ethernetII.h:
@@ -137,11 +141,11 @@ include/pdu.h:
 
 include/endianness.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
 include/network_interface.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/packet_sender.h:
 
@@ -156,7 +160,7 @@ include/pdu_option.h:
 include/arp.h:
 src/icmp.o: src/icmp.cpp include/icmp.h include/pdu.h \
  include/endianness.h include/rawpdu.h include/utils.h \
- include/ipaddress.h include/hwaddress.h
+ include/ip_address.h include/hw_address.h
 
 include/icmp.h:
 
@@ -168,12 +172,12 @@ include/rawpdu.h:
 
 include/utils.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 src/ieee802_3.o: src/ieee802_3.cpp include/ieee802_3.h include/pdu.h \
- include/endianness.h include/hwaddress.h include/network_interface.h \
- include/ipaddress.h include/packet_sender.h include/llc.h
+ include/endianness.h include/hw_address.h include/network_interface.h \
+ include/ip_address.h include/packet_sender.h include/llc.h
 
 include/ieee802_3.h:
 
@@ -181,25 +185,25 @@ include/pdu.h:
 
 include/endianness.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
 include/network_interface.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/packet_sender.h:
 
 include/llc.h:
-src/ipaddress.o: src/ipaddress.cpp include/ipaddress.h \
+src/ip_address.o: src/ip_address.cpp include/ip_address.h \
  include/endianness.h
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/endianness.h:
 src/ip.o: src/ip.cpp include/ip.h include/pdu.h include/small_uint.h \
- include/endianness.h include/ipaddress.h include/pdu_option.h \
+ include/endianness.h include/ip_address.h include/pdu_option.h \
  include/tcp.h include/udp.h include/icmp.h include/rawpdu.h \
- include/utils.h include/hwaddress.h include/packet_sender.h \
+ include/utils.h include/hw_address.h include/packet_sender.h \
  include/constants.h
 
 include/ip.h:
@@ -210,7 +214,7 @@ include/small_uint.h:
 
 include/endianness.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/pdu_option.h:
 
@@ -224,7 +228,7 @@ include/rawpdu.h:
 
 include/utils.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
 include/packet_sender.h:
 
@@ -242,14 +246,14 @@ include/endianness.h:
 
 include/rawpdu.h:
 src/network_interface.o: src/network_interface.cpp \
- include/network_interface.h include/hwaddress.h include/ipaddress.h \
+ include/network_interface.h include/hw_address.h include/ip_address.h \
  include/utils.h include/endianness.h
 
 include/network_interface.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/utils.h:
 
@@ -277,9 +281,9 @@ include/pdu.h:
 
 include/packet_sender.h:
 src/radiotap.o: src/radiotap.cpp include/radiotap.h include/pdu.h \
- include/endianness.h include/network_interface.h include/hwaddress.h \
- include/ipaddress.h include/dot11.h include/small_uint.h include/utils.h \
- include/packet_sender.h
+ include/endianness.h include/network_interface.h include/hw_address.h \
+ include/ip_address.h include/dot11.h include/small_uint.h \
+ include/pdu_option.h include/utils.h include/packet_sender.h
 
 include/radiotap.h:
 
@@ -289,14 +293,16 @@ include/endianness.h:
 
 include/network_interface.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/dot11.h:
 
 include/small_uint.h:
 
+include/pdu_option.h:
+
 include/utils.h:
 
 include/packet_sender.h:
@@ -313,7 +319,7 @@ include/rsn_information.h:
 include/endianness.h:
 src/snap.o: src/snap.cpp include/snap.h include/pdu.h \
  include/endianness.h include/small_uint.h include/constants.h \
- include/arp.h include/hwaddress.h include/ipaddress.h include/ip.h \
+ include/arp.h include/hw_address.h include/ip_address.h include/ip.h \
  include/pdu_option.h include/eapol.h
 
 include/snap.h:
@@ -328,9 +334,9 @@ include/constants.h:
 
 include/arp.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/ip.h:
 
@@ -338,8 +344,8 @@ include/pdu_option.h:
 
 include/eapol.h:
 src/sniffer.o: src/sniffer.cpp include/sniffer.h include/pdu.h \
- include/ethernetII.h include/endianness.h include/hwaddress.h \
- include/network_interface.h include/ipaddress.h include/radiotap.h
+ include/ethernetII.h include/endianness.h include/hw_address.h \
+ include/network_interface.h include/ip_address.h include/radiotap.h
 
 include/sniffer.h:
 
@@ -349,17 +355,17 @@ include/ethernetII.h:
 
 include/endianness.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
 include/network_interface.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/radiotap.h:
 src/tcp.o: src/tcp.cpp include/tcp.h include/pdu.h include/endianness.h \
  include/small_uint.h include/pdu_option.h include/ip.h \
- include/ipaddress.h include/constants.h include/rawpdu.h include/utils.h \
- include/hwaddress.h
+ include/ip_address.h include/constants.h include/rawpdu.h \
+ include/utils.h include/hw_address.h
 
 include/tcp.h:
 
@@ -373,7 +379,7 @@ include/pdu_option.h:
 
 include/ip.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/constants.h:
 
@@ -381,11 +387,11 @@ include/rawpdu.h:
 
 include/utils.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 src/tcp_stream.o: src/tcp_stream.cpp include/rawpdu.h include/pdu.h \
  include/tcp_stream.h include/sniffer.h include/ethernetII.h \
- include/endianness.h include/hwaddress.h include/network_interface.h \
- include/ipaddress.h include/radiotap.h include/tcp.h \
+ include/endianness.h include/hw_address.h include/network_interface.h \
+ include/ip_address.h include/radiotap.h include/tcp.h \
  include/small_uint.h include/pdu_option.h include/ip.h
 
 include/rawpdu.h:
@@ -400,11 +406,11 @@ include/ethernetII.h:
 
 include/endianness.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
 include/network_interface.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
 include/radiotap.h:
 
@@ -416,8 +422,8 @@ include/pdu_option.h:
 
 include/ip.h:
 src/udp.o: src/udp.cpp include/udp.h include/pdu.h include/endianness.h \
- include/constants.h include/utils.h include/ipaddress.h \
- include/hwaddress.h include/ip.h include/small_uint.h \
+ include/constants.h include/utils.h include/ip_address.h \
+ include/hw_address.h include/ip.h include/small_uint.h \
  include/pdu_option.h include/rawpdu.h
 
 include/udp.h:
@@ -430,9 +436,9 @@ include/constants.h:
 
 include/utils.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
 include/ip.h:
 
@@ -441,17 +447,17 @@ include/small_uint.h:
 include/pdu_option.h:
 
 include/rawpdu.h:
-src/utils.o: src/utils.cpp include/utils.h include/ipaddress.h \
- include/hwaddress.h include/pdu.h include/ip.h include/pdu.h \
+src/utils.o: src/utils.cpp include/utils.h include/ip_address.h \
+ include/hw_address.h include/pdu.h include/ip.h include/pdu.h \
  include/small_uint.h include/endianness.h include/pdu_option.h \
  include/icmp.h include/arp.h include/endianness.h \
  include/network_interface.h include/packet_sender.h
 
 include/utils.h:
 
-include/ipaddress.h:
+include/ip_address.h:
 
-include/hwaddress.h:
+include/hw_address.h:
 
 include/pdu.h:
 
diff --git a/include/arp.h b/include/arp.h
index 393118d..8fc4e35 100644
--- a/include/arp.h
+++ b/include/arp.h
@@ -25,8 +25,8 @@
 
 #include "pdu.h"
 #include "endianness.h"
-#include "hwaddress.h"
-#include "ipaddress.h"
+#include "hw_address.h"
+#include "ip_address.h"
 
 namespace Tins {
     class NetworkInterface;
diff --git a/include/bootp.h b/include/bootp.h
index 87d363a..cc7119c 100644
--- a/include/bootp.h
+++ b/include/bootp.h
@@ -27,8 +27,8 @@
 #include <vector>
 #include "pdu.h"
 #include "endianness.h"
-#include "ipaddress.h"
-#include "hwaddress.h"
+#include "ip_address.h"
+#include "hw_address.h"
 
 
 namespace Tins {
diff --git a/include/dhcp.h b/include/dhcp.h
index 30abc89..6362ddd 100644
--- a/include/dhcp.h
+++ b/include/dhcp.h
@@ -29,8 +29,6 @@
 #include "pdu_option.h"
 
 namespace Tins {
-    class IPv4Address;
-    
     /** 
      * \brief Class that represents the DHCP PDU.
      * 
diff --git a/include/dot11.h b/include/dot11.h
index c33b0b7..bae5972 100644
--- a/include/dot11.h
+++ b/include/dot11.h
@@ -29,7 +29,7 @@
 
 #include "pdu.h"
 #include "endianness.h"
-#include "hwaddress.h"
+#include "hw_address.h"
 #include "small_uint.h"
 #include "pdu_option.h"
 #include "network_interface.h"
diff --git a/include/ethernetII.h b/include/ethernetII.h
index 3fdf632..1c097ba 100644
--- a/include/ethernetII.h
+++ b/include/ethernetII.h
@@ -26,7 +26,7 @@
 
 #include "pdu.h"
 #include "endianness.h"
-#include "hwaddress.h"
+#include "hw_address.h"
 #include "network_interface.h"
 
 namespace Tins {
diff --git a/include/hwaddress.h b/include/hw_address.h
similarity index 100%
rename from include/hwaddress.h
rename to include/hw_address.h
diff --git a/include/ieee802_3.h b/include/ieee802_3.h
index e4e96de..b78e25a 100644
--- a/include/ieee802_3.h
+++ b/include/ieee802_3.h
@@ -26,7 +26,7 @@
 
 #include "pdu.h"
 #include "endianness.h"
-#include "hwaddress.h"
+#include "hw_address.h"
 #include "network_interface.h"
 
 namespace Tins {
diff --git a/include/ip.h b/include/ip.h
index 0d27667..34fdebc 100644
--- a/include/ip.h
+++ b/include/ip.h
@@ -26,7 +26,7 @@
 #include "pdu.h"
 #include "small_uint.h"
 #include "endianness.h"
-#include "ipaddress.h"
+#include "ip_address.h"
 #include "pdu_option.h"
 
 namespace Tins {
diff --git a/include/ipaddress.h b/include/ip_address.h
similarity index 100%
rename from include/ipaddress.h
rename to include/ip_address.h
diff --git a/include/network_interface.h b/include/network_interface.h
index 6238f4b..32076dc 100644
--- a/include/network_interface.h
+++ b/include/network_interface.h
@@ -24,8 +24,8 @@
 
 #include <string>
 #include <stdint.h>
-#include "hwaddress.h"
-#include "ipaddress.h"
+#include "hw_address.h"
+#include "ip_address.h"
 
 namespace Tins {
 /**
diff --git a/include/tcp_stream.h b/include/tcp_stream.h
index 8dfabf5..7d04d01 100644
--- a/include/tcp_stream.h
+++ b/include/tcp_stream.h
@@ -30,7 +30,7 @@
 #include "sniffer.h"
 #include "tcp.h"
 #include "ip.h"
-#include "ipaddress.h"
+#include "ip_address.h"
 
 namespace Tins {
 class Sniffer;
diff --git a/include/utils.h b/include/utils.h
index 3f20e42..f58c58c 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -29,8 +29,8 @@
 #include <set>
 #include <fstream>
 #include <stdint.h>
-#include "ipaddress.h"
-#include "hwaddress.h"
+#include "ip_address.h"
+#include "hw_address.h"
 
 namespace Tins {
     class NetworkInterface;
diff --git a/src/dhcp.cpp b/src/dhcp.cpp
index 35b9655..9da43b8 100644
--- a/src/dhcp.cpp
+++ b/src/dhcp.cpp
@@ -24,7 +24,6 @@
 #include "endianness.h"
 #include "dhcp.h"
 #include "ethernetII.h"
-#include "ipaddress.h"
 
 using std::string;
 using std::list;
diff --git a/src/dns.cpp b/src/dns.cpp
index c3f40d5..0c44b8a 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -24,7 +24,7 @@
 #include <cassert>
 #include <memory>
 #include "dns.h"
-#include "ipaddress.h"
+#include "ip_address.h"
 
 using std::string;
 using std::list;
diff --git a/src/ipaddress.cpp b/src/ip_address.cpp
similarity index 99%
rename from src/ipaddress.cpp
rename to src/ip_address.cpp
index d29de31..2b98d07 100644
--- a/src/ipaddress.cpp
+++ b/src/ip_address.cpp
@@ -21,7 +21,7 @@
 
 #include <stdexcept>
 #include <sstream>
-#include "ipaddress.h"
+#include "ip_address.h"
 #include "endianness.h"
 
 using std::string;
diff --git a/tests/depends.d b/tests/depends.d
index c38288d..0418448 100644
--- a/tests/depends.d
+++ b/tests/depends.d
@@ -1,6 +1,6 @@
 src/arp.o: src/arp.cpp ../include/arp.h ../include/pdu.h \
- ../include/endianness.h ../include/hwaddress.h ../include/ipaddress.h \
- ../include/utils.h ../include/ipaddress.h
+ ../include/endianness.h ../include/hw_address.h ../include/ip_address.h \
+ ../include/utils.h ../include/ip_address.h
 
 ../include/arp.h:
 
@@ -8,18 +8,18 @@ src/arp.o: src/arp.cpp ../include/arp.h ../include/pdu.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
- ../include/pdu.h ../include/endianness.h ../include/ipaddress.h \
- ../include/hwaddress.h ../include/utils.h ../include/ethernetII.h \
- ../include/network_interface.h ../include/hwaddress.h \
- ../include/ipaddress.h
+ ../include/pdu.h ../include/endianness.h ../include/ip_address.h \
+ ../include/hw_address.h ../include/pdu_option.h ../include/utils.h \
+ ../include/ethernetII.h ../include/network_interface.h \
+ ../include/hw_address.h ../include/ip_address.h
 
 ../include/dhcp.h:
 
@@ -29,9 +29,11 @@ src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
 
 ../include/endianness.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
+
+../include/pdu_option.h:
 
 ../include/utils.h:
 
@@ -39,12 +41,12 @@ src/dhcp.o: src/dhcp.cpp ../include/dhcp.h ../include/bootp.h \
 
 ../include/network_interface.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 src/dns.o: src/dns.cpp ../include/dns.h ../include/pdu.h \
- ../include/endianness.h ../include/utils.h ../include/ipaddress.h \
- ../include/hwaddress.h
+ ../include/endianness.h ../include/utils.h ../include/ip_address.h \
+ ../include/hw_address.h
 
 ../include/dns.h:
 
@@ -54,13 +56,13 @@ src/dns.o: src/dns.cpp ../include/dns.h ../include/pdu.h \
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 src/ethernetII_test.o: src/ethernetII_test.cpp ../include/ethernetII.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/network_interface.h ../include/ipaddress.h ../include/utils.h \
- ../include/network_interface.h
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/network_interface.h ../include/ip_address.h \
+ ../include/utils.h ../include/network_interface.h
 
 ../include/ethernetII.h:
 
@@ -68,21 +70,21 @@ src/ethernetII_test.o: src/ethernetII_test.cpp ../include/ethernetII.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/utils.h:
 
 ../include/network_interface.h:
-src/hwaddress.o: src/hwaddress.cpp ../include/hwaddress.h
+src/hwaddress.o: src/hwaddress.cpp ../include/hw_address.h
 
-../include/hwaddress.h:
+../include/hw_address.h:
 src/icmp.o: src/icmp.cpp ../include/icmp.h ../include/pdu.h \
- ../include/endianness.h ../include/utils.h ../include/ipaddress.h \
- ../include/hwaddress.h
+ ../include/endianness.h ../include/utils.h ../include/ip_address.h \
+ ../include/hw_address.h
 
 ../include/icmp.h:
 
@@ -92,23 +94,23 @@ src/icmp.o: src/icmp.cpp ../include/icmp.h ../include/pdu.h \
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
-src/ipaddress.o: src/ipaddress.cpp ../include/ipaddress.h \
- ../include/utils.h ../include/ipaddress.h ../include/hwaddress.h
+../include/hw_address.h:
+src/ipaddress.o: src/ipaddress.cpp ../include/ip_address.h \
+ ../include/utils.h ../include/ip_address.h ../include/hw_address.h
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 src/ip.o: src/ip.cpp ../include/ip.h ../include/pdu.h \
- ../include/small_uint.h ../include/endianness.h ../include/ipaddress.h \
- ../include/pdu_option.h ../include/ipaddress.h ../include/utils.h \
- ../include/hwaddress.h
+ ../include/small_uint.h ../include/endianness.h ../include/ip_address.h \
+ ../include/pdu_option.h ../include/ip_address.h ../include/utils.h \
+ ../include/hw_address.h
 
 ../include/ip.h:
 
@@ -118,15 +120,15 @@ src/ip.o: src/ip.cpp ../include/ip.h ../include/pdu.h \
 
 ../include/endianness.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/pdu_option.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/utils.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 src/llc.o: src/llc.cpp ../include/llc.h ../include/pdu.h \
  ../include/endianness.h
 
@@ -137,19 +139,19 @@ src/llc.o: src/llc.cpp ../include/llc.h ../include/pdu.h \
 ../include/endianness.h:
 src/main.o: src/main.cpp
 src/network_interface.o: src/network_interface.cpp \
- ../include/network_interface.h ../include/hwaddress.h \
- ../include/ipaddress.h ../include/utils.h
+ ../include/network_interface.h ../include/hw_address.h \
+ ../include/ip_address.h ../include/utils.h
 
 ../include/network_interface.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/utils.h:
 src/snap.o: src/snap.cpp ../include/snap.h ../include/pdu.h \
  ../include/endianness.h ../include/small_uint.h ../include/utils.h \
- ../include/ipaddress.h ../include/hwaddress.h
+ ../include/ip_address.h ../include/hw_address.h
 
 ../include/snap.h:
 
@@ -161,12 +163,12 @@ src/snap.o: src/snap.cpp ../include/snap.h ../include/pdu.h \
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 src/tcp.o: src/tcp.cpp ../include/tcp.h ../include/pdu.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/utils.h ../include/ipaddress.h ../include/hwaddress.h
+ ../include/utils.h ../include/ip_address.h ../include/hw_address.h
 
 ../include/tcp.h:
 
@@ -180,9 +182,9 @@ src/tcp.o: src/tcp.cpp ../include/tcp.h ../include/pdu.h \
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 src/udp.o: src/udp.cpp ../include/udp.h ../include/pdu.h \
  ../include/endianness.h ../include/pdu.h
 
@@ -194,21 +196,46 @@ src/udp.o: src/udp.cpp ../include/udp.h ../include/pdu.h \
 
 ../include/pdu.h:
 src/utils_test.o: src/utils_test.cpp ../include/utils.h \
- ../include/ipaddress.h ../include/hwaddress.h ../include/endianness.h \
- ../include/ipaddress.h
+ ../include/ip_address.h ../include/hw_address.h ../include/endianness.h \
+ ../include/ip_address.h
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/endianness.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 src/dot11/ack.o: src/dot11/ack.cpp ../include/dot11.h ../include/pdu.h \
- ../include/endianness.h ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
+ ../include/pdu_option.h ../include/network_interface.h \
+ ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+
+../include/dot11.h:
+
+../include/pdu.h:
+
+../include/endianness.h:
+
+../include/hw_address.h:
+
+../include/small_uint.h:
+
+../include/pdu_option.h:
+
+../include/network_interface.h:
+
+../include/ip_address.h:
+
+include/tests/dot11.h:
+
+include/tests/dot11.h:
+src/dot11/assoc_request.o: src/dot11/assoc_request.cpp ../include/dot11.h \
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -217,43 +244,23 @@ src/dot11/ack.o: src/dot11/ack.cpp ../include/dot11.h ../include/pdu.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
-../include/network_interface.h:
-
-../include/ipaddress.h:
-
-include/tests/dot11.h:
-
-include/tests/dot11.h:
-src/dot11/assoc_request.o: src/dot11/assoc_request.cpp ../include/dot11.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/small_uint.h ../include/network_interface.h \
- ../include/ipaddress.h include/tests/dot11.h include/tests/dot11.h
-
-../include/dot11.h:
-
-../include/pdu.h:
-
-../include/endianness.h:
-
-../include/hwaddress.h:
-
-../include/small_uint.h:
+../include/pdu_option.h:
 
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/assoc_response.o: src/dot11/assoc_response.cpp \
  ../include/dot11.h ../include/pdu.h ../include/endianness.h \
- ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -262,21 +269,23 @@ src/dot11/assoc_response.o: src/dot11/assoc_response.cpp \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/authentication.o: src/dot11/authentication.cpp \
  ../include/dot11.h ../include/pdu.h ../include/endianness.h \
- ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -285,22 +294,24 @@ src/dot11/authentication.o: src/dot11/authentication.cpp \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/beacon.o: src/dot11/beacon.cpp ../include/dot11.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/small_uint.h ../include/network_interface.h \
- ../include/ipaddress.h ../include/rsn_information.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
+ ../include/rsn_information.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -308,13 +319,15 @@ src/dot11/beacon.o: src/dot11/beacon.cpp ../include/dot11.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/rsn_information.h:
 
@@ -323,8 +336,8 @@ include/tests/dot11.h:
 include/tests/dot11.h:
 src/dot11/block_ack_request.o: src/dot11/block_ack_request.cpp \
  ../include/dot11.h ../include/pdu.h ../include/endianness.h \
- ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -333,64 +346,23 @@ src/dot11/block_ack_request.o: src/dot11/block_ack_request.cpp \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/cfendack.o: src/dot11/cfendack.cpp ../include/dot11.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/small_uint.h ../include/network_interface.h \
- ../include/ipaddress.h include/tests/dot11.h include/tests/dot11.h
-
-../include/dot11.h:
-
-../include/pdu.h:
-
-../include/endianness.h:
-
-../include/hwaddress.h:
-
-../include/small_uint.h:
-
-../include/network_interface.h:
-
-../include/ipaddress.h:
-
-include/tests/dot11.h:
-
-include/tests/dot11.h:
-src/dot11/cfend.o: src/dot11/cfend.cpp ../include/dot11.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/small_uint.h ../include/network_interface.h \
- ../include/ipaddress.h include/tests/dot11.h include/tests/dot11.h
-
-../include/dot11.h:
-
-../include/pdu.h:
-
-../include/endianness.h:
-
-../include/hwaddress.h:
-
-../include/small_uint.h:
-
-../include/network_interface.h:
-
-../include/ipaddress.h:
-
-include/tests/dot11.h:
-
-include/tests/dot11.h:
-src/dot11/data.o: src/dot11/data.cpp ../include/dot11.h ../include/pdu.h \
- ../include/endianness.h ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -399,21 +371,72 @@ src/dot11/data.o: src/dot11/data.cpp ../include/dot11.h ../include/pdu.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
+
+include/tests/dot11.h:
+
+include/tests/dot11.h:
+src/dot11/cfend.o: src/dot11/cfend.cpp ../include/dot11.h \
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
+ include/tests/dot11.h include/tests/dot11.h
+
+../include/dot11.h:
+
+../include/pdu.h:
+
+../include/endianness.h:
+
+../include/hw_address.h:
+
+../include/small_uint.h:
+
+../include/pdu_option.h:
+
+../include/network_interface.h:
+
+../include/ip_address.h:
+
+include/tests/dot11.h:
+
+include/tests/dot11.h:
+src/dot11/data.o: src/dot11/data.cpp ../include/dot11.h ../include/pdu.h \
+ ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
+ ../include/pdu_option.h ../include/network_interface.h \
+ ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
+
+../include/dot11.h:
+
+../include/pdu.h:
+
+../include/endianness.h:
+
+../include/hw_address.h:
+
+../include/small_uint.h:
+
+../include/pdu_option.h:
+
+../include/network_interface.h:
+
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/deauthentication.o: src/dot11/deauthentication.cpp \
  ../include/dot11.h ../include/pdu.h ../include/endianness.h \
- ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -422,21 +445,24 @@ src/dot11/deauthentication.o: src/dot11/deauthentication.cpp \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/disassoc.o: src/dot11/disassoc.cpp ../include/dot11.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/small_uint.h ../include/network_interface.h \
- ../include/ipaddress.h include/tests/dot11.h include/tests/dot11.h
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
+ include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -444,22 +470,24 @@ src/dot11/disassoc.o: src/dot11/disassoc.cpp ../include/dot11.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/dot11.o: src/dot11/dot11.cpp ../include/dot11.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/small_uint.h ../include/network_interface.h \
- ../include/ipaddress.h include/tests/dot11.h include/tests/dot11.h \
- ../include/utils.h
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
+ include/tests/dot11.h include/tests/dot11.h ../include/utils.h
 
 ../include/dot11.h:
 
@@ -467,13 +495,15 @@ src/dot11/dot11.o: src/dot11/dot11.cpp ../include/dot11.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
@@ -481,9 +511,10 @@ include/tests/dot11.h:
 
 ../include/utils.h:
 src/dot11/probe_request.o: src/dot11/probe_request.cpp ../include/dot11.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/small_uint.h ../include/network_interface.h \
- ../include/ipaddress.h include/tests/dot11.h include/tests/dot11.h
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
+ include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -491,21 +522,23 @@ src/dot11/probe_request.o: src/dot11/probe_request.cpp ../include/dot11.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/probe_response.o: src/dot11/probe_response.cpp \
  ../include/dot11.h ../include/pdu.h ../include/endianness.h \
- ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -514,21 +547,24 @@ src/dot11/probe_response.o: src/dot11/probe_response.cpp \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/pspoll.o: src/dot11/pspoll.cpp ../include/dot11.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/small_uint.h ../include/network_interface.h \
- ../include/ipaddress.h include/tests/dot11.h include/tests/dot11.h
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
+ include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -536,21 +572,23 @@ src/dot11/pspoll.o: src/dot11/pspoll.cpp ../include/dot11.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/reassoc_request.o: src/dot11/reassoc_request.cpp \
  ../include/dot11.h ../include/pdu.h ../include/endianness.h \
- ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -559,21 +597,23 @@ src/dot11/reassoc_request.o: src/dot11/reassoc_request.cpp \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/reassoc_response.o: src/dot11/reassoc_response.cpp \
  ../include/dot11.h ../include/pdu.h ../include/endianness.h \
- ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/hw_address.h ../include/small_uint.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
  include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
@@ -582,21 +622,23 @@ src/dot11/reassoc_response.o: src/dot11/reassoc_response.cpp \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 src/dot11/rts.o: src/dot11/rts.cpp ../include/dot11.h ../include/pdu.h \
- ../include/endianness.h ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
- include/tests/dot11.h include/tests/dot11.h
+ ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
+ ../include/pdu_option.h ../include/network_interface.h \
+ ../include/ip_address.h include/tests/dot11.h include/tests/dot11.h
 
 ../include/dot11.h:
 
@@ -604,19 +646,21 @@ src/dot11/rts.o: src/dot11/rts.cpp ../include/dot11.h ../include/pdu.h \
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 include/tests/dot11.h:
 
 include/tests/dot11.h:
 ../src/arp.o: ../src/arp.cpp ../include/arp.h ../include/pdu.h \
- ../include/endianness.h ../include/hwaddress.h ../include/ipaddress.h \
+ ../include/endianness.h ../include/hw_address.h ../include/ip_address.h \
  ../include/ip.h ../include/small_uint.h ../include/pdu_option.h \
  ../include/ethernetII.h ../include/network_interface.h \
  ../include/rawpdu.h ../include/constants.h \
@@ -628,9 +672,9 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/ip.h:
 
@@ -648,7 +692,7 @@ include/tests/dot11.h:
 
 ../include/network_interface.h:
 ../src/bootp.o: ../src/bootp.cpp ../include/bootp.h ../include/pdu.h \
- ../include/endianness.h ../include/ipaddress.h ../include/hwaddress.h
+ ../include/endianness.h ../include/ip_address.h ../include/hw_address.h
 
 ../include/bootp.h:
 
@@ -656,13 +700,13 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 ../src/dhcp.o: ../src/dhcp.cpp ../include/endianness.h ../include/dhcp.h \
  ../include/bootp.h ../include/pdu.h ../include/endianness.h \
- ../include/ipaddress.h ../include/hwaddress.h ../include/ethernetII.h \
- ../include/network_interface.h ../include/ipaddress.h
+ ../include/ip_address.h ../include/hw_address.h ../include/pdu_option.h \
+ ../include/ethernetII.h ../include/network_interface.h
 
 ../include/endianness.h:
 
@@ -674,17 +718,17 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
+
+../include/pdu_option.h:
 
 ../include/ethernetII.h:
 
 ../include/network_interface.h:
-
-../include/ipaddress.h:
 ../src/dns.o: ../src/dns.cpp ../include/dns.h ../include/pdu.h \
- ../include/endianness.h ../include/ipaddress.h
+ ../include/endianness.h ../include/ip_address.h
 
 ../include/dns.h:
 
@@ -692,12 +736,13 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 ../src/dot11.o: ../src/dot11.cpp ../include/dot11.h ../include/pdu.h \
- ../include/endianness.h ../include/hwaddress.h ../include/small_uint.h \
- ../include/network_interface.h ../include/ipaddress.h \
- ../include/rawpdu.h ../include/radiotap.h ../include/rsn_information.h \
- ../include/packet_sender.h ../include/snap.h
+ ../include/endianness.h ../include/hw_address.h ../include/small_uint.h \
+ ../include/pdu_option.h ../include/network_interface.h \
+ ../include/ip_address.h ../include/rawpdu.h ../include/radiotap.h \
+ ../include/rsn_information.h ../include/packet_sender.h \
+ ../include/snap.h
 
 ../include/dot11.h:
 
@@ -705,13 +750,15 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/rawpdu.h:
 
@@ -724,8 +771,9 @@ include/tests/dot11.h:
 ../include/snap.h:
 ../src/eapol.o: ../src/eapol.cpp ../include/eapol.h ../include/pdu.h \
  ../include/small_uint.h ../include/endianness.h ../include/dot11.h \
- ../include/hwaddress.h ../include/network_interface.h \
- ../include/ipaddress.h ../include/rsn_information.h
+ ../include/hw_address.h ../include/pdu_option.h \
+ ../include/network_interface.h ../include/ip_address.h \
+ ../include/rsn_information.h
 
 ../include/eapol.h:
 
@@ -737,16 +785,18 @@ include/tests/dot11.h:
 
 ../include/dot11.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
+
+../include/pdu_option.h:
 
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/rsn_information.h:
 ../src/ethernetII.o: ../src/ethernetII.cpp ../include/ethernetII.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/network_interface.h ../include/ip_address.h \
  ../include/packet_sender.h ../include/rawpdu.h ../include/ip.h \
  ../include/small_uint.h ../include/pdu_option.h ../include/arp.h
 
@@ -756,11 +806,11 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/packet_sender.h:
 
@@ -775,7 +825,7 @@ include/tests/dot11.h:
 ../include/arp.h:
 ../src/icmp.o: ../src/icmp.cpp ../include/icmp.h ../include/pdu.h \
  ../include/endianness.h ../include/rawpdu.h ../include/utils.h \
- ../include/ipaddress.h ../include/hwaddress.h
+ ../include/ip_address.h ../include/hw_address.h
 
 ../include/icmp.h:
 
@@ -787,12 +837,12 @@ include/tests/dot11.h:
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 ../src/ieee802_3.o: ../src/ieee802_3.cpp ../include/ieee802_3.h \
- ../include/pdu.h ../include/endianness.h ../include/hwaddress.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/pdu.h ../include/endianness.h ../include/hw_address.h \
+ ../include/network_interface.h ../include/ip_address.h \
  ../include/packet_sender.h ../include/llc.h
 
 ../include/ieee802_3.h:
@@ -801,26 +851,27 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/packet_sender.h:
 
 ../include/llc.h:
-../src/ipaddress.o: ../src/ipaddress.cpp ../include/ipaddress.h \
+../src/ip_address.o: ../src/ip_address.cpp ../include/ip_address.h \
  ../include/endianness.h
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/endianness.h:
 ../src/ip.o: ../src/ip.cpp ../include/ip.h ../include/pdu.h \
- ../include/small_uint.h ../include/endianness.h ../include/ipaddress.h \
+ ../include/small_uint.h ../include/endianness.h ../include/ip_address.h \
  ../include/pdu_option.h ../include/tcp.h ../include/udp.h \
  ../include/icmp.h ../include/rawpdu.h ../include/utils.h \
- ../include/hwaddress.h ../include/packet_sender.h ../include/constants.h
+ ../include/hw_address.h ../include/packet_sender.h \
+ ../include/constants.h
 
 ../include/ip.h:
 
@@ -830,7 +881,7 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/pdu_option.h:
 
@@ -844,7 +895,7 @@ include/tests/dot11.h:
 
 ../include/utils.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/packet_sender.h:
 
@@ -862,14 +913,14 @@ include/tests/dot11.h:
 
 ../include/rawpdu.h:
 ../src/network_interface.o: ../src/network_interface.cpp \
- ../include/network_interface.h ../include/hwaddress.h \
- ../include/ipaddress.h ../include/utils.h ../include/endianness.h
+ ../include/network_interface.h ../include/hw_address.h \
+ ../include/ip_address.h ../include/utils.h ../include/endianness.h
 
 ../include/network_interface.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/utils.h:
 
@@ -898,8 +949,9 @@ include/tests/dot11.h:
 ../include/packet_sender.h:
 ../src/radiotap.o: ../src/radiotap.cpp ../include/radiotap.h \
  ../include/pdu.h ../include/endianness.h ../include/network_interface.h \
- ../include/hwaddress.h ../include/ipaddress.h ../include/dot11.h \
- ../include/small_uint.h ../include/utils.h ../include/packet_sender.h
+ ../include/hw_address.h ../include/ip_address.h ../include/dot11.h \
+ ../include/small_uint.h ../include/pdu_option.h ../include/utils.h \
+ ../include/packet_sender.h
 
 ../include/radiotap.h:
 
@@ -909,14 +961,16 @@ include/tests/dot11.h:
 
 ../include/network_interface.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/dot11.h:
 
 ../include/small_uint.h:
 
+../include/pdu_option.h:
+
 ../include/utils.h:
 
 ../include/packet_sender.h:
@@ -933,7 +987,7 @@ include/tests/dot11.h:
 ../include/endianness.h:
 ../src/snap.o: ../src/snap.cpp ../include/snap.h ../include/pdu.h \
  ../include/endianness.h ../include/small_uint.h ../include/constants.h \
- ../include/arp.h ../include/hwaddress.h ../include/ipaddress.h \
+ ../include/arp.h ../include/hw_address.h ../include/ip_address.h \
  ../include/ip.h ../include/pdu_option.h ../include/eapol.h
 
 ../include/snap.h:
@@ -948,9 +1002,9 @@ include/tests/dot11.h:
 
 ../include/arp.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/ip.h:
 
@@ -959,8 +1013,8 @@ include/tests/dot11.h:
 ../include/eapol.h:
 ../src/sniffer.o: ../src/sniffer.cpp ../include/sniffer.h \
  ../include/pdu.h ../include/ethernetII.h ../include/endianness.h \
- ../include/hwaddress.h ../include/network_interface.h \
- ../include/ipaddress.h ../include/radiotap.h
+ ../include/hw_address.h ../include/network_interface.h \
+ ../include/ip_address.h ../include/radiotap.h
 
 ../include/sniffer.h:
 
@@ -970,17 +1024,17 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/radiotap.h:
 ../src/tcp.o: ../src/tcp.cpp ../include/tcp.h ../include/pdu.h \
  ../include/endianness.h ../include/small_uint.h ../include/pdu_option.h \
- ../include/ip.h ../include/ipaddress.h ../include/constants.h \
- ../include/rawpdu.h ../include/utils.h ../include/hwaddress.h
+ ../include/ip.h ../include/ip_address.h ../include/constants.h \
+ ../include/rawpdu.h ../include/utils.h ../include/hw_address.h
 
 ../include/tcp.h:
 
@@ -994,7 +1048,7 @@ include/tests/dot11.h:
 
 ../include/ip.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/constants.h:
 
@@ -1002,11 +1056,11 @@ include/tests/dot11.h:
 
 ../include/utils.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 ../src/tcp_stream.o: ../src/tcp_stream.cpp ../include/rawpdu.h \
  ../include/pdu.h ../include/tcp_stream.h ../include/sniffer.h \
- ../include/ethernetII.h ../include/endianness.h ../include/hwaddress.h \
- ../include/network_interface.h ../include/ipaddress.h \
+ ../include/ethernetII.h ../include/endianness.h ../include/hw_address.h \
+ ../include/network_interface.h ../include/ip_address.h \
  ../include/radiotap.h ../include/tcp.h ../include/small_uint.h \
  ../include/pdu_option.h ../include/ip.h
 
@@ -1022,11 +1076,11 @@ include/tests/dot11.h:
 
 ../include/endianness.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/network_interface.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
 ../include/radiotap.h:
 
@@ -1039,7 +1093,7 @@ include/tests/dot11.h:
 ../include/ip.h:
 ../src/udp.o: ../src/udp.cpp ../include/udp.h ../include/pdu.h \
  ../include/endianness.h ../include/constants.h ../include/utils.h \
- ../include/ipaddress.h ../include/hwaddress.h ../include/ip.h \
+ ../include/ip_address.h ../include/hw_address.h ../include/ip.h \
  ../include/small_uint.h ../include/pdu_option.h ../include/rawpdu.h
 
 ../include/udp.h:
@@ -1052,9 +1106,9 @@ include/tests/dot11.h:
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/ip.h:
 
@@ -1064,7 +1118,7 @@ include/tests/dot11.h:
 
 ../include/rawpdu.h:
 ../src/utils.o: ../src/utils.cpp ../include/utils.h \
- ../include/ipaddress.h ../include/hwaddress.h ../include/pdu.h \
+ ../include/ip_address.h ../include/hw_address.h ../include/pdu.h \
  ../include/ip.h ../include/pdu.h ../include/small_uint.h \
  ../include/endianness.h ../include/pdu_option.h ../include/icmp.h \
  ../include/arp.h ../include/endianness.h ../include/network_interface.h \
@@ -1072,9 +1126,9 @@ include/tests/dot11.h:
 
 ../include/utils.h:
 
-../include/ipaddress.h:
+../include/ip_address.h:
 
-../include/hwaddress.h:
+../include/hw_address.h:
 
 ../include/pdu.h:
 
diff --git a/tests/src/arp.cpp b/tests/src/arp.cpp
index d65b7ec..334814b 100644
--- a/tests/src/arp.cpp
+++ b/tests/src/arp.cpp
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include "arp.h"
 #include "utils.h"
-#include "ipaddress.h"
+#include "ip_address.h"
 
 
 using namespace std;
diff --git a/tests/src/dhcp.cpp b/tests/src/dhcp.cpp
index 4bacba3..bcba06b 100644
--- a/tests/src/dhcp.cpp
+++ b/tests/src/dhcp.cpp
@@ -7,8 +7,8 @@
 #include "dhcp.h"
 #include "utils.h"
 #include "ethernetII.h"
-#include "hwaddress.h"
-#include "ipaddress.h"
+#include "hw_address.h"
+#include "ip_address.h"
 
 using namespace std;
 using namespace Tins;
diff --git a/tests/src/hwaddress.cpp b/tests/src/hwaddress.cpp
index 8dfdb12..ad4966f 100644
--- a/tests/src/hwaddress.cpp
+++ b/tests/src/hwaddress.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <sstream>
 #include <stdint.h>
-#include "hwaddress.h"
+#include "hw_address.h"
 
 using namespace Tins;
 
diff --git a/tests/src/ip.cpp b/tests/src/ip.cpp
index af40f1e..1769ee3 100644
--- a/tests/src/ip.cpp
+++ b/tests/src/ip.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <stdint.h>
 #include "ip.h"
-#include "ipaddress.h"
+#include "ip_address.h"
 #include "utils.h"
 
 using namespace std;
diff --git a/tests/src/ipaddress.cpp b/tests/src/ipaddress.cpp
index 9a74cd4..6f780b4 100644
--- a/tests/src/ipaddress.cpp
+++ b/tests/src/ipaddress.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <sstream>
 #include <stdint.h>
-#include "ipaddress.h"
+#include "ip_address.h"
 #include "utils.h"
 
 using namespace Tins;
diff --git a/tests/src/utils_test.cpp b/tests/src/utils_test.cpp
index ea10353..bf05c96 100644
--- a/tests/src/utils_test.cpp
+++ b/tests/src/utils_test.cpp
@@ -3,7 +3,7 @@
 #include <gtest/gtest.h>
 #include "utils.h"
 #include "endianness.h"
-#include "ipaddress.h"
+#include "ip_address.h"
 
 using namespace Tins;