4 files changed, 12 insertions, 12 deletions
diff --git a/lib/includes/hicn/protocol/icmprd.h b/lib/includes/hicn/protocol/icmprd.h
index 897e7969e..17088c22a 100644
--- a/lib/includes/hicn/protocol/icmprd.h
+++ b/lib/includes/hicn/protocol/icmprd.h
@@ -33,7 +33,7 @@ typedef struct
   u8 type;
   u8 code;
   u16 csum;
-  ip4_address_t ip;
+  ipv4_address_t ip;
   _ipv4_header_t iph;
   u8 data[64];
 } _icmprd4_header_t;
@@ -53,8 +53,8 @@ typedef struct
   u8 code;
   u16 csum;
   u32 res;
-  ip6_address_t tgt;
-  ip6_address_t dst;
+  ipv6_address_t tgt;
+  ipv6_address_t dst;
 } _icmprd_header_t;
 
 #define ICMPRD_HDRLEN sizeof (_icmprd_header_t)
diff --git a/lib/includes/hicn/protocol/ipv4.h b/lib/includes/hicn/protocol/ipv4.h
index 44e95c1e3..89435b516 100644
--- a/lib/includes/hicn/protocol/ipv4.h
+++ b/lib/includes/hicn/protocol/ipv4.h
@@ -54,8 +54,8 @@ typedef struct
   u8 ttl;
   u8 protocol;
   u16 csum;
-  ip4_address_t saddr;
-  ip4_address_t daddr;
+  ipv4_address_t saddr;
+  ipv4_address_t daddr;
 } _ipv4_header_t;
 
 #define ipv4_header_bytes(ipv4_header)                                        \
@@ -72,8 +72,8 @@ static_assert (EXPECTED_IPV4_HDRLEN == IPV4_HDRLEN,
 
 typedef struct
 {
-  ip4_address_t ip_src;
-  ip4_address_t ip_dst;
+  ipv4_address_t ip_src;
+  ipv4_address_t ip_dst;
   u8 zero;
   u8 protocol;
   u16 size;
diff --git a/lib/includes/hicn/protocol/ipv6.h b/lib/includes/hicn/protocol/ipv6.h
index 86301e7d1..6e8e30af3 100644
--- a/lib/includes/hicn/protocol/ipv6.h
+++ b/lib/includes/hicn/protocol/ipv6.h
@@ -42,8 +42,8 @@ typedef struct
     u8 vfc;			/* 4 bits version, top 4 bits class */
   };
 #endif
-  ip6_address_t saddr; /* source address */
-  ip6_address_t daddr; /* destination address */
+  ipv6_address_t saddr; /* source address */
+  ipv6_address_t daddr; /* destination address */
 } _ipv6_header_t;
 
 #define IPV6_HDRLEN sizeof (_ipv6_header_t)
@@ -57,8 +57,8 @@ static_assert (EXPECTED_IPV6_HDRLEN == IPV6_HDRLEN,
 
 typedef struct
 {
-  ip6_address_t ip_src;
-  ip6_address_t ip_dst;
+  ipv6_address_t ip_src;
+  ipv6_address_t ip_dst;
   u32 size;
   u16 zeros;
   u8 zero;
diff --git a/lib/includes/hicn/protocol/new.h b/lib/includes/hicn/protocol/new.h
index 47f7758d2..e688bef21 100644
--- a/lib/includes/hicn/protocol/new.h
+++ b/lib/includes/hicn/protocol/new.h
@@ -34,7 +34,7 @@ typedef struct
   u8 flags;
   u16 payload_length;
   u32 lifetime;
-  ip_address_t prefix;
+  hicn_ip_address_t prefix;
   u32 suffix;
   u32 path_label;
 } _new_header_t;