diff --git a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c
index 6f88a90f4e..42dd5fd21f 100644
--- a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c
+++ b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c
@@ -65,7 +65,7 @@ UndiNotifyVirtual (
     // UNDI32DeviceList is an array of pointers
     //
     for (Index = 0; Index < pxe_31->IFcnt; Index++) {
-      UNDI32DeviceList[Index]->NIIProtocol_31.ID = (UINT64) (UINTN) Pxe31Pointer;
+      UNDI32DeviceList[Index]->NIIProtocol_31.Id = (UINT64) (UINTN) Pxe31Pointer;
       EfiConvertPointer (
         EFI_OPTIONAL_PTR,
         (VOID **) &(UNDI32DeviceList[Index])
@@ -346,7 +346,7 @@ UndiDriverStart (
     PxeStructInit (pxe_31);
   }
 
-  UNDI32Device->NIIProtocol_31.ID = (UINT64) (UINTN) (pxe_31);
+  UNDI32Device->NIIProtocol_31.Id = (UINT64) (UINTN) (pxe_31);
 
   Status = PciIoFncs->Attributes (
                         PciIoFncs,
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index dde0d6021f..7e98baa8eb 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -178,13 +178,13 @@ SimpleNetworkDriverSupported (
   //
   // Check to see if !PXE structure is valid. Paragraph alignment of !PXE structure is required.
   //
-  if (NiiProtocol->ID & 0x0F) {
+  if (NiiProtocol->Id & 0x0F) {
     DEBUG ((EFI_D_NET, "\n!PXE structure is not paragraph aligned.\n"));
     Status = EFI_UNSUPPORTED;
     goto Done;
   }
 
-  Pxe = (PXE_UNDI *) (UINTN) (NiiProtocol->ID);
+  Pxe = (PXE_UNDI *) (UINTN) (NiiProtocol->Id);
 
   //
   //  Verify !PXE revisions.
@@ -341,7 +341,7 @@ SimpleNetworkDriverStart (
 
   DEBUG ((EFI_D_INFO, "Start(): UNDI3.1 found\n"));
 
-  Pxe = (PXE_UNDI *) (UINTN) (Nii->ID);
+  Pxe = (PXE_UNDI *) (UINTN) (Nii->Id);
 
   if (Calc8BitCksum (Pxe, Pxe->hw.Len) != 0) {
     DEBUG ((EFI_D_NET, "\n!PXE checksum is not correct.\n"));