diff --git a/app/test-acl/main.c b/app/test-acl/main.c
index eb62943..57f2394 100644
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -625,7 +625,7 @@ enum {
 	GET_CB_FIELD(in, d, 0, UINT8_MAX, '/');
 	GET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0);
 
-	addr[0] = RTE_IPv4(a, b, c, d);
+	addr[0] = RTE_IPV4(a, b, c, d);
 	mask_len[0] = m;
 
 	return 0;
diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index a970a27..1e424a1 100644
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -72,8 +72,8 @@
 
 /* hardcoded configuration (for now) */
 static unsigned cfg_n_flows	= 1024;
-static uint32_t cfg_ip_src	= RTE_IPv4(10, 254, 0, 0);
-static uint32_t cfg_ip_dst	= RTE_IPv4(10, 253, 0, 0);
+static uint32_t cfg_ip_src	= RTE_IPV4(10, 254, 0, 0);
+static uint32_t cfg_ip_dst	= RTE_IPV4(10, 253, 0, 0);
 static uint16_t cfg_udp_src	= 1000;
 static uint16_t cfg_udp_dst	= 1001;
 static struct rte_ether_addr cfg_ether_src =
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 0148b0a..4f2a431 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -480,8 +480,8 @@ struct vxlan_encap_conf vxlan_encap_conf = {
 	.vni = "\x00\x00\x00",
 	.udp_src = 0,
 	.udp_dst = RTE_BE16(4789),
-	.ipv4_src = RTE_IPv4(127, 0, 0, 1),
-	.ipv4_dst = RTE_IPv4(255, 255, 255, 255),
+	.ipv4_src = RTE_IPV4(127, 0, 0, 1),
+	.ipv4_dst = RTE_IPV4(255, 255, 255, 255),
 	.ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00"
 		"\x00\x00\x00\x00\x00\x00\x00\x01",
 	.ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00"
@@ -497,8 +497,8 @@ struct nvgre_encap_conf nvgre_encap_conf = {
 	.select_ipv4 = 1,
 	.select_vlan = 0,
 	.tni = "\x00\x00\x00",
-	.ipv4_src = RTE_IPv4(127, 0, 0, 1),
-	.ipv4_dst = RTE_IPv4(255, 255, 255, 255),
+	.ipv4_src = RTE_IPV4(127, 0, 0, 1),
+	.ipv4_dst = RTE_IPV4(255, 255, 255, 255),
 	.ipv6_src = "\x00\x00\x00\x00\x00\x00\x00\x00"
 		"\x00\x00\x00\x00\x00\x00\x00\x01",
 	.ipv6_dst = "\x00\x00\x00\x00\x00\x00\x00\x00"
diff --git a/app/test/test_acl.c b/app/test/test_acl.c
index 8663ff0..9cd9e37 100644
--- a/app/test/test_acl.c
+++ b/app/test/test_acl.c
@@ -515,15 +515,15 @@ struct rte_acl_ipv4vlan_rule acl_rule = {
 	static struct ipv4_7tuple test_data[] = {
 		{
 			.proto = 6,
-			.ip_src = RTE_IPv4(10, 1, 1, 1),
-			.ip_dst = RTE_IPv4(192, 168, 0, 33),
+			.ip_src = RTE_IPV4(10, 1, 1, 1),
+			.ip_dst = RTE_IPV4(192, 168, 0, 33),
 			.port_dst = 53,
 			.allow = 1,
 		},
 		{
 			.proto = 6,
-			.ip_src = RTE_IPv4(127, 84, 33, 1),
-			.ip_dst = RTE_IPv4(1, 2, 3, 4),
+			.ip_src = RTE_IPV4(127, 84, 33, 1),
+			.ip_dst = RTE_IPV4(1, 2, 3, 4),
 			.port_dst = 65281,
 			.allow = 1,
 		},
diff --git a/app/test/test_acl.h b/app/test/test_acl.h
index b071f47..4f6e659 100644
--- a/app/test/test_acl.h
+++ b/app/test/test_acl.h
@@ -82,13 +82,13 @@ struct rte_acl_ipv4vlan_rule invalid_layout_rules[] = {
 		{
 				.data = {.userdata = 1, .category_mask = 1,
 					.priority = 1},
-				.src_addr = RTE_IPv4(10,0,0,0),
+				.src_addr = RTE_IPV4(10,0,0,0),
 				.src_mask_len = 24,
 		},
 		{
 				.data = {.userdata = 2, .category_mask = 1,
 					.priority = 1},
-				.dst_addr = RTE_IPv4(10,0,0,0),
+				.dst_addr = RTE_IPV4(10,0,0,0),
 				.dst_mask_len = 24,
 		},
 		/* test src and dst ports */
@@ -124,8 +124,8 @@ struct rte_acl_ipv4vlan_rule invalid_layout_rules[] = {
  * results using the wrong data layout.
  */
 struct ipv4_7tuple invalid_layout_data[] = {
-		{.ip_src = RTE_IPv4(10,0,1,0)},             /* should not match */
-		{.ip_src = RTE_IPv4(10,0,0,1), .allow = 2}, /* should match 2 */
+		{.ip_src = RTE_IPV4(10,0,1,0)},             /* should not match */
+		{.ip_src = RTE_IPV4(10,0,0,1), .allow = 2}, /* should match 2 */
 		{.port_src = 100, .allow = 4},          /* should match 4 */
 		{.port_dst = 0xf, .allow = 6},          /* should match 6 */
 };
@@ -142,7 +142,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 1, .category_mask = ACL_ALLOW_MASK,
 						.priority = 230},
-				.dst_addr = RTE_IPv4(192,168,0,0),
+				.dst_addr = RTE_IPV4(192,168,0,0),
 				.dst_mask_len = 16,
 				.src_port_low = 0,
 				.src_port_high = 0xffff,
@@ -153,7 +153,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 2, .category_mask = ACL_ALLOW_MASK,
 						.priority = 330},
-				.dst_addr = RTE_IPv4(192,168,1,0),
+				.dst_addr = RTE_IPV4(192,168,1,0),
 				.dst_mask_len = 24,
 				.src_port_low = 0,
 				.src_port_high = 0xffff,
@@ -164,7 +164,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 3, .category_mask = ACL_DENY_MASK,
 						.priority = 230},
-				.dst_addr = RTE_IPv4(192,168,1,50),
+				.dst_addr = RTE_IPV4(192,168,1,50),
 				.dst_mask_len = 32,
 				.src_port_low = 0,
 				.src_port_high = 0xffff,
@@ -177,7 +177,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 4, .category_mask = ACL_ALLOW_MASK,
 						.priority = 240},
-				.src_addr = RTE_IPv4(10,0,0,0),
+				.src_addr = RTE_IPV4(10,0,0,0),
 				.src_mask_len = 8,
 				.src_port_low = 0,
 				.src_port_high = 0xffff,
@@ -188,7 +188,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 5, .category_mask = ACL_ALLOW_MASK,
 						.priority = 340},
-				.src_addr = RTE_IPv4(10,1,1,0),
+				.src_addr = RTE_IPV4(10,1,1,0),
 				.src_mask_len = 24,
 				.src_port_low = 0,
 				.src_port_high = 0xffff,
@@ -199,7 +199,7 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 6, .category_mask = ACL_DENY_MASK,
 						.priority = 240},
-				.src_addr = RTE_IPv4(10,1,1,1),
+				.src_addr = RTE_IPV4(10,1,1,1),
 				.src_mask_len = 32,
 				.src_port_low = 0,
 				.src_port_high = 0xffff,
@@ -393,9 +393,9 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 				.data = {.userdata = 24, .category_mask = ACL_ALLOW_MASK,
 						.priority = 400},
 				/** make sure that unmasked bytes don't fail! */
-				.dst_addr = RTE_IPv4(1,2,3,4),
+				.dst_addr = RTE_IPV4(1,2,3,4),
 				.dst_mask_len = 16,
-				.src_addr = RTE_IPv4(5,6,7,8),
+				.src_addr = RTE_IPV4(5,6,7,8),
 				.src_mask_len = 24,
 				.proto = 0x5,
 				.proto_mask = 0xff,
@@ -411,9 +411,9 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 25, .category_mask = ACL_DENY_MASK,
 						.priority = 400},
-				.dst_addr = RTE_IPv4(5,6,7,8),
+				.dst_addr = RTE_IPV4(5,6,7,8),
 				.dst_mask_len = 24,
-				.src_addr = RTE_IPv4(1,2,3,4),
+				.src_addr = RTE_IPV4(1,2,3,4),
 				.src_mask_len = 16,
 				.proto = 0x5,
 				.proto_mask = 0xff,
@@ -429,9 +429,9 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 26, .category_mask = ACL_ALLOW_MASK,
 						.priority = 500},
-				.dst_addr = RTE_IPv4(1,2,3,4),
+				.dst_addr = RTE_IPV4(1,2,3,4),
 				.dst_mask_len = 8,
-				.src_addr = RTE_IPv4(5,6,7,8),
+				.src_addr = RTE_IPV4(5,6,7,8),
 				.src_mask_len = 32,
 				.proto = 0x5,
 				.proto_mask = 0xff,
@@ -445,9 +445,9 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 		{
 				.data = {.userdata = 27, .category_mask = ACL_DENY_MASK,
 						.priority = 500},
-				.dst_addr = RTE_IPv4(5,6,7,8),
+				.dst_addr = RTE_IPV4(5,6,7,8),
 				.dst_mask_len = 32,
-				.src_addr = RTE_IPv4(1,2,3,4),
+				.src_addr = RTE_IPV4(1,2,3,4),
 				.src_mask_len = 8,
 				.proto = 0x5,
 				.proto_mask = 0xff,
@@ -463,20 +463,20 @@ struct rte_acl_ipv4vlan_rule acl_test_rules[] = {
 /* data for ACL unit test */
 struct ipv4_7tuple acl_test_data[] = {
 /* testing single rule aspects */
-		{.ip_src = RTE_IPv4(10,0,0,0), .allow = 4}, /* should match 4 */
-		{.ip_src = RTE_IPv4(10,1,1,2), .allow = 5}, /* should match 5 */
-		{.ip_src = RTE_IPv4(10,1,1,1), .allow = 5,
+		{.ip_src = RTE_IPV4(10,0,0,0), .allow = 4}, /* should match 4 */
+		{.ip_src = RTE_IPV4(10,1,1,2), .allow = 5}, /* should match 5 */
+		{.ip_src = RTE_IPV4(10,1,1,1), .allow = 5,
 				.deny = 6},                     /* should match 5, 6 */
-		{.ip_dst = RTE_IPv4(10,0,0,0)},             /* should not match */
-		{.ip_dst = RTE_IPv4(10,1,1,2)},             /* should not match */
-		{.ip_dst = RTE_IPv4(10,1,1,1)},             /* should not match */
+		{.ip_dst = RTE_IPV4(10,0,0,0)},             /* should not match */
+		{.ip_dst = RTE_IPV4(10,1,1,2)},             /* should not match */
+		{.ip_dst = RTE_IPV4(10,1,1,1)},             /* should not match */
 
-		{.ip_src = RTE_IPv4(192,168,2,50)},             /* should not match */
-		{.ip_src = RTE_IPv4(192,168,1,2)},              /* should not match */
-		{.ip_src = RTE_IPv4(192,168,1,50)},             /* should not match */
-		{.ip_dst = RTE_IPv4(192,168,2,50), .allow = 1}, /* should match 1 */
-		{.ip_dst = RTE_IPv4(192,168,1,49), .allow = 2}, /* should match 2 */
-		{.ip_dst = RTE_IPv4(192,168,1,50), .allow = 2,
+		{.ip_src = RTE_IPV4(192,168,2,50)},             /* should not match */
+		{.ip_src = RTE_IPV4(192,168,1,2)},              /* should not match */
+		{.ip_src = RTE_IPV4(192,168,1,50)},             /* should not match */
+		{.ip_dst = RTE_IPV4(192,168,2,50), .allow = 1}, /* should match 1 */
+		{.ip_dst = RTE_IPV4(192,168,1,49), .allow = 2}, /* should match 2 */
+		{.ip_dst = RTE_IPV4(192,168,1,50), .allow = 2,
 				.deny = 3},                         /* should match 2, 3 */
 
 		{.vlan = 0x64, .allow = 7},            /* should match 7 */
@@ -515,20 +515,20 @@ struct ipv4_7tuple acl_test_data[] = {
 		{.proto = 0x5, .allow = 22, .deny = 23},  /* should match 22, 23 */
 
 /* testing matching multiple rules at once */
-		{.vlan = 0x5, .ip_src = RTE_IPv4(10,1,1,1),
+		{.vlan = 0x5, .ip_src = RTE_IPV4(10,1,1,1),
 				.allow = 5, .deny = 9},               /* should match 5, 9 */
-		{.vlan = 0x5, .ip_src = RTE_IPv4(192,168,2,50),
+		{.vlan = 0x5, .ip_src = RTE_IPV4(192,168,2,50),
 				.allow = 8, .deny = 9},               /* should match 8, 9 */
-		{.vlan = 0x55, .ip_src = RTE_IPv4(192,168,1,49),
+		{.vlan = 0x55, .ip_src = RTE_IPV4(192,168,1,49),
 				.allow = 8},                          /* should match 8 */
 		{.port_dst = 80, .port_src = 1024,
 				.allow = 13, .deny = 20},             /* should match 13,20 */
 		{.port_dst = 79, .port_src = 1024,
 				.allow = 14, .deny = 20},             /* should match 14,20 */
-		{.proto = 0x5, .ip_dst = RTE_IPv4(192,168,2,50),
+		{.proto = 0x5, .ip_dst = RTE_IPV4(192,168,2,50),
 				.allow = 1, .deny = 23},               /* should match 1, 23 */
 
-		{.proto = 0x5, .ip_dst = RTE_IPv4(192,168,1,50),
+		{.proto = 0x5, .ip_dst = RTE_IPV4(192,168,1,50),
 				.allow = 2, .deny = 23},              /* should match 2, 23 */
 		{.vlan = 0x64, .domain = 0x5,
 				.allow = 11, .deny = 12},             /* should match 11, 12 */
@@ -537,16 +537,16 @@ struct ipv4_7tuple acl_test_data[] = {
 		{.proto = 0x5, .port_dst = 80,
 				.allow = 13, .deny = 23},             /* should match 13, 23 */
 		{.proto = 0x51, .port_src = 5000},            /* should not match */
-		{.ip_src = RTE_IPv4(192,168,1,50),
-				.ip_dst = RTE_IPv4(10,0,0,0),
+		{.ip_src = RTE_IPV4(192,168,1,50),
+				.ip_dst = RTE_IPV4(10,0,0,0),
 				.proto = 0x51,
 				.port_src = 5000,
 				.port_dst = 5000},                    /* should not match */
 
 /* test full packet rules */
 		{
-				.ip_dst = RTE_IPv4(1,2,100,200),
-				.ip_src = RTE_IPv4(5,6,7,254),
+				.ip_dst = RTE_IPV4(1,2,100,200),
+				.ip_src = RTE_IPV4(5,6,7,254),
 				.proto = 0x5,
 				.vlan = 0x8100,
 				.domain = 0x64,
@@ -556,8 +556,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.deny = 23
 		}, /* should match 23, 24 */
 		{
-				.ip_dst = RTE_IPv4(5,6,7,254),
-				.ip_src = RTE_IPv4(1,2,100,200),
+				.ip_dst = RTE_IPV4(5,6,7,254),
+				.ip_src = RTE_IPV4(1,2,100,200),
 				.proto = 0x5,
 				.vlan = 0x8100,
 				.domain = 0x64,
@@ -567,8 +567,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.deny = 25
 		}, /* should match 13, 25 */
 		{
-				.ip_dst = RTE_IPv4(1,10,20,30),
-				.ip_src = RTE_IPv4(5,6,7,8),
+				.ip_dst = RTE_IPV4(1,10,20,30),
+				.ip_src = RTE_IPV4(5,6,7,8),
 				.proto = 0x5,
 				.vlan = 0x64,
 				.port_src = 12345,
@@ -577,8 +577,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.deny = 23
 		}, /* should match 23, 26 */
 		{
-				.ip_dst = RTE_IPv4(5,6,7,8),
-				.ip_src = RTE_IPv4(1,10,20,30),
+				.ip_dst = RTE_IPV4(5,6,7,8),
+				.ip_src = RTE_IPV4(1,10,20,30),
 				.proto = 0x5,
 				.vlan = 0x64,
 				.port_src = 12345,
@@ -587,8 +587,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.deny = 27
 		}, /* should match 13, 27 */
 		{
-				.ip_dst = RTE_IPv4(2,2,3,4),
-				.ip_src = RTE_IPv4(4,6,7,8),
+				.ip_dst = RTE_IPV4(2,2,3,4),
+				.ip_src = RTE_IPV4(4,6,7,8),
 				.proto = 0x5,
 				.vlan = 0x64,
 				.port_src = 12345,
@@ -597,8 +597,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.deny = 23
 		}, /* should match 13, 23 */
 		{
-				.ip_dst = RTE_IPv4(1,2,3,4),
-				.ip_src = RTE_IPv4(4,6,7,8),
+				.ip_dst = RTE_IPV4(1,2,3,4),
+				.ip_src = RTE_IPV4(4,6,7,8),
 				.proto = 0x5,
 				.vlan = 0x64,
 				.port_src = 12345,
@@ -610,8 +610,8 @@ struct ipv4_7tuple acl_test_data[] = {
 
 /* visual separator! */
 		{
-				.ip_dst = RTE_IPv4(1,2,100,200),
-				.ip_src = RTE_IPv4(5,6,7,254),
+				.ip_dst = RTE_IPV4(1,2,100,200),
+				.ip_src = RTE_IPV4(5,6,7,254),
 				.proto = 0x55,
 				.vlan = 0x8000,
 				.domain = 0x6464,
@@ -620,8 +620,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.allow = 10
 		}, /* should match 10 */
 		{
-				.ip_dst = RTE_IPv4(5,6,7,254),
-				.ip_src = RTE_IPv4(1,2,100,200),
+				.ip_dst = RTE_IPV4(5,6,7,254),
+				.ip_src = RTE_IPV4(1,2,100,200),
 				.proto = 0x55,
 				.vlan = 0x8100,
 				.domain = 0x6464,
@@ -630,8 +630,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.allow = 10
 		}, /* should match 10 */
 		{
-				.ip_dst = RTE_IPv4(1,10,20,30),
-				.ip_src = RTE_IPv4(5,6,7,8),
+				.ip_dst = RTE_IPV4(1,10,20,30),
+				.ip_src = RTE_IPV4(5,6,7,8),
 				.proto = 0x55,
 				.vlan = 0x64,
 				.port_src = 12345,
@@ -639,8 +639,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.allow = 7
 		}, /* should match 7 */
 		{
-				.ip_dst = RTE_IPv4(5,6,7,8),
-				.ip_src = RTE_IPv4(1,10,20,30),
+				.ip_dst = RTE_IPV4(5,6,7,8),
+				.ip_src = RTE_IPV4(1,10,20,30),
 				.proto = 0x55,
 				.vlan = 0x64,
 				.port_src = 12345,
@@ -648,8 +648,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.allow = 7
 		}, /* should match 7 */
 		{
-				.ip_dst = RTE_IPv4(2,2,3,4),
-				.ip_src = RTE_IPv4(4,6,7,8),
+				.ip_dst = RTE_IPV4(2,2,3,4),
+				.ip_src = RTE_IPV4(4,6,7,8),
 				.proto = 0x55,
 				.vlan = 0x64,
 				.port_src = 12345,
@@ -657,8 +657,8 @@ struct ipv4_7tuple acl_test_data[] = {
 				.allow = 7
 		}, /* should match 7 */
 		{
-				.ip_dst = RTE_IPv4(1,2,3,4),
-				.ip_src = RTE_IPv4(4,6,7,8),
+				.ip_dst = RTE_IPV4(1,2,3,4),
+				.ip_src = RTE_IPV4(4,6,7,8),
 				.proto = 0x50,
 				.vlan = 0x6466,
 				.port_src = 12345,
diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index 2868712..73b3044 100644
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -58,36 +58,36 @@ static void print_key_info(const char *msg, const struct flow_key *key,
 /* Keys used by unit test functions */
 static struct flow_key keys[5] = {
 	{
-		.ip_src = RTE_IPv4(0x03, 0x02, 0x01, 0x00),
-		.ip_dst = RTE_IPv4(0x07, 0x06, 0x05, 0x04),
+		.ip_src = RTE_IPV4(0x03, 0x02, 0x01, 0x00),
+		.ip_dst = RTE_IPV4(0x07, 0x06, 0x05, 0x04),
 		.port_src = 0x0908,
 		.port_dst = 0x0b0a,
 		.proto = 0x0c,
 	},
 	{
-		.ip_src = RTE_IPv4(0x13, 0x12, 0x11, 0x10),
-		.ip_dst = RTE_IPv4(0x17, 0x16, 0x15, 0x14),
+		.ip_src = RTE_IPV4(0x13, 0x12, 0x11, 0x10),
+		.ip_dst = RTE_IPV4(0x17, 0x16, 0x15, 0x14),
 		.port_src = 0x1918,
 		.port_dst = 0x1b1a,
 		.proto = 0x1c,
 	},
 	{
-		.ip_src = RTE_IPv4(0x23, 0x22, 0x21, 0x20),
-		.ip_dst = RTE_IPv4(0x27, 0x26, 0x25, 0x24),
+		.ip_src = RTE_IPV4(0x23, 0x22, 0x21, 0x20),
+		.ip_dst = RTE_IPV4(0x27, 0x26, 0x25, 0x24),
 		.port_src = 0x2928,
 		.port_dst = 0x2b2a,
 		.proto = 0x2c,
 	},
 	{
-		.ip_src = RTE_IPv4(0x33, 0x32, 0x31, 0x30),
-		.ip_dst = RTE_IPv4(0x37, 0x36, 0x35, 0x34),
+		.ip_src = RTE_IPV4(0x33, 0x32, 0x31, 0x30),
+		.ip_dst = RTE_IPV4(0x37, 0x36, 0x35, 0x34),
 		.port_src = 0x3938,
 		.port_dst = 0x3b3a,
 		.proto = 0x3c,
 	},
 	{
-		.ip_src = RTE_IPv4(0x43, 0x42, 0x41, 0x40),
-		.ip_dst = RTE_IPv4(0x47, 0x46, 0x45, 0x44),
+		.ip_src = RTE_IPV4(0x43, 0x42, 0x41, 0x40),
+		.ip_dst = RTE_IPV4(0x47, 0x46, 0x45, 0x44),
 		.port_src = 0x4948,
 		.port_dst = 0x4b4a,
 		.proto = 0x4c,
diff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c
index f4d2fdc..cbbff31 100644
--- a/app/test/test_flow_classify.c
+++ b/app/test/test_flow_classify.c
@@ -96,7 +96,7 @@
  */
 static struct rte_flow_item_ipv4 ipv4_udp_spec_1 = {
 	{ 0, 0, 0, 0, 0, 0, IPPROTO_UDP, 0,
-	  RTE_IPv4(2, 2, 2, 3), RTE_IPv4(2, 2, 2, 7)}
+	  RTE_IPV4(2, 2, 2, 3), RTE_IPV4(2, 2, 2, 7)}
 };
 static const struct rte_flow_item_ipv4 ipv4_mask_24 = {
 	.hdr = {
@@ -133,7 +133,7 @@
  */
 static struct rte_flow_item_ipv4 ipv4_tcp_spec_1 = {
 	{ 0, 0, 0, 0, 0, 0, IPPROTO_TCP, 0,
-	  RTE_IPv4(1, 2, 3, 4), RTE_IPv4(5, 6, 7, 8)}
+	  RTE_IPV4(1, 2, 3, 4), RTE_IPV4(5, 6, 7, 8)}
 };
 
 static struct rte_flow_item_tcp tcp_spec_1 = {
@@ -151,8 +151,8 @@
  *  dst mask 255.255.255.00 / sctp src is 16 dst is 17/ end"
  */
 static struct rte_flow_item_ipv4 ipv4_sctp_spec_1 = {
-	{ 0, 0, 0, 0, 0, 0, IPPROTO_SCTP, 0, RTE_IPv4(11, 12, 13, 14),
-	RTE_IPv4(15, 16, 17, 18)}
+	{ 0, 0, 0, 0, 0, 0, IPPROTO_SCTP, 0, RTE_IPV4(11, 12, 13, 14),
+	RTE_IPV4(15, 16, 17, 18)}
 };
 
 static struct rte_flow_item_sctp sctp_spec_1 = {
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 8271ba7..0052dce 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -104,32 +104,32 @@ static void print_key_info(const char *msg, const struct flow_key *key,
 
 /* Keys used by unit test functions */
 static struct flow_key keys[5] = { {
-	.ip_src = RTE_IPv4(0x03, 0x02, 0x01, 0x00),
-	.ip_dst = RTE_IPv4(0x07, 0x06, 0x05, 0x04),
+	.ip_src = RTE_IPV4(0x03, 0x02, 0x01, 0x00),
+	.ip_dst = RTE_IPV4(0x07, 0x06, 0x05, 0x04),
 	.port_src = 0x0908,
 	.port_dst = 0x0b0a,
 	.proto = 0x0c,
 }, {
-	.ip_src = RTE_IPv4(0x13, 0x12, 0x11, 0x10),
-	.ip_dst = RTE_IPv4(0x17, 0x16, 0x15, 0x14),
+	.ip_src = RTE_IPV4(0x13, 0x12, 0x11, 0x10),
+	.ip_dst = RTE_IPV4(0x17, 0x16, 0x15, 0x14),
 	.port_src = 0x1918,
 	.port_dst = 0x1b1a,
 	.proto = 0x1c,
 }, {
-	.ip_src = RTE_IPv4(0x23, 0x22, 0x21, 0x20),
-	.ip_dst = RTE_IPv4(0x27, 0x26, 0x25, 0x24),
+	.ip_src = RTE_IPV4(0x23, 0x22, 0x21, 0x20),
+	.ip_dst = RTE_IPV4(0x27, 0x26, 0x25, 0x24),
 	.port_src = 0x2928,
 	.port_dst = 0x2b2a,
 	.proto = 0x2c,
 }, {
-	.ip_src = RTE_IPv4(0x33, 0x32, 0x31, 0x30),
-	.ip_dst = RTE_IPv4(0x37, 0x36, 0x35, 0x34),
+	.ip_src = RTE_IPV4(0x33, 0x32, 0x31, 0x30),
+	.ip_dst = RTE_IPV4(0x37, 0x36, 0x35, 0x34),
 	.port_src = 0x3938,
 	.port_dst = 0x3b3a,
 	.proto = 0x3c,
 }, {
-	.ip_src = RTE_IPv4(0x43, 0x42, 0x41, 0x40),
-	.ip_dst = RTE_IPv4(0x47, 0x46, 0x45, 0x44),
+	.ip_src = RTE_IPV4(0x43, 0x42, 0x41, 0x40),
+	.ip_dst = RTE_IPV4(0x47, 0x46, 0x45, 0x44),
 	.port_src = 0x4948,
 	.port_dst = 0x4b4a,
 	.proto = 0x4c,
diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index 606e319..3993ff4 100644
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -536,8 +536,8 @@ struct rte_ipv4_hdr ipv4_outer  = {
 		sizeof(ipv4_outer) / RTE_IPV4_IHL_MULTIPLIER,
 	.time_to_live = IPDEFTTL,
 	.next_proto_id = IPPROTO_ESP,
-	.src_addr = RTE_IPv4(192, 168, 1, 100),
-	.dst_addr = RTE_IPv4(192, 168, 2, 100),
+	.src_addr = RTE_IPV4(192, 168, 1, 100),
+	.dst_addr = RTE_IPV4(192, 168, 2, 100),
 };
 
 static struct rte_mbuf *
diff --git a/app/test/test_link_bonding_mode4.c b/app/test/test_link_bonding_mode4.c
index 784501a..bbb4e9c 100644
--- a/app/test/test_link_bonding_mode4.c
+++ b/app/test/test_link_bonding_mode4.c
@@ -729,8 +729,8 @@ struct link_bonding_unittest_params {
 
 	uint16_t src_port = 10, dst_port = 20;
 
-	uint32_t ip_src[4] = { [0 ... 2] = 0xDEADBEEF, [3] = RTE_IPv4(192, 168, 0, 1) };
-	uint32_t ip_dst[4] = { [0 ... 2] = 0xFEEDFACE, [3] = RTE_IPv4(192, 168, 0, 2) };
+	uint32_t ip_src[4] = { [0 ... 2] = 0xDEADBEEF, [3] = RTE_IPV4(192, 168, 0, 1) };
+	uint32_t ip_dst[4] = { [0 ... 2] = 0xFEEDFACE, [3] = RTE_IPV4(192, 168, 0, 2) };
 
 	struct rte_ether_hdr pkt_eth_hdr;
 	struct rte_udp_hdr pkt_udp_hdr;
diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index 0f24631..e969fe0 100644
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -165,7 +165,7 @@
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	uint32_t ip = RTE_IPv4(0, 0, 0, 0), next_hop = 100;
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0), next_hop = 100;
 	uint8_t depth = 24;
 	int32_t status = 0;
 
@@ -203,7 +203,7 @@
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	uint32_t ip = RTE_IPv4(0, 0, 0, 0);
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0);
 	uint8_t depth = 24;
 	int32_t status = 0;
 
@@ -242,7 +242,7 @@
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	uint32_t ip = RTE_IPv4(0, 0, 0, 0), next_hop_return = 0;
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0), next_hop_return = 0;
 	int32_t status = 0;
 
 	/* rte_lpm_lookup: lpm == NULL */
@@ -276,7 +276,7 @@
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	uint32_t ip = RTE_IPv4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;
 	uint8_t depth = 24;
 	int32_t status = 0;
 
@@ -315,7 +315,7 @@
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	uint32_t ip = RTE_IPv4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;
 	uint8_t depth = 32;
 	int32_t status = 0;
 
@@ -366,7 +366,7 @@
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	uint32_t ip1 = RTE_IPv4(127, 255, 255, 255), ip2 = RTE_IPv4(128, 0, 0, 0);
+	uint32_t ip1 = RTE_IPV4(127, 255, 255, 255), ip2 = RTE_IPV4(128, 0, 0, 0);
 	uint32_t next_hop_add, next_hop_return;
 	uint8_t depth;
 	int32_t status = 0;
@@ -457,7 +457,7 @@
 	int32_t status = 0;
 
 	/* Add & lookup to hit invalid TBL24 entry */
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add = 100;
 
@@ -479,7 +479,7 @@
 	rte_lpm_delete_all(lpm);
 
 	/* Add & lookup to hit valid TBL24 entry not extended */
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 23;
 	next_hop_add = 100;
 
@@ -515,7 +515,7 @@
 
 	/* Add & lookup to hit valid extended TBL24 entry with invalid TBL8
 	 * entry */
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 	next_hop_add = 100;
 
@@ -525,7 +525,7 @@
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = RTE_IPv4(128, 0, 0, 5);
+	ip = RTE_IPV4(128, 0, 0, 5);
 	depth = 32;
 	next_hop_add = 101;
 
@@ -541,7 +541,7 @@
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT(status == -ENOENT);
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 	next_hop_add = 100;
 
@@ -558,11 +558,11 @@
 
 	/* Add & lookup to hit valid extended TBL24 entry with valid TBL8
 	 * entry */
-	ip_1 = RTE_IPv4(128, 0, 0, 0);
+	ip_1 = RTE_IPV4(128, 0, 0, 0);
 	depth_1 = 25;
 	next_hop_add_1 = 101;
 
-	ip_2 = RTE_IPv4(128, 0, 0, 5);
+	ip_2 = RTE_IPV4(128, 0, 0, 5);
 	depth_2 = 32;
 	next_hop_add_2 = 102;
 
@@ -629,7 +629,7 @@
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 16;
 	next_hop_add = 100;
 
@@ -647,7 +647,7 @@
 
 	rte_lpm_delete_all(lpm);
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 25;
 	next_hop_add = 100;
 
@@ -665,14 +665,14 @@
 	/* Add rule that extends a TBL24 valid entry & lookup for both rules
 	 * (& delete & lookup) */
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add = 100;
 
 	status = rte_lpm_add(lpm, ip, depth, next_hop_add);
 	TEST_LPM_ASSERT(status == 0);
 
-	ip = RTE_IPv4(128, 0, 0, 10);
+	ip = RTE_IPV4(128, 0, 0, 10);
 	depth = 32;
 	next_hop_add = 101;
 
@@ -682,13 +682,13 @@
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	next_hop_add = 100;
 
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -697,7 +697,7 @@
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT(status == -ENOENT);
 
-	ip = RTE_IPv4(128, 0, 0, 10);
+	ip = RTE_IPV4(128, 0, 0, 10);
 	depth = 32;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -711,7 +711,7 @@
 	/* Add rule that updates the next hop in TBL24 & lookup
 	 * (& delete & lookup) */
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add = 100;
 
@@ -740,7 +740,7 @@
 	/* Add rule that updates the next hop in TBL8 & lookup
 	 * (& delete & lookup) */
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 	next_hop_add = 100;
 
@@ -768,7 +768,7 @@
 
 	/* Delete a rule that is not present in the TBL24 & lookup */
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -781,7 +781,7 @@
 
 	/* Delete a rule that is not present in the TBL8 & lookup */
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -818,14 +818,14 @@
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add = 100;
 
 	status = rte_lpm_add(lpm, ip, depth, next_hop_add);
 	TEST_LPM_ASSERT(status == 0);
 
-	ip = RTE_IPv4(128, 0, 0, 10);
+	ip = RTE_IPV4(128, 0, 0, 10);
 	depth = 32;
 	next_hop_add = 101;
 
@@ -835,13 +835,13 @@
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	next_hop_add = 100;
 
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -850,7 +850,7 @@
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT(status == -ENOENT);
 
-	ip = RTE_IPv4(128, 0, 0, 10);
+	ip = RTE_IPV4(128, 0, 0, 10);
 	depth = 32;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -889,7 +889,7 @@
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 	next_hop_add = 100;
 
@@ -944,7 +944,7 @@
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = RTE_IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add_1 = 100;
 
@@ -1014,10 +1014,10 @@
 
 	depth = 32;
 	next_hop_add = 100;
-	ip = RTE_IPv4(0, 0, 0, 0);
+	ip = RTE_IPV4(0, 0, 0, 0);
 
 	/* Add 256 rules that require a tbl8 extension */
-	for (; ip <= RTE_IPv4(0, 0, 255, 0); ip += 256) {
+	for (; ip <= RTE_IPV4(0, 0, 255, 0); ip += 256) {
 		status = rte_lpm_add(lpm, ip, depth, next_hop_add);
 		TEST_LPM_ASSERT(status == 0);
 
@@ -1028,7 +1028,7 @@
 
 	/* All tbl8 extensions have been used above. Try to add one more and
 	 * we get a fail */
-	ip = RTE_IPv4(1, 0, 0, 0);
+	ip = RTE_IPV4(1, 0, 0, 0);
 	depth = 32;
 
 	status = rte_lpm_add(lpm, ip, depth, next_hop_add);
@@ -1125,9 +1125,9 @@
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	const uint32_t ip_10_32 = RTE_IPv4(10, 10, 10, 2);
-	const uint32_t ip_10_24 = RTE_IPv4(10, 10, 10, 0);
-	const uint32_t ip_20_25 = RTE_IPv4(10, 10, 20, 2);
+	const uint32_t ip_10_32 = RTE_IPV4(10, 10, 10, 2);
+	const uint32_t ip_10_24 = RTE_IPV4(10, 10, 10, 0);
+	const uint32_t ip_20_25 = RTE_IPV4(10, 10, 20, 2);
 	const uint8_t d_ip_10_32 = 32,
 			d_ip_10_24 = 24,
 			d_ip_20_25 = 25;
@@ -1221,7 +1221,7 @@
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = RTE_IPv4(192, 168, 100, 100);
+	ip = RTE_IPV4(192, 168, 100, 100);
 	depth = 28;
 	next_hop = 1;
 	rte_lpm_add(lpm, ip, depth, next_hop);
diff --git a/app/test/test_lpm_perf.c b/app/test/test_lpm_perf.c
index b546503..77eea66 100644
--- a/app/test/test_lpm_perf.c
+++ b/app/test/test_lpm_perf.c
@@ -285,11 +285,11 @@ static void generate_large_route_rule_table(void)
 	 * they are 4 rules with private local IP address and 1 all-zeros prefix
 	 * with depth = 8.
 	 */
-	insert_rule_in_random_pos(RTE_IPv4(0, 0, 0, 0), 8);
-	insert_rule_in_random_pos(RTE_IPv4(10, 2, 23, 147), 32);
-	insert_rule_in_random_pos(RTE_IPv4(192, 168, 100, 10), 24);
-	insert_rule_in_random_pos(RTE_IPv4(192, 168, 25, 100), 24);
-	insert_rule_in_random_pos(RTE_IPv4(192, 168, 129, 124), 32);
+	insert_rule_in_random_pos(RTE_IPV4(0, 0, 0, 0), 8);
+	insert_rule_in_random_pos(RTE_IPV4(10, 2, 23, 147), 32);
+	insert_rule_in_random_pos(RTE_IPV4(192, 168, 100, 10), 24);
+	insert_rule_in_random_pos(RTE_IPV4(192, 168, 25, 100), 24);
+	insert_rule_in_random_pos(RTE_IPV4(192, 168, 129, 124), 32);
 }
 
 static void
diff --git a/app/test/test_member.c b/app/test/test_member.c
index 53287fc..748ddcc 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -41,36 +41,36 @@ struct flow_key {
 /* Keys used by unit test functions */
 static struct flow_key keys[NUM_SAMPLES] = {
 	{
-		.ip_src = RTE_IPv4(0x03, 0x02, 0x01, 0x00),
-		.ip_dst = RTE_IPv4(0x07, 0x06, 0x05, 0x04),
+		.ip_src = RTE_IPV4(0x03, 0x02, 0x01, 0x00),
+		.ip_dst = RTE_IPV4(0x07, 0x06, 0x05, 0x04),
 		.port_src = 0x0908,
 		.port_dst = 0x0b0a,
 		.proto = 0x0c,
 	},
 	{
-		.ip_src = RTE_IPv4(0x13, 0x12, 0x11, 0x10),
-		.ip_dst = RTE_IPv4(0x17, 0x16, 0x15, 0x14),
+		.ip_src = RTE_IPV4(0x13, 0x12, 0x11, 0x10),
+		.ip_dst = RTE_IPV4(0x17, 0x16, 0x15, 0x14),
 		.port_src = 0x1918,
 		.port_dst = 0x1b1a,
 		.proto = 0x1c,
 	},
 	{
-		.ip_src = RTE_IPv4(0x23, 0x22, 0x21, 0x20),
-		.ip_dst = RTE_IPv4(0x27, 0x26, 0x25, 0x24),
+		.ip_src = RTE_IPV4(0x23, 0x22, 0x21, 0x20),
+		.ip_dst = RTE_IPV4(0x27, 0x26, 0x25, 0x24),
 		.port_src = 0x2928,
 		.port_dst = 0x2b2a,
 		.proto = 0x2c,
 	},
 	{
-		.ip_src = RTE_IPv4(0x33, 0x32, 0x31, 0x30),
-		.ip_dst = RTE_IPv4(0x37, 0x36, 0x35, 0x34),
+		.ip_src = RTE_IPV4(0x33, 0x32, 0x31, 0x30),
+		.ip_dst = RTE_IPV4(0x37, 0x36, 0x35, 0x34),
 		.port_src = 0x3938,
 		.port_dst = 0x3b3a,
 		.proto = 0x3c,
 	},
 	{
-		.ip_src = RTE_IPv4(0x43, 0x42, 0x41, 0x40),
-		.ip_dst = RTE_IPv4(0x47, 0x46, 0x45, 0x44),
+		.ip_src = RTE_IPV4(0x43, 0x42, 0x41, 0x40),
+		.ip_dst = RTE_IPV4(0x47, 0x46, 0x45, 0x44),
 		.port_src = 0x4948,
 		.port_dst = 0x4b4a,
 		.proto = 0x4c,
diff --git a/app/test/test_sched.c b/app/test/test_sched.c
index 10d54c5..5873ee4 100644
--- a/app/test/test_sched.c
+++ b/app/test/test_sched.c
@@ -96,7 +96,7 @@
 	vlan1->vlan_tci = rte_cpu_to_be_16(SUBPORT);
 	vlan2->vlan_tci = rte_cpu_to_be_16(PIPE);
 	eth_hdr->ether_type =  rte_cpu_to_be_16(RTE_ETHER_TYPE_IPv4);
-	ip_hdr->dst_addr = RTE_IPv4(0,0,TC,QUEUE);
+	ip_hdr->dst_addr = RTE_IPV4(0,0,TC,QUEUE);
 
 
 	rte_sched_port_pkt_write(port, mbuf, SUBPORT, PIPE, TC, QUEUE,
diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c
index cb039c0..0bdf76a 100644
--- a/app/test/test_table_acl.c
+++ b/app/test/test_table_acl.c
@@ -112,7 +112,7 @@ enum {
 	GET_CB_FIELD(in, d, 0, UINT8_MAX, '/');
 	GET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0);
 
-	addr[0] = RTE_IPv4(a, b, c, d);
+	addr[0] = RTE_IPV4(a, b, c, d);
 	mask_len[0] = m;
 
 	return 0;
@@ -658,8 +658,8 @@ enum {
 				sizeof(struct ipv4_5tuple));
 
 			five_tuple.proto = j;
-			five_tuple.ip_src = rte_bswap32(RTE_IPv4(192, 168, j, 1));
-			five_tuple.ip_dst = rte_bswap32(RTE_IPv4(10, 4, j, 1));
+			five_tuple.ip_src = rte_bswap32(RTE_IPV4(192, 168, j, 1));
+			five_tuple.ip_dst = rte_bswap32(RTE_IPV4(10, 4, j, 1));
 			five_tuple.port_src = rte_bswap16(100 + j);
 			five_tuple.port_dst = rte_bswap16(200 + j);
 
diff --git a/app/test/test_thash.c b/app/test/test_thash.c
index 3724ea5..5a6912c 100644
--- a/app/test/test_thash.c
+++ b/app/test/test_thash.c
@@ -59,15 +59,15 @@ struct test_thash_v6 {
 
 /*From 82599 Datasheet 7.1.2.8.3 RSS Verification Suite*/
 struct test_thash_v4 v4_tbl[] = {
-{RTE_IPv4(161, 142, 100, 80), RTE_IPv4(66, 9, 149, 187),
+{RTE_IPV4(161, 142, 100, 80), RTE_IPV4(66, 9, 149, 187),
 	1766, 2794, 0x323e8fc2, 0x51ccc178},
-{RTE_IPv4(65, 69, 140, 83), RTE_IPv4(199, 92, 111, 2),
+{RTE_IPV4(65, 69, 140, 83), RTE_IPV4(199, 92, 111, 2),
 	4739, 14230, 0xd718262a, 0xc626b0ea},
-{RTE_IPv4(12, 22, 207, 184), RTE_IPv4(24, 19, 198, 95),
+{RTE_IPV4(12, 22, 207, 184), RTE_IPV4(24, 19, 198, 95),
 	38024, 12898, 0xd2d0a5de, 0x5c2b394a},
-{RTE_IPv4(209, 142, 163, 6), RTE_IPv4(38, 27, 205, 30),
+{RTE_IPV4(209, 142, 163, 6), RTE_IPV4(38, 27, 205, 30),
 	2217, 48228, 0x82989176, 0xafc7327f},
-{RTE_IPv4(202, 188, 127, 2), RTE_IPv4(153, 39, 163, 191),
+{RTE_IPV4(202, 188, 127, 2), RTE_IPV4(153, 39, 163, 191),
 	1303, 44251, 0x5d1809c5, 0x10e828a2},
 };
 
diff --git a/doc/guides/prog_guide/packet_classif_access_ctrl.rst b/doc/guides/prog_guide/packet_classif_access_ctrl.rst
index 010ec04..c16b11a 100644
--- a/doc/guides/prog_guide/packet_classif_access_ctrl.rst
+++ b/doc/guides/prog_guide/packet_classif_access_ctrl.rst
@@ -419,7 +419,7 @@ Classify with Multiple Categories
             .data = {.userdata = 1, .category_mask = 3, .priority = 1},
 
             /* destination IPv4 */
-            .field[2] = {.value.u32 = RTE_IPv4(192,168,0,0),. mask_range.u32 = 16,},
+            .field[2] = {.value.u32 = RTE_IPV4(192,168,0,0),. mask_range.u32 = 16,},
 
             /* source port */
             .field[3] = {.value.u16 = 0, .mask_range.u16 = 0xffff,},
@@ -433,7 +433,7 @@ Classify with Multiple Categories
             .data = {.userdata = 2, .category_mask = 1, .priority = 2},
 
             /* destination IPv4 */
-            .field[2] = {.value.u32 = RTE_IPv4(192,168,1,0),. mask_range.u32 = 24,},
+            .field[2] = {.value.u32 = RTE_IPV4(192,168,1,0),. mask_range.u32 = 24,},
 
             /* source port */
             .field[3] = {.value.u16 = 0, .mask_range.u16 = 0xffff,},
@@ -447,7 +447,7 @@ Classify with Multiple Categories
             .data = {.userdata = 3, .category_mask = 2, .priority = 3},
 
             /* source IPv4 */
-            .field[1] = {.value.u32 = RTE_IPv4(10,1,1,1),. mask_range.u32 = 32,},
+            .field[1] = {.value.u32 = RTE_IPV4(10,1,1,1),. mask_range.u32 = 32,},
 
             /* source port */
             .field[3] = {.value.u16 = 0, .mask_range.u16 = 0xffff,},
diff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst
index 49ba0d8..afeaff3 100644
--- a/doc/guides/sample_app_ug/ip_frag.rst
+++ b/doc/guides/sample_app_ug/ip_frag.rst
@@ -104,14 +104,14 @@ The default l3fwd_ipv4_route_array table is:
 .. code-block:: c
 
     struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {
-        {RTE_IPv4(100, 10, 0, 0), 16, 0},
-        {RTE_IPv4(100, 20, 0, 0), 16, 1},
-        {RTE_IPv4(100, 30, 0, 0), 16, 2},
-        {RTE_IPv4(100, 40, 0, 0), 16, 3},
-        {RTE_IPv4(100, 50, 0, 0), 16, 4},
-        {RTE_IPv4(100, 60, 0, 0), 16, 5},
-        {RTE_IPv4(100, 70, 0, 0), 16, 6},
-        {RTE_IPv4(100, 80, 0, 0), 16, 7},
+        {RTE_IPV4(100, 10, 0, 0), 16, 0},
+        {RTE_IPV4(100, 20, 0, 0), 16, 1},
+        {RTE_IPV4(100, 30, 0, 0), 16, 2},
+        {RTE_IPV4(100, 40, 0, 0), 16, 3},
+        {RTE_IPV4(100, 50, 0, 0), 16, 4},
+        {RTE_IPV4(100, 60, 0, 0), 16, 5},
+        {RTE_IPV4(100, 70, 0, 0), 16, 6},
+        {RTE_IPV4(100, 80, 0, 0), 16, 7},
     };
 
 The default l3fwd_ipv6_route_array table is:
diff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst
index 99dcd95..f34b9d0 100644
--- a/doc/guides/sample_app_ug/ip_reassembly.rst
+++ b/doc/guides/sample_app_ug/ip_reassembly.rst
@@ -107,14 +107,14 @@ The default l3fwd_ipv4_route_array table is:
 .. code-block:: c
 
     struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {
-        {RTE_IPv4(100, 10, 0, 0), 16, 0},
-        {RTE_IPv4(100, 20, 0, 0), 16, 1},
-        {RTE_IPv4(100, 30, 0, 0), 16, 2},
-        {RTE_IPv4(100, 40, 0, 0), 16, 3},
-        {RTE_IPv4(100, 50, 0, 0), 16, 4},
-        {RTE_IPv4(100, 60, 0, 0), 16, 5},
-        {RTE_IPv4(100, 70, 0, 0), 16, 6},
-        {RTE_IPv4(100, 80, 0, 0), 16, 7},
+        {RTE_IPV4(100, 10, 0, 0), 16, 0},
+        {RTE_IPV4(100, 20, 0, 0), 16, 1},
+        {RTE_IPV4(100, 30, 0, 0), 16, 2},
+        {RTE_IPV4(100, 40, 0, 0), 16, 3},
+        {RTE_IPV4(100, 50, 0, 0), 16, 4},
+        {RTE_IPV4(100, 60, 0, 0), 16, 5},
+        {RTE_IPV4(100, 70, 0, 0), 16, 6},
+        {RTE_IPV4(100, 80, 0, 0), 16, 7},
     };
 
 The default l3fwd_ipv6_route_array table is:
diff --git a/examples/flow_classify/flow_classify.c b/examples/flow_classify/flow_classify.c
index 75a66fd..bc7f43e 100644
--- a/examples/flow_classify/flow_classify.c
+++ b/examples/flow_classify/flow_classify.c
@@ -379,7 +379,7 @@ static __attribute__((noreturn)) void
 	if (get_cb_field(&in, &m, 0, sizeof(uint32_t) * CHAR_BIT, 0))
 		return -EINVAL;
 
-	addr[0] = RTE_IPv4(a, b, c, d);
+	addr[0] = RTE_IPV4(a, b, c, d);
 	mask_len[0] = m;
 	return 0;
 }
diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index f8b3033..4f94129 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -169,14 +169,14 @@ struct l3fwd_ipv4_route {
 };
 
 struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {
-		{RTE_IPv4(100,10,0,0), 16, 0},
-		{RTE_IPv4(100,20,0,0), 16, 1},
-		{RTE_IPv4(100,30,0,0), 16, 2},
-		{RTE_IPv4(100,40,0,0), 16, 3},
-		{RTE_IPv4(100,50,0,0), 16, 4},
-		{RTE_IPv4(100,60,0,0), 16, 5},
-		{RTE_IPv4(100,70,0,0), 16, 6},
-		{RTE_IPv4(100,80,0,0), 16, 7},
+		{RTE_IPV4(100,10,0,0), 16, 0},
+		{RTE_IPV4(100,20,0,0), 16, 1},
+		{RTE_IPV4(100,30,0,0), 16, 2},
+		{RTE_IPV4(100,40,0,0), 16, 3},
+		{RTE_IPV4(100,50,0,0), 16, 4},
+		{RTE_IPV4(100,60,0,0), 16, 5},
+		{RTE_IPV4(100,70,0,0), 16, 6},
+		{RTE_IPV4(100,80,0,0), 16, 7},
 };
 
 /*
diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index 8351270..6624b19 100644
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -190,14 +190,14 @@ struct l3fwd_ipv4_route {
 };
 
 struct l3fwd_ipv4_route l3fwd_ipv4_route_array[] = {
-		{RTE_IPv4(100,10,0,0), 16, 0},
-		{RTE_IPv4(100,20,0,0), 16, 1},
-		{RTE_IPv4(100,30,0,0), 16, 2},
-		{RTE_IPv4(100,40,0,0), 16, 3},
-		{RTE_IPv4(100,50,0,0), 16, 4},
-		{RTE_IPv4(100,60,0,0), 16, 5},
-		{RTE_IPv4(100,70,0,0), 16, 6},
-		{RTE_IPv4(100,80,0,0), 16, 7},
+		{RTE_IPV4(100,10,0,0), 16, 0},
+		{RTE_IPV4(100,20,0,0), 16, 1},
+		{RTE_IPV4(100,30,0,0), 16, 2},
+		{RTE_IPV4(100,40,0,0), 16, 3},
+		{RTE_IPV4(100,50,0,0), 16, 4},
+		{RTE_IPV4(100,60,0,0), 16, 5},
+		{RTE_IPV4(100,70,0,0), 16, 6},
+		{RTE_IPV4(100,80,0,0), 16, 7},
 };
 
 /*
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 8a3d894..8d47d1d 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -951,7 +951,7 @@ struct sa_ctx {
 		if (rc6 >= 0) {
 			RTE_LOG(ERR, IPSEC,
 				"%s: SPI %u used simultaeously by "
-				"RTE_IPv4(%d) and IPv6 (%d) SP rules\n",
+				"RTE_IPV4(%d) and IPv6 (%d) SP rules\n",
 				__func__, spi, rc4, rc6);
 			return -EINVAL;
 		} else
diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 15f2b4b..e4410f5 100644
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -138,21 +138,21 @@ struct mcast_group_params {
 };
 
 static struct mcast_group_params mcast_group_table[] = {
-		{RTE_IPv4(224,0,0,101), 0x1},
-		{RTE_IPv4(224,0,0,102), 0x2},
-		{RTE_IPv4(224,0,0,103), 0x3},
-		{RTE_IPv4(224,0,0,104), 0x4},
-		{RTE_IPv4(224,0,0,105), 0x5},
-		{RTE_IPv4(224,0,0,106), 0x6},
-		{RTE_IPv4(224,0,0,107), 0x7},
-		{RTE_IPv4(224,0,0,108), 0x8},
-		{RTE_IPv4(224,0,0,109), 0x9},
-		{RTE_IPv4(224,0,0,110), 0xA},
-		{RTE_IPv4(224,0,0,111), 0xB},
-		{RTE_IPv4(224,0,0,112), 0xC},
-		{RTE_IPv4(224,0,0,113), 0xD},
-		{RTE_IPv4(224,0,0,114), 0xE},
-		{RTE_IPv4(224,0,0,115), 0xF},
+		{RTE_IPV4(224,0,0,101), 0x1},
+		{RTE_IPV4(224,0,0,102), 0x2},
+		{RTE_IPV4(224,0,0,103), 0x3},
+		{RTE_IPV4(224,0,0,104), 0x4},
+		{RTE_IPV4(224,0,0,105), 0x5},
+		{RTE_IPV4(224,0,0,106), 0x6},
+		{RTE_IPV4(224,0,0,107), 0x7},
+		{RTE_IPV4(224,0,0,108), 0x8},
+		{RTE_IPV4(224,0,0,109), 0x9},
+		{RTE_IPV4(224,0,0,110), 0xA},
+		{RTE_IPV4(224,0,0,111), 0xB},
+		{RTE_IPV4(224,0,0,112), 0xC},
+		{RTE_IPV4(224,0,0,113), 0xD},
+		{RTE_IPV4(224,0,0,114), 0xE},
+		{RTE_IPV4(224,0,0,115), 0xF},
 };
 
 #define N_MCAST_GROUPS \
diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index 40ab5a5..09b7c38 100644
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -901,7 +901,7 @@ struct acl_search_t {
 	GET_CB_FIELD(in, d, 0, UINT8_MAX, '/');
 	GET_CB_FIELD(in, m, 0, sizeof(uint32_t) * CHAR_BIT, 0);
 
-	addr[0] = RTE_IPv4(a, b, c, d);
+	addr[0] = RTE_IPV4(a, b, c, d);
 	mask_len[0] = m;
 
 	return 0;
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index d72a01e..641d402 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -258,10 +258,10 @@ struct ipv6_l3fwd_route {
 };
 
 static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
-	{{RTE_IPv4(100,10,0,1), RTE_IPv4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},
-	{{RTE_IPv4(100,20,0,2), RTE_IPv4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},
-	{{RTE_IPv4(100,30,0,3), RTE_IPv4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},
-	{{RTE_IPv4(100,40,0,4), RTE_IPv4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},
+	{{RTE_IPV4(100,10,0,1), RTE_IPV4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},
+	{{RTE_IPV4(100,20,0,2), RTE_IPV4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},
+	{{RTE_IPV4(100,30,0,3), RTE_IPV4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},
+	{{RTE_IPV4(100,40,0,4), RTE_IPV4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},
 };
 
 static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
@@ -300,14 +300,14 @@ struct ipv4_l3fwd_route {
 };
 
 static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
-	{RTE_IPv4(1,1,1,0), 24, 0},
-	{RTE_IPv4(2,1,1,0), 24, 1},
-	{RTE_IPv4(3,1,1,0), 24, 2},
-	{RTE_IPv4(4,1,1,0), 24, 3},
-	{RTE_IPv4(5,1,1,0), 24, 4},
-	{RTE_IPv4(6,1,1,0), 24, 5},
-	{RTE_IPv4(7,1,1,0), 24, 6},
-	{RTE_IPv4(8,1,1,0), 24, 7},
+	{RTE_IPV4(1,1,1,0), 24, 0},
+	{RTE_IPV4(2,1,1,0), 24, 1},
+	{RTE_IPV4(3,1,1,0), 24, 2},
+	{RTE_IPV4(4,1,1,0), 24, 3},
+	{RTE_IPV4(5,1,1,0), 24, 4},
+	{RTE_IPV4(6,1,1,0), 24, 5},
+	{RTE_IPV4(7,1,1,0), 24, 6},
+	{RTE_IPV4(8,1,1,0), 24, 7},
 };
 
 #define IPV4_L3FWD_NUM_ROUTES \
diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index 0ef469c..9594867 100644
--- a/examples/l3fwd-vf/main.c
+++ b/examples/l3fwd-vf/main.c
@@ -201,10 +201,10 @@ struct l3fwd_route {
 };
 
 static struct l3fwd_route l3fwd_route_array[] = {
-	{{RTE_IPv4(100,10,0,1), RTE_IPv4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},
-	{{RTE_IPv4(100,20,0,2), RTE_IPv4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},
-	{{RTE_IPv4(100,30,0,3), RTE_IPv4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},
-	{{RTE_IPv4(100,40,0,4), RTE_IPv4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},
+	{{RTE_IPV4(100,10,0,1), RTE_IPV4(200,10,0,1), 101, 11, IPPROTO_TCP}, 0},
+	{{RTE_IPV4(100,20,0,2), RTE_IPV4(200,20,0,2), 102, 12, IPPROTO_TCP}, 1},
+	{{RTE_IPV4(100,30,0,3), RTE_IPV4(200,30,0,3), 103, 13, IPPROTO_TCP}, 2},
+	{{RTE_IPV4(100,40,0,4), RTE_IPV4(200,40,0,4), 104, 14, IPPROTO_TCP}, 3},
 };
 
 typedef struct rte_hash lookup_struct_t;
@@ -234,14 +234,14 @@ struct l3fwd_route {
 };
 
 static struct l3fwd_route l3fwd_route_array[] = {
-	{RTE_IPv4(1,1,1,0), 24, 0},
-	{RTE_IPv4(2,1,1,0), 24, 1},
-	{RTE_IPv4(3,1,1,0), 24, 2},
-	{RTE_IPv4(4,1,1,0), 24, 3},
-	{RTE_IPv4(5,1,1,0), 24, 4},
-	{RTE_IPv4(6,1,1,0), 24, 5},
-	{RTE_IPv4(7,1,1,0), 24, 6},
-	{RTE_IPv4(8,1,1,0), 24, 7},
+	{RTE_IPV4(1,1,1,0), 24, 0},
+	{RTE_IPV4(2,1,1,0), 24, 1},
+	{RTE_IPV4(3,1,1,0), 24, 2},
+	{RTE_IPV4(4,1,1,0), 24, 3},
+	{RTE_IPV4(5,1,1,0), 24, 4},
+	{RTE_IPV4(6,1,1,0), 24, 5},
+	{RTE_IPV4(7,1,1,0), 24, 6},
+	{RTE_IPV4(8,1,1,0), 24, 7},
 };
 
 #define L3FWD_NUM_ROUTES \
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 2911bbe..6d3c6cd 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -99,10 +99,10 @@ struct ipv6_l3fwd_em_route {
 };
 
 static struct ipv4_l3fwd_em_route ipv4_l3fwd_em_route_array[] = {
-	{{RTE_IPv4(101, 0, 0, 0), RTE_IPv4(100, 10, 0, 1),  101, 11, IPPROTO_TCP}, 0},
-	{{RTE_IPv4(201, 0, 0, 0), RTE_IPv4(200, 20, 0, 1),  102, 12, IPPROTO_TCP}, 1},
-	{{RTE_IPv4(111, 0, 0, 0), RTE_IPv4(100, 30, 0, 1),  101, 11, IPPROTO_TCP}, 2},
-	{{RTE_IPv4(211, 0, 0, 0), RTE_IPv4(200, 40, 0, 1),  102, 12, IPPROTO_TCP}, 3},
+	{{RTE_IPV4(101, 0, 0, 0), RTE_IPV4(100, 10, 0, 1),  101, 11, IPPROTO_TCP}, 0},
+	{{RTE_IPV4(201, 0, 0, 0), RTE_IPV4(200, 20, 0, 1),  102, 12, IPPROTO_TCP}, 1},
+	{{RTE_IPV4(111, 0, 0, 0), RTE_IPV4(100, 30, 0, 1),  101, 11, IPPROTO_TCP}, 2},
+	{{RTE_IPV4(211, 0, 0, 0), RTE_IPV4(200, 40, 0, 1),  102, 12, IPPROTO_TCP}, 3},
 };
 
 static struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = {
@@ -426,19 +426,19 @@ struct ipv6_l3fwd_em_route {
 		switch (i & (NUMBER_PORT_USED - 1)) {
 		case 0:
 			entry = ipv4_l3fwd_em_route_array[0];
-			entry.key.ip_dst = RTE_IPv4(101, c, b, a);
+			entry.key.ip_dst = RTE_IPV4(101, c, b, a);
 			break;
 		case 1:
 			entry = ipv4_l3fwd_em_route_array[1];
-			entry.key.ip_dst = RTE_IPv4(201, c, b, a);
+			entry.key.ip_dst = RTE_IPV4(201, c, b, a);
 			break;
 		case 2:
 			entry = ipv4_l3fwd_em_route_array[2];
-			entry.key.ip_dst = RTE_IPv4(111, c, b, a);
+			entry.key.ip_dst = RTE_IPV4(111, c, b, a);
 			break;
 		case 3:
 			entry = ipv4_l3fwd_em_route_array[3];
-			entry.key.ip_dst = RTE_IPv4(211, c, b, a);
+			entry.key.ip_dst = RTE_IPV4(211, c, b, a);
 			break;
 		};
 		convert_ipv4_5tuple(&entry.key, &newkey);
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 6bfc3be..b5ffd6a 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -43,14 +43,14 @@ struct ipv6_l3fwd_lpm_route {
 
 /* 192.18.0.0/16 are set aside for RFC2544 benchmarking. */
 static struct ipv4_l3fwd_lpm_route ipv4_l3fwd_lpm_route_array[] = {
-	{RTE_IPv4(192, 18, 0, 0), 24, 0},
-	{RTE_IPv4(192, 18, 1, 0), 24, 1},
-	{RTE_IPv4(192, 18, 2, 0), 24, 2},
-	{RTE_IPv4(192, 18, 3, 0), 24, 3},
-	{RTE_IPv4(192, 18, 4, 0), 24, 4},
-	{RTE_IPv4(192, 18, 5, 0), 24, 5},
-	{RTE_IPv4(192, 18, 6, 0), 24, 6},
-	{RTE_IPv4(192, 18, 7, 0), 24, 7},
+	{RTE_IPV4(192, 18, 0, 0), 24, 0},
+	{RTE_IPV4(192, 18, 1, 0), 24, 1},
+	{RTE_IPV4(192, 18, 2, 0), 24, 2},
+	{RTE_IPV4(192, 18, 3, 0), 24, 3},
+	{RTE_IPV4(192, 18, 4, 0), 24, 4},
+	{RTE_IPV4(192, 18, 5, 0), 24, 5},
+	{RTE_IPV4(192, 18, 6, 0), 24, 6},
+	{RTE_IPV4(192, 18, 7, 0), 24, 7},
 };
 
 /* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180) */
diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c
index 3640579..19b826e 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -380,10 +380,10 @@ struct ipv6_l3fwd_route {
 };
 
 static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
-	{{RTE_IPv4(101, 0, 0, 0), RTE_IPv4(100, 10, 0, 1),  101, 11, IPPROTO_TCP}, 0},
-	{{RTE_IPv4(201, 0, 0, 0), RTE_IPv4(200, 20, 0, 1),  102, 12, IPPROTO_TCP}, 1},
-	{{RTE_IPv4(111, 0, 0, 0), RTE_IPv4(100, 30, 0, 1),  101, 11, IPPROTO_TCP}, 2},
-	{{RTE_IPv4(211, 0, 0, 0), RTE_IPv4(200, 40, 0, 1),  102, 12, IPPROTO_TCP}, 3},
+	{{RTE_IPV4(101, 0, 0, 0), RTE_IPV4(100, 10, 0, 1),  101, 11, IPPROTO_TCP}, 0},
+	{{RTE_IPV4(201, 0, 0, 0), RTE_IPV4(200, 20, 0, 1),  102, 12, IPPROTO_TCP}, 1},
+	{{RTE_IPV4(111, 0, 0, 0), RTE_IPV4(100, 30, 0, 1),  101, 11, IPPROTO_TCP}, 2},
+	{{RTE_IPV4(211, 0, 0, 0), RTE_IPV4(200, 40, 0, 1),  102, 12, IPPROTO_TCP}, 3},
 };
 
 static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
@@ -503,14 +503,14 @@ struct ipv6_l3fwd_route {
 };
 
 static struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
-	{RTE_IPv4(1, 1, 1, 0), 24, 0},
-	{RTE_IPv4(2, 1, 1, 0), 24, 1},
-	{RTE_IPv4(3, 1, 1, 0), 24, 2},
-	{RTE_IPv4(4, 1, 1, 0), 24, 3},
-	{RTE_IPv4(5, 1, 1, 0), 24, 4},
-	{RTE_IPv4(6, 1, 1, 0), 24, 5},
-	{RTE_IPv4(7, 1, 1, 0), 24, 6},
-	{RTE_IPv4(8, 1, 1, 0), 24, 7},
+	{RTE_IPV4(1, 1, 1, 0), 24, 0},
+	{RTE_IPV4(2, 1, 1, 0), 24, 1},
+	{RTE_IPV4(3, 1, 1, 0), 24, 2},
+	{RTE_IPV4(4, 1, 1, 0), 24, 3},
+	{RTE_IPV4(5, 1, 1, 0), 24, 4},
+	{RTE_IPV4(6, 1, 1, 0), 24, 5},
+	{RTE_IPV4(7, 1, 1, 0), 24, 6},
+	{RTE_IPV4(8, 1, 1, 0), 24, 7},
 };
 
 static struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
@@ -3145,19 +3145,19 @@ static void convert_ipv6_5tuple(struct ipv6_5tuple *key1,
 		switch (i & (NUMBER_PORT_USED - 1)) {
 		case 0:
 			entry = ipv4_l3fwd_route_array[0];
-			entry.key.ip_dst = RTE_IPv4(101, c, b, a);
+			entry.key.ip_dst = RTE_IPV4(101, c, b, a);
 			break;
 		case 1:
 			entry = ipv4_l3fwd_route_array[1];
-			entry.key.ip_dst = RTE_IPv4(201, c, b, a);
+			entry.key.ip_dst = RTE_IPV4(201, c, b, a);
 			break;
 		case 2:
 			entry = ipv4_l3fwd_route_array[2];
-			entry.key.ip_dst = RTE_IPv4(111, c, b, a);
+			entry.key.ip_dst = RTE_IPV4(111, c, b, a);
 			break;
 		case 3:
 			entry = ipv4_l3fwd_route_array[3];
-			entry.key.ip_dst = RTE_IPv4(211, c, b, a);
+			entry.key.ip_dst = RTE_IPV4(211, c, b, a);
 			break;
 		};
 		convert_ipv4_5tuple(&entry.key, &newkey);
diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 9b1944b..ae3b7e7 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -42,7 +42,7 @@ struct rte_ipv4_hdr {
 } __attribute__((__packed__));
 
 /** Create IPv4 address */
-#define RTE_IPv4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) | \
+#define RTE_IPV4(a, b, c, d) ((uint32_t)(((a) & 0xff) << 24) | \
 					   (((b) & 0xff) << 16) | \
 					   (((c) & 0xff) << 8)  | \
 					   ((d) & 0xff))
@@ -84,9 +84,9 @@ struct rte_ipv4_hdr {
  * IPv4 Multicast-related macros
  */
 #define RTE_IPV4_MIN_MCAST \
-	RTE_IPv4(224, 0, 0, 0)          /**< Minimal IPv4-multicast address */
+	RTE_IPV4(224, 0, 0, 0)          /**< Minimal IPv4-multicast address */
 #define RTE_IPV4_MAX_MCAST \
-	RTE_IPv4(239, 255, 255, 255)    /**< Maximum IPv4 multicast address */
+	RTE_IPV4(239, 255, 255, 255)    /**< Maximum IPv4 multicast address */
 
 #define RTE_IS_IPV4_MCAST(x) \
 	((x) >= RTE_IPV4_MIN_MCAST && (x) <= RTE_IPV4_MAX_MCAST)
