diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.c b/NetworkPkg/IScsiDxe/IScsiMisc.c
index 010d2a4800..f5c54e7018 100644
--- a/NetworkPkg/IScsiDxe/IScsiMisc.c
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.c
@@ -1400,7 +1400,7 @@ IScsiGetTcpConnDevicePath (
 
         PathLen = DevicePathNodeLength (&DPathNode->Ipv4);
         
-        if (PathLen == IPv4_NODE_LEN_NEW_VERSIONS) {  
+        if (PathLen == IP4_NODE_LEN_NEW_VERSIONS) {  
             
           IP4_COPY_ADDRESS (
             &DPathNode->Ipv4.GatewayIpAddress,
@@ -1427,19 +1427,19 @@ IScsiGetTcpConnDevicePath (
 
         PathLen = DevicePathNodeLength (&DPathNode->Ipv6);
         
-        if (PathLen == IPv6_NODE_LEN_NEW_VERSIONS ) { 
+        if (PathLen == IP6_NODE_LEN_NEW_VERSIONS ) { 
 
           DPathNode->Ipv6.IpAddressOrigin = 0;
           DPathNode->Ipv6.PrefixLength    = IP6_PREFIX_LENGTH;
           ZeroMem (&DPathNode->Ipv6.GatewayIpAddress, sizeof (EFI_IPv6_ADDRESS));
         }
-        else if (PathLen == IPv6_NODE_LEN_OLD_VERSIONS) { 
+        else if (PathLen == IP6_NODE_LEN_OLD_VERSIONS) { 
 
           //
           //  StaticIPAddress is a field in old versions of IPv6_DEVICE_PATH, while ignored in new 
           //  version. Set StaticIPAddress through its' offset in old IPv6_DEVICE_PATH.
           //
-          *((UINT8 *)(&DPathNode->Ipv6) + IPv6_OLD_IPADDRESS_OFFSET) = 
+          *((UINT8 *)(&DPathNode->Ipv6) + IP6_OLD_IPADDRESS_OFFSET) = 
             (BOOLEAN) (!Session->ConfigData->SessionConfigData.InitiatorInfoFromDhcp);
         }
         
diff --git a/NetworkPkg/IScsiDxe/IScsiMisc.h b/NetworkPkg/IScsiDxe/IScsiMisc.h
index bcf92157fa..6a762e3596 100644
--- a/NetworkPkg/IScsiDxe/IScsiMisc.h
+++ b/NetworkPkg/IScsiDxe/IScsiMisc.h
@@ -20,18 +20,18 @@ typedef struct _ISCSI_DRIVER_DATA ISCSI_DRIVER_DATA;
 ///
 /// IPv4 Device Path Node Length
 ///
-#define IPv4_NODE_LEN_NEW_VERSIONS    27
+#define IP4_NODE_LEN_NEW_VERSIONS    27
 
 ///
 /// IPv6 Device Path Node Length
 ///
-#define IPv6_NODE_LEN_OLD_VERSIONS    43
-#define IPv6_NODE_LEN_NEW_VERSIONS    60
+#define IP6_NODE_LEN_OLD_VERSIONS    43
+#define IP6_NODE_LEN_NEW_VERSIONS    60
 
 ///
 /// The ignored field StaticIpAddress's offset in old IPv6 Device Path
 ///
-#define IPv6_OLD_IPADDRESS_OFFSET      42
+#define IP6_OLD_IPADDRESS_OFFSET      42
 
 #pragma pack(1)
 typedef struct _ISCSI_SESSION_CONFIG_NVDATA {