diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscDevicePath.h b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscDevicePath.h
index 1568e27b32..dd78a7af12 100644
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscDevicePath.h
+++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscDevicePath.h
@@ -41,22 +41,22 @@ Abstract:
 // #define pci( device,function)  { 0x01, 0x01, 0x00, 0x06, device, function }
 // #define end  { 0xFF, 0xFF, 0x00, 0x04 }
 //
-#define ACPI \
+#define DP_ACPI \
   { \
     ACPI_DEVICE_PATH, ACPI_DP, (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \
       ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), EISA_PNP_ID (0x0A03), 0 \
   }
-#define PCI(device, function) \
+#define DP_PCI(device, function) \
   { \
     HARDWARE_DEVICE_PATH, HW_PCI_DP, (UINT8) (sizeof (PCI_DEVICE_PATH)), (UINT8) \
       ((sizeof (PCI_DEVICE_PATH)) >> 8), function, device \
   }
-#define END \
+#define DP_END \
   { \
     END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, END_DEVICE_PATH_LENGTH, 0 \
   }
 
-#define LPC(eisaid, function) \
+#define DP_LPC(eisaid, function) \
   { \
     ACPI_DEVICE_PATH, ACPI_DP, (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), (UINT8) \
       ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), EISA_PNP_ID (eisaid), function \
diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c
index a57c18c69b..35351aa2df 100644
--- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c
+++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c
@@ -70,20 +70,20 @@ Returns:
 --*/
 {
   STATIC BOOLEAN                    Done                    = FALSE;
-  STATIC PS2_CONN_DEVICE_PATH       mPs2KeyboardDevicePath  = { ACPI, PCI (0x1F, 0x00), LPC (0x0303, 0), END };
-  STATIC PS2_CONN_DEVICE_PATH       mPs2MouseDevicePath     = { ACPI, PCI (0x1F, 0x00), LPC (0x0303, 1), END };
-  STATIC SERIAL_CONN_DEVICE_PATH    mCom1DevicePath         = { ACPI, PCI (0x1F, 0x00), LPC (0x0501, 0), END };
-  STATIC SERIAL_CONN_DEVICE_PATH    mCom2DevicePath         = { ACPI, PCI (0x1F, 0x00), LPC (0x0501, 1), END };
-  STATIC PARALLEL_CONN_DEVICE_PATH  mLpt1DevicePath         = { ACPI, PCI (0x1F, 0x00), LPC (0x0401, 0), END };
-  STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyADevicePath      = { ACPI, PCI (0x1F, 0x00), LPC (0x0604, 0), END };
-  STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyBDevicePath      = { ACPI, PCI (0x1F, 0x00), LPC (0x0604, 1), END };
-  STATIC USB_PORT_DEVICE_PATH       mUsb0DevicePath         = { ACPI, PCI (0x1d, 0x00), END };
-  STATIC USB_PORT_DEVICE_PATH       mUsb1DevicePath         = { ACPI, PCI (0x1d, 0x01), END };
-  STATIC USB_PORT_DEVICE_PATH       mUsb2DevicePath         = { ACPI, PCI (0x1d, 0x02), END };
-  STATIC USB_PORT_DEVICE_PATH       mUsb3DevicePath         = { ACPI, PCI (0x1d, 0x07), END };
-  STATIC IDE_DEVICE_PATH            mIdeDevicePath          = { ACPI, PCI (0x1F, 0x01), END };
-  STATIC GB_NIC_DEVICE_PATH         mGbNicDevicePath        = { ACPI, PCI( 0x03,0x00 ),PCI( 0x1F,0x00 ),PCI( 0x07,0x00 ), END };
-  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath           = END;
+  STATIC PS2_CONN_DEVICE_PATH       mPs2KeyboardDevicePath  = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0303, 0), DP_END };
+  STATIC PS2_CONN_DEVICE_PATH       mPs2MouseDevicePath     = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0303, 1), DP_END };
+  STATIC SERIAL_CONN_DEVICE_PATH    mCom1DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 0), DP_END };
+  STATIC SERIAL_CONN_DEVICE_PATH    mCom2DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 1), DP_END };
+  STATIC PARALLEL_CONN_DEVICE_PATH  mLpt1DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };
+  STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyADevicePath      = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 0), DP_END };
+  STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyBDevicePath      = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };
+  STATIC USB_PORT_DEVICE_PATH       mUsb0DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };
+  STATIC USB_PORT_DEVICE_PATH       mUsb1DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };
+  STATIC USB_PORT_DEVICE_PATH       mUsb2DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };
+  STATIC USB_PORT_DEVICE_PATH       mUsb3DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };
+  STATIC IDE_DEVICE_PATH            mIdeDevicePath          = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };
+  STATIC GB_NIC_DEVICE_PATH         mGbNicDevicePath        = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };
+  EFI_DEVICE_PATH_PROTOCOL          EndDevicePath           = DP_END;
 
   //
   // First check for invalid parameters.