diff --git a/DuetPkg/FvbRuntimeService/FWBlockService.c b/DuetPkg/FvbRuntimeService/FWBlockService.c
index faca5ea422..6926a43dcf 100644
--- a/DuetPkg/FvbRuntimeService/FWBlockService.c
+++ b/DuetPkg/FvbRuntimeService/FWBlockService.c
@@ -1751,7 +1751,7 @@ Returns:
                       NULL
                       );
       ASSERT_EFI_ERROR (Status);
-    } else if (EfiIsDevicePathEnd (TempFwbDevicePath)) {
+    } else if (IsDevicePathEnd (TempFwbDevicePath)) {
       //
       // Device allready exists, so reinstall the FVB protocol
       //
diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c
index a33ce38af7..83ab7de0f6 100644
--- a/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c
@@ -598,8 +598,8 @@ Returns:
       //
       // Get the next device path
       //
-      CurrentDevicePath = EfiNextDevicePathNode (RemainingDevicePath);
-      if (EfiIsDevicePathEnd (CurrentDevicePath)) {
+      CurrentDevicePath = NextDevicePathNode (RemainingDevicePath);
+      if (IsDevicePathEnd (CurrentDevicePath)) {
         return EFI_SUCCESS;
       }