diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 8a6f339c16..e10f5ba2a5 100644
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -879,23 +879,7 @@ typedef struct {
 ///
 /// PIWG Firmware Volume Device Path SubType
 ///
-#define MEDIA_PIWG_FW_VOL_DP      0x7
-
-///
-/// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware volume.
-///
-typedef struct {
-  EFI_DEVICE_PATH_PROTOCOL        Header;
-  ///
-  /// Firmware volume name.
-  ///
-  EFI_GUID                        FvName;
-} MEDIA_FW_VOL_DEVICE_PATH;
-
-///
-/// PIWG Firmware Volume Device Path SubType
-///
-#define MEDIA_PIWG_FW_FILE_DP     0x6
+#define MEDIA_PIWG_FW_FILE_DP     0x06
 
 ///
 /// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware file.
@@ -908,6 +892,22 @@ typedef struct {
   EFI_GUID                        FvFileName;
 } MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;
 
+///
+/// PIWG Firmware Volume Device Path SubType
+///
+#define MEDIA_PIWG_FW_VOL_DP      0x07
+
+///
+/// This device path is used by systems implementing the UEFI PI Specification 1.0 to describe a firmware volume.
+///
+typedef struct {
+  EFI_DEVICE_PATH_PROTOCOL        Header;
+  ///
+  /// Firmware volume name.
+  ///
+  EFI_GUID                        FvName;
+} MEDIA_FW_VOL_DEVICE_PATH;
+
 ///
 /// Media relative offset range device path
 ///
@@ -918,6 +918,7 @@ typedef struct {
 ///
 typedef struct {
   EFI_DEVICE_PATH_PROTOCOL  Header;
+  UINT32                    Reserved;
   UINT64                    StartingOffset;
   UINT64                    EndingOffset;
 } MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH;