61 files changed, 72 insertions, 72 deletions
diff --git a/IntelFrameworkModulePkg/Include/Library/OemHookStatusCodeLib.h b/IntelFrameworkModulePkg/Include/Library/OemHookStatusCodeLib.h
index 533df317ff..b26189c941 100644
--- a/IntelFrameworkModulePkg/Include/Library/OemHookStatusCodeLib.h
+++ b/IntelFrameworkModulePkg/Include/Library/OemHookStatusCodeLib.h
@@ -52,7 +52,7 @@ OemHookStatusCodeInitialize (
 
   @param  CallerId      This optional parameter may be used to identify the caller. 
                         This parameter allows the status code driver to apply different rules to different callers. 
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
index a489288761..510ca90ae3 100644
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.c
@@ -705,7 +705,7 @@ Returns:
   }
   //
   // The length of the field 'Position Set Code Length Array Size' in Block Header.
-  // For EFI 1.1 de/compression algorithm(Version 1), mPBit = 4
+  // For UEFI 2.0 de/compression algorithm(Version 1), mPBit = 4
   // For Tiano de/compression algorithm(Version 2), mPBit = 5
   //
   switch (Version) {
diff --git a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
index c83d79ef0f..a1eb9d587c 100644
--- a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
+++ b/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLibInternals.h
@@ -72,7 +72,7 @@ typedef struct {
 
   //
   // The length of the field 'Position Set Code Length Array Size' in Block Header.
-  // For EFI 1.1 de/compression algorithm, mPBit = 4
+  // For UEFI 2.0 de/compression algorithm, mPBit = 4
   // For Tiano de/compression algorithm, mPBit = 5
   //
   UINT8   mPBit;
diff --git a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
index 76a1bd7613..b9df977052 100644
--- a/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
+++ b/IntelFrameworkModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.c
@@ -52,7 +52,7 @@ OemHookStatusCodeInitialize (
 
   @param  CallerId      This optional parameter may be used to identify the caller. 
                         This parameter allows the status code driver to apply different rules to different callers. 
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
index c14dfc8d33..0936c093eb 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
@@ -173,7 +173,7 @@ ReleaseRecord (
 
   @param  CallerId      This optional parameter may be used to identify the caller.
                         This parameter allows the status code driver to apply different rules to different callers.
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 4bcb2482a0..429e760a2f 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
@@ -132,7 +132,7 @@ EfiSerialStatusCodeInitializeWorker (
 
   @param  CallerId      This optional parameter may be used to identify the caller.
                         This parameter allows the status code driver to apply different rules to different callers.
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
@@ -226,7 +226,7 @@ DataHubStatusCodeInitializeWorker (
 
   @param  CallerId      This optional parameter may be used to identify the caller.
                         This parameter allows the status code driver to apply different rules to different callers.
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
index 567bacaa8a..3aa4a10a64 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
@@ -64,7 +64,7 @@ EfiSerialStatusCodeInitializeWorker (
 
   @param  CallerId      This optional parameter may be used to identify the caller. 
                         This parameter allows the status code driver to apply different rules to different callers. 
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
index c7350d86ad..960de8fd91 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.h
@@ -58,7 +58,7 @@
 
   @param  CallerId      This optional parameter may be used to identify the caller.
                         This parameter allows the status code driver to apply different rules to different callers.
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
index a23eca0049..4000f372a1 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
@@ -38,7 +38,7 @@
 
   @param  CallerId      This optional parameter may be used to identify the caller.
                         This parameter allows the status code driver to apply different rules to different callers.
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/IntelFrameworkPkg/Include/Framework/DxeCis.h b/IntelFrameworkPkg/Include/Framework/DxeCis.h
index 9c5a28ea51..f86ba26e40 100644
--- a/IntelFrameworkPkg/Include/Framework/DxeCis.h
+++ b/IntelFrameworkPkg/Include/Framework/DxeCis.h
@@ -1,5 +1,5 @@
 /** @file
-  Include file that supportes Framework extension to the EFI 1.10 spec.
+  Include file that supportes Framework extension to the UEFI 2.0 spec.
 
   This include file must only contain things defined in the Framework
   specifications. If a code construct is defined in the Framework specification
@@ -66,7 +66,7 @@ typedef struct {
   EFI_RESET_SYSTEM              ResetSystem;
 
   //
-  // Framework extension to EFI 1.10 runtime table
+  // Framework extension to UEFI 2.0 runtime table
   // It was moved to a protocol to not conflict with UEFI 2.0
   //
   EFI_REPORT_STATUS_CODE        ReportStatusCode;
diff --git a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
index 87a02889ee..2db71ebc14 100644
--- a/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
+++ b/IntelFrameworkPkg/Include/Protocol/PciPlatform.h
@@ -143,7 +143,7 @@ EFI_STATUS
   The GetPciRom() function gets the PCI device's option ROM from a platform-specific location.
   The option ROM will be loaded into memory. This member function is used to return an image
   that is packaged as a PCI 2.2 option ROM. The image may contain both legacy and EFI option
-  ROMs. See the EFI 1.10 Specification for details. This member function can be used to return
+  ROMs. See the UEFI 2.0 Specification for details. This member function can be used to return
   option ROM images for embedded controllers. Option ROMs for embedded controllers are typically
   stored in platform-specific storage, and this member function can retrieve it from that storage
   and return it to the PCI bus driver. The PCI bus driver will call this member function before
diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index da0555d8f9..0529d36d79 100644
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -244,7 +244,7 @@ Returns:
       DriverEntry->DepexProtocolError = TRUE;
     } else {
       //
-      // If no Depex assume EFI 1.1 driver model
+      // If no Depex assume UEFI 2.0 driver model
       //
       DriverEntry->Depex = NULL;
       DriverEntry->Dependent = TRUE;
diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/dependency.c b/MdeModulePkg/Core/Dxe/Dispatcher/dependency.c
index 7c2093b61d..84c44a10ee 100644
--- a/MdeModulePkg/Core/Dxe/Dispatcher/dependency.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/dependency.c
@@ -280,7 +280,7 @@ Returns:
 
   if (DriverEntry->Depex == NULL) {
     //
-    // A NULL Depex means treat the driver like an EFI 1.0 thing.
+    // A NULL Depex means treat the driver like an UEFI 2.0 thing.
     //
     Status = CoreAllEfiServicesAvailable ();
     if (EFI_ERROR (Status)) {
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index b4da26a63d..16b7d8c10c 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -595,7 +595,7 @@ CoreExitBootServices (
 
 Routine Description:
 
-  EFI 1.0 API to terminate Boot Services
+  UEFI 2.0 API to terminate Boot Services
 
 Arguments:
 
diff --git a/MdeModulePkg/Core/Dxe/Event/event.c b/MdeModulePkg/Core/Dxe/Event/event.c
index b3ba71de81..c4d6eeb553 100644
--- a/MdeModulePkg/Core/Dxe/Event/event.c
+++ b/MdeModulePkg/Core/Dxe/Event/event.c
@@ -330,7 +330,7 @@ Returns:
   Function = NotifyFunction;
 
   //
-  // Convert EFI 1.10 Events to thier UEFI 2.0 CreateEventEx mapping
+  // Convert EFI 1.10 Events to their UEFI 2.0 CreateEventEx mapping
   //
   if (Type == EVT_SIGNAL_EXIT_BOOT_SERVICES) {
     GuidPtr = &gEfiEventExitBootServicesGuid;
diff --git a/MdeModulePkg/Include/Protocol/LoadPe32Image.h b/MdeModulePkg/Include/Protocol/LoadPe32Image.h
index 1ea29896b8..155604d5df 100644
--- a/MdeModulePkg/Include/Protocol/LoadPe32Image.h
+++ b/MdeModulePkg/Include/Protocol/LoadPe32Image.h
@@ -13,13 +13,13 @@ Module Name:
   LoadPe32Image.h
 
 Abstract:
-  Load File protocol as defined in the EFI 1.0 specification.
+  Load File protocol.
 
   Load file protocol exists to supports the addition of new boot devices,
   and to support booting from devices that do not map well to file system.
   Network boot is done via a LoadFile protocol.
 
-  EFI 1.0 can boot from any device that produces a LoadFile protocol.
+  UEFI 2.0 can boot from any device that produces a LoadFile protocol.
 
 --*/
 
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 00bb438bbd..ee96eabdd6 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -1,7 +1,7 @@
 /**@file
   This is the main routine for initializing the Graphics Console support routines.
 Remaining Tasks
-  Add all standard Glyphs from EFI 1.02 Specification
+  Add all standard Glyphs from UEFI 2.0 Specification
   Implement optimal automatic Mode creation algorithm
   Solve palette issues for mixed graphics and text
   When does this protocol reset the palette?
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 4b3eb37023..a4ad034989 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -1160,7 +1160,7 @@ Symbols used in table below
   ^   = CTRL
 
 +=========+======+===========+==========+==========+
-|         | EFI  | EFI 1.10  |          |          |
+|         | EFI  | UEFI 2.0  |          |          |
 |         | Scan |           |  VT100+  |          |
 |   KEY   | Code |  PC ANSI  |  VTUTF8  |   VT100  |
 +=========+======+===========+==========+==========+
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
index 86e0b851ed..e3e47302a3 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
@@ -500,7 +500,7 @@ Routine Description:
   EFI_UNSUPPORTED
 
 Arguments:
-  Per EFI 1.10 driver model
+  Per UEFI 2.0 driver model
   
 Returns:
   EFI_UNSUPPORTED
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index 00f5ec06e0..7dcb9b45b2 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -1,5 +1,5 @@
 /** @file
-  Decode a hard disk partitioned with the GPT scheme in the EFI 1.0
+  Decode a hard disk partitioned with the GPT scheme in the UEFI 2.0
   specification.
 
   Copyright (c) 2006 - 2007, Intel Corporation                                              
diff --git a/MdePkg/Include/Guid/FileInfo.h b/MdePkg/Include/Guid/FileInfo.h
index d36a39c24a..31c9c73951 100644
--- a/MdePkg/Include/Guid/FileInfo.h
+++ b/MdePkg/Include/Guid/FileInfo.h
@@ -1,11 +1,11 @@
 /** @file
-  SimpleFileSystem guid and data structure as defined in the EFI 1.0 specification.
+  SimpleFileSystem guid and data structure as defined in the UEFI 2.0 specification.
 
   The SimpleFileSystem protocol is the programatic access to the FAT (12,16,32) 
-  file system specified in EFI 1.0. It can also be used to abstract any 
+  file system specified in UEFI 2.0. It can also be used to abstract any 
   file system other than FAT.
 
-  EFI 1.0 can boot from any valid EFI image contained in a SimpleFileSystem
+  UEFI 2.0 can boot from any valid EFI image contained in a SimpleFileSystem
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Guid/FileSystemInfo.h b/MdePkg/Include/Guid/FileSystemInfo.h
index 6088d3ab4f..a965fb5036 100644
--- a/MdePkg/Include/Guid/FileSystemInfo.h
+++ b/MdePkg/Include/Guid/FileSystemInfo.h
@@ -1,5 +1,5 @@
 /** @file
-  FileSystemInfo guid and data structure as defined in the EFI 1.0 specification.
+  FileSystemInfo guid and data structure as defined in the UEFI 2.0 specification.
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
index cb94aaaca2..6413ee7da0 100644
--- a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
+++ b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
@@ -1,5 +1,5 @@
 /** @file
-  FileSystemVolumeLabelInfo guid and data structure as defined in the EFI 1.0 specification.
+  FileSystemVolumeLabelInfo guid and data structure as defined in the UEFI 2.0 specification.
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Guid/Mps.h b/MdePkg/Include/Guid/Mps.h
index f14c32cc5f..169ec9d09e 100644
--- a/MdePkg/Include/Guid/Mps.h
+++ b/MdePkg/Include/Guid/Mps.h
@@ -1,5 +1,5 @@
 /** @file
-  GUIDs used for MPS entries in the EFI 1.0 system table
+  GUIDs used for MPS entries in the UEFI 2.0 system table
   ACPI is the primary means of exporting MP information to the OS. MPS obly was
   included to support Itanium-based platform power on. So don't use it if you don't have too.
 
diff --git a/MdePkg/Include/Guid/SmBios.h b/MdePkg/Include/Guid/SmBios.h
index 7efd15427b..98cd4ed22f 100644
--- a/MdePkg/Include/Guid/SmBios.h
+++ b/MdePkg/Include/Guid/SmBios.h
@@ -1,5 +1,5 @@
 /** @file
-  GUIDs used to locate the SMBIOS tables in the EFI 1.0 system table.
+  GUIDs used to locate the SMBIOS tables in the UEFI 2.0 system table.
 
   This GUID in the system table is the only legal way to search for and 
   locate the SMBIOS tables. Do not search the 0xF0000 segment to find SMBIOS
diff --git a/MdePkg/Include/Protocol/BlockIo.h b/MdePkg/Include/Protocol/BlockIo.h
index f349cd65ee..2654976aa6 100644
--- a/MdePkg/Include/Protocol/BlockIo.h
+++ b/MdePkg/Include/Protocol/BlockIo.h
@@ -1,5 +1,5 @@
 /** @file
-  Block IO protocol as defined in the EFI 1.0 specification.
+  Block IO protocol as defined in the UEFI 2.0 specification.
 
   The Block IO protocol is used to abstract block devices like hard drives,
   DVD-ROMs and floppy drives.
diff --git a/MdePkg/Include/Protocol/BusSpecificDriverOverride.h b/MdePkg/Include/Protocol/BusSpecificDriverOverride.h
index 1251236ac8..73af98686c 100644
--- a/MdePkg/Include/Protocol/BusSpecificDriverOverride.h
+++ b/MdePkg/Include/Protocol/BusSpecificDriverOverride.h
@@ -1,5 +1,5 @@
 /** @file
-  Bus Specific Driver Override protocol as defined in the EFI 1.1 specification.
+  Bus Specific Driver Override protocol as defined in the UEFI 2.0 specification.
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Protocol/DeviceIo.h b/MdePkg/Include/Protocol/DeviceIo.h
index 0138b7a247..760ca9b471 100644
--- a/MdePkg/Include/Protocol/DeviceIo.h
+++ b/MdePkg/Include/Protocol/DeviceIo.h
@@ -1,5 +1,5 @@
 /** @file
-  Device IO protocol as defined in the EFI 1.0 specification.
+  Device IO protocol as defined in the EFI 1.10 specification.
 
   Device IO is used to abstract hardware access to devices. It includes
   memory mapped IO, IO, PCI Config space, and DMA.
diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 524a3912d2..2ca008ac65 100644
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -1,5 +1,5 @@
 /** @file
-  The device path protocol as defined in EFI 1.0.
+  The device path protocol as defined in UEFI 2.0.
 
   The device path represents a programatic path to a device. It's the view
   from a software point of view. It also must persist from boot to boot, so 
diff --git a/MdePkg/Include/Protocol/DiskIo.h b/MdePkg/Include/Protocol/DiskIo.h
index 0bf53cbb3d..c499c84c38 100644
--- a/MdePkg/Include/Protocol/DiskIo.h
+++ b/MdePkg/Include/Protocol/DiskIo.h
@@ -1,5 +1,5 @@
 /** @file
-  Disk IO protocol as defined in the EFI 1.0 specification.
+  Disk IO protocol as defined in the UEFI 2.0 specification.
 
   The Disk IO protocol is used to convert block oriented devices into byte
   oriented devices. The Disk IO protocol is intended to layer on top of the
diff --git a/MdePkg/Include/Protocol/DriverConfiguration.h b/MdePkg/Include/Protocol/DriverConfiguration.h
index 34f1a641dd..7f10318f9d 100644
--- a/MdePkg/Include/Protocol/DriverConfiguration.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration.h
@@ -18,7 +18,7 @@
 #include <Protocol/DriverConfiguration2.h>
 
 //
-// Global ID for the Driver Configuration Protocol defined in EFI 1.10
+// Global ID for the Driver Configuration Protocol defined in UEFI 2.0
 //
 #define EFI_DRIVER_CONFIGURATION_PROTOCOL_GUID \
   { \
diff --git a/MdePkg/Include/Protocol/DriverDiagnostics.h b/MdePkg/Include/Protocol/DriverDiagnostics.h
index 3270f766b8..d04bf4917a 100644
--- a/MdePkg/Include/Protocol/DriverDiagnostics.h
+++ b/MdePkg/Include/Protocol/DriverDiagnostics.h
@@ -16,7 +16,7 @@
 #define __EFI_DRIVER_DIAGNOSTICS_H__
 
 //
-// Global ID for the Driver Diagnostics Protocol as defined in EFI 1.10.
+// Global ID for the Driver Diagnostics Protocol as defined in UEFI 2.0.
 //
 #define EFI_DRIVER_DIAGNOSTICS_PROTOCOL_GUID \
   { \
diff --git a/MdePkg/Include/Protocol/LoadFile.h b/MdePkg/Include/Protocol/LoadFile.h
index 43a9e3a0c8..6414382518 100644
--- a/MdePkg/Include/Protocol/LoadFile.h
+++ b/MdePkg/Include/Protocol/LoadFile.h
@@ -1,11 +1,11 @@
 /** @file
-  Load File protocol as defined in the EFI 1.0 specification.
+  Load File protocol as defined in the UEFI 2.0 specification.
 
   Load file protocol exists to supports the addition of new boot devices, 
   and to support booting from devices that do not map well to file system. 
   Network boot is done via a LoadFile protocol.
 
-  EFI 1.0 can boot from any device that produces a LoadFile protocol.
+  UEFI 2.0 can boot from any device that produces a LoadFile protocol.
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Protocol/LoadedImage.h b/MdePkg/Include/Protocol/LoadedImage.h
index c94cb77a08..93b5a45afe 100644
--- a/MdePkg/Include/Protocol/LoadedImage.h
+++ b/MdePkg/Include/Protocol/LoadedImage.h
@@ -1,5 +1,5 @@
 /** @file
-  EFI 1.0 Loaded image protocol definition.
+  UEFI 2.0 Loaded image protocol definition.
 
   Every EFI driver and application is passed an image handle when it is loaded.
   This image handle will contain a Loaded Image Protocol.
diff --git a/MdePkg/Include/Protocol/PciRootBridgeIo.h b/MdePkg/Include/Protocol/PciRootBridgeIo.h
index fddadd01c0..8b39f661b3 100644
--- a/MdePkg/Include/Protocol/PciRootBridgeIo.h
+++ b/MdePkg/Include/Protocol/PciRootBridgeIo.h
@@ -1,5 +1,5 @@
 /** @file
-  PCI Root Bridge I/O protocol as defined in the EFI 1.1 specification.
+  PCI Root Bridge I/O protocol as defined in the UEFI 2.0 specification.
 
   PCI Root Bridge I/O protocol is used by PCI Bus Driver to perform PCI Memory, PCI I/O, 
   and PCI Configuration cycles on a PCI Root Bridge. It also provides services to perform 
diff --git a/MdePkg/Include/Protocol/PlatformDriverOverride.h b/MdePkg/Include/Protocol/PlatformDriverOverride.h
index 9138c8756a..895849ce42 100644
--- a/MdePkg/Include/Protocol/PlatformDriverOverride.h
+++ b/MdePkg/Include/Protocol/PlatformDriverOverride.h
@@ -1,5 +1,5 @@
 /** @file
-  Platform Driver Override protocol as defined in the EFI 1.1 specification.
+  Platform Driver Override protocol as defined in the UEFI 2.1 specification.
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Protocol/RealTimeClock.h b/MdePkg/Include/Protocol/RealTimeClock.h
index 15b5d22e3b..a44fbaf1d3 100644
--- a/MdePkg/Include/Protocol/RealTimeClock.h
+++ b/MdePkg/Include/Protocol/RealTimeClock.h
@@ -4,7 +4,7 @@
   This code abstracts time and data functions. Used to provide
   Time and date related EFI runtime services.
 
-  The GetTime (), SetTime (), GetWakeupTime (), and SetWakeupTime () EFI 1.0
+  The GetTime (), SetTime (), GetWakeupTime (), and SetWakeupTime () UEFI 2.0
   services are added to the EFI system table and the 
   EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL_GUID protocol is registered with a NULL 
   pointer.
diff --git a/MdePkg/Include/Protocol/Reset.h b/MdePkg/Include/Protocol/Reset.h
index 0159cd1f8e..3e7ee44601 100644
--- a/MdePkg/Include/Protocol/Reset.h
+++ b/MdePkg/Include/Protocol/Reset.h
@@ -3,7 +3,7 @@
 
   Used to provide ResetSystem runtime services
 
-  The ResetSystem () EFI 1.0 service is added to the EFI system table and the 
+  The ResetSystem () UEFI 2.0 service is added to the EFI system table and the 
   EFI_RESET_ARCH_PROTOCOL_GUID protocol is registered with a NULL pointer.
 
   No CRC of the EFI system table is required, as it is done in the DXE core.
diff --git a/MdePkg/Include/Protocol/Runtime.h b/MdePkg/Include/Protocol/Runtime.h
index 401aceca6c..a58b7f5242 100644
--- a/MdePkg/Include/Protocol/Runtime.h
+++ b/MdePkg/Include/Protocol/Runtime.h
@@ -1,7 +1,7 @@
 /** @file
   Runtime Architectural Protocol as defined in DXE CIS
 
-  This code is used to produce the EFI 1.0 runtime virtual switch over
+  This code is used to produce the UEFI 2.0 runtime virtual switch over
 
   This driver must add SetVirtualAddressMap () and ConvertPointer () to
   the EFI system table. This driver is not responcible for CRCing the 
diff --git a/MdePkg/Include/Protocol/SerialIo.h b/MdePkg/Include/Protocol/SerialIo.h
index 59da19fbcf..5dd3aa17b9 100644
--- a/MdePkg/Include/Protocol/SerialIo.h
+++ b/MdePkg/Include/Protocol/SerialIo.h
@@ -1,5 +1,5 @@
 /** @file
-  Serial IO protocol as defined in the EFI 1.0 specification.
+  Serial IO protocol as defined in the UEFI 2.0 specification.
 
   Abstraction of a basic serial device. Targeted at 16550 UART, but
   could be much more generic.
diff --git a/MdePkg/Include/Protocol/SimpleFileSystem.h b/MdePkg/Include/Protocol/SimpleFileSystem.h
index 172f0e2add..725958dd04 100644
--- a/MdePkg/Include/Protocol/SimpleFileSystem.h
+++ b/MdePkg/Include/Protocol/SimpleFileSystem.h
@@ -1,11 +1,11 @@
 /** @file
-  SimpleFileSystem protocol as defined in the EFI 1.0 specification.
+  SimpleFileSystem protocol as defined in the UEFI 2.0 specification.
 
   The SimpleFileSystem protocol is the programatic access to the FAT (12,16,32) 
-  file system specified in EFI 1.0. It can also be used to abstract a file  
+  file system specified in UEFI 2.0. It can also be used to abstract a file  
   system other than FAT.
 
-  EFI 1.0 can boot from any valid EFI image contained in a SimpleFileSystem
+  UEFI 2.0 can boot from any valid EFI image contained in a SimpleFileSystem
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Protocol/SimpleNetwork.h b/MdePkg/Include/Protocol/SimpleNetwork.h
index 5a77a33595..ad873f188d 100644
--- a/MdePkg/Include/Protocol/SimpleNetwork.h
+++ b/MdePkg/Include/Protocol/SimpleNetwork.h
@@ -1,5 +1,5 @@
 /** @file
-  Simple Network protocol as defined in the EFI 1.0 specification.
+  Simple Network protocol as defined in the UEFI 2.0 specification.
 
   Basic network device abstraction.
 
diff --git a/MdePkg/Include/Protocol/SimplePointer.h b/MdePkg/Include/Protocol/SimplePointer.h
index 1061ff0cf8..35839b936f 100644
--- a/MdePkg/Include/Protocol/SimplePointer.h
+++ b/MdePkg/Include/Protocol/SimplePointer.h
@@ -1,5 +1,5 @@
 /** @file
-  Simple Pointer protocol from the EFI 1.1 specification.
+  Simple Pointer protocol from the UEFI 2.0 specification.
 
   Abstraction of a very simple pointer device like a mice or tracekballs.
 
diff --git a/MdePkg/Include/Protocol/SimpleTextIn.h b/MdePkg/Include/Protocol/SimpleTextIn.h
index 0e1e82b50c..bdbb0f0456 100644
--- a/MdePkg/Include/Protocol/SimpleTextIn.h
+++ b/MdePkg/Include/Protocol/SimpleTextIn.h
@@ -1,5 +1,5 @@
 /** @file
-  Simple Text In protocol from the EFI 1.0 specification.
+  Simple Text In protocol from the UEFI 2.0 specification.
 
   Abstraction of a very simple input device like a keyboard or serial
   terminal.
diff --git a/MdePkg/Include/Protocol/SimpleTextOut.h b/MdePkg/Include/Protocol/SimpleTextOut.h
index df7f0674de..ffe1272e5a 100644
--- a/MdePkg/Include/Protocol/SimpleTextOut.h
+++ b/MdePkg/Include/Protocol/SimpleTextOut.h
@@ -1,5 +1,5 @@
 /** @file
-  Simple Text Out protocol from the EFI 1.0 specification.
+  Simple Text Out protocol from the UEFI 2.0 specification.
 
   Abstraction of a very simple text based output device like VGA text mode or
   a serial terminal. The Simple Text Out protocol instance can represent
diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/MdePkg/Include/Protocol/UgaDraw.h
index 3532f8e288..42fe5c7ee2 100644
--- a/MdePkg/Include/Protocol/UgaDraw.h
+++ b/MdePkg/Include/Protocol/UgaDraw.h
@@ -1,5 +1,5 @@
 /** @file
-  UGA Draw protocol from the EFI 1.1 specification.
+  UGA Draw protocol from the EFI 1.10 specification.
 
   Abstraction of a very simple graphics device.
 
diff --git a/MdePkg/Include/Protocol/UgaIo.h b/MdePkg/Include/Protocol/UgaIo.h
index 02654051af..4d3d9b3c76 100644
--- a/MdePkg/Include/Protocol/UgaIo.h
+++ b/MdePkg/Include/Protocol/UgaIo.h
@@ -1,5 +1,5 @@
 /** @file
-  UGA IO protocol from the EFI 1.1 specification.
+  UGA IO protocol from the EFI 1.10 specification.
 
   Abstraction of a very simple graphics device.
   
diff --git a/MdePkg/Include/Protocol/UnicodeCollation.h b/MdePkg/Include/Protocol/UnicodeCollation.h
index b5e0abc473..f516bd4f88 100644
--- a/MdePkg/Include/Protocol/UnicodeCollation.h
+++ b/MdePkg/Include/Protocol/UnicodeCollation.h
@@ -1,5 +1,5 @@
 /** @file
-  Unicode Collation protocol that follows the EFI 1.0 specification.
+  Unicode Collation protocol that follows the UEFI 2.0 specification.
 
   Copyright (c) 2006, Intel Corporation                                                         
   All rights reserved. This program and the accompanying materials                          
diff --git a/MdePkg/Include/Protocol/Variable.h b/MdePkg/Include/Protocol/Variable.h
index b1c33202a5..c6e90c8b0b 100644
--- a/MdePkg/Include/Protocol/Variable.h
+++ b/MdePkg/Include/Protocol/Variable.h
@@ -1,9 +1,9 @@
 /** @file
   Variable Architectural Protocol as defined in the DXE CIS
 
-  This code is used to produce the EFI 1.0 runtime variable services
+  This code is used to produce the UEFI 2.0 runtime variable services
 
-  The GetVariable (), GetNextVariableName (), and SetVariable () EFI 1.0 
+  The GetVariable (), GetNextVariableName (), and SetVariable () UEFI 2.0 
   services are added to the EFI system table and the 
   EFI_VARIABLE_ARCH_PROTOCOL_GUID protocol is registered with a NULL pointer.
 
diff --git a/MdePkg/Include/Protocol/VariableWrite.h b/MdePkg/Include/Protocol/VariableWrite.h
index 36a6241d53..7621549b4b 100644
--- a/MdePkg/Include/Protocol/VariableWrite.h
+++ b/MdePkg/Include/Protocol/VariableWrite.h
@@ -1,9 +1,9 @@
 /** @file
   Variable Write Architectural Protocol as defined in the DXE CIS
 
-  This code is used to produce the EFI 1.0 runtime variable services
+  This code is used to produce the UEFI 2.0 runtime variable services
 
-  The SetVariable () EFI 1.0 services may be updated to the EFI system table and the 
+  The SetVariable () UEFI 2.0 services may be updated to the EFI system table and the 
   EFI_VARIABLE_WRITE_ARCH_PROTOCOL_GUID protocol is registered with a NULL pointer.
 
   No CRC of the EFI system table is required, as it is done in the DXE core.
diff --git a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
index dbdb5ab869..6d06c7e2a6 100644
--- a/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
+++ b/MdePkg/Library/BasePeCoffLib/BasePeCoff.c
@@ -1284,7 +1284,7 @@ PeCoffLoaderRelocateImageForRuntime (
 
       case EFI_IMAGE_REL_BASED_HIGHADJ:
         //
-        // Not implemented, but not used in EFI 1.0
+        // Not implemented, but not used in UEFI 2.0
         //
         ASSERT (FALSE);
         break;
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
index db891262ce..fefa765d7e 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.c
@@ -768,7 +768,7 @@ UefiDecompress (
   }
   //
   // The length of the field 'Position Set Code Length Array Size' in Block Header.
-  // For EFI 1.1 de/compression algorithm(Version 1), mPBit = 4
+  // For UEFI 2.0 de/compression algorithm(Version 1), mPBit = 4
   // For Tiano de/compression algorithm(Version 2), mPBit = 5
   //
   Sd->mPBit     = 4;
diff --git a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
index 0ac3996942..84638866b5 100644
--- a/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
+++ b/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLibInternals.h
@@ -63,7 +63,7 @@ typedef struct {
 
   ///
   /// The length of the field 'Position Set Code Length Array Size' in Block Header.
-  /// For EFI 1.1 de/compression algorithm, mPBit = 4
+  /// For UEFI 2.0 de/compression algorithm, mPBit = 4
   /// For Tiano de/compression algorithm, mPBit = 5
   ///
   UINT8   mPBit;
diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index e5fee0331c..3f765cc312 100644
--- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -100,7 +100,7 @@ OemHookStatusCodeInitialize (
 
   @param  CallerId      This optional parameter may be used to identify the caller.
                         This parameter allows the status code driver to apply different rules to different callers.
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
index 2c97bb0525..a8078b4b7a 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsBoot.c
@@ -90,7 +90,7 @@ BdsLibBootViaBootOption (
 
 Routine Description:
 
-  Process the boot option follow the EFI 1.1 specification and
+  Process the boot option follow the UEFI 2.0 specification and
   special treat the legacy boot option with BBS_DEVICE_PATH.
 
 Arguments:
@@ -197,7 +197,7 @@ Returns:
     BdsLibRegisterNewOption (&TempBootLists, DevicePath, L"EFI Internal Shell", L"BootOrder"); 
   }
 
-  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Booting EFI 1.1 way %S\n", Option->Description));
+  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "Booting UEFI 2.0 way %S\n", Option->Description));
 
   Status = gBS->LoadImage (
                   TRUE,
diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
index 6362c20b70..c2f541e532 100644
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsConnect.c
@@ -342,7 +342,7 @@ Returns:
 
   do {
     //
-    // Connect All EFI 1.10 drivers following EFI 1.10 algorithm
+    // Connect All UEFI 2.0 drivers following UEFI 2.0 algorithm
     //
     BdsLibConnectAllEfi ();
 
diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 46588fc11b..d192cfb1df 100644
--- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -109,7 +109,7 @@ OemHookStatusCodeInitialize (
 
   @param  CallerId      This optional parameter may be used to identify the caller.
                         This parameter allows the status code driver to apply different rules to different callers.
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
+                        Type EFI_GUID is defined in InstallProtocolInterface() in the UEFI 2.0 Specification.
 
 
   @param  Data          This optional parameter may be used to pass additional data
diff --git a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
index 50af22f047..104265c685 100644
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
@@ -422,7 +422,7 @@ PlatformBdsBootSuccess (
 Routine Description:
   
   Hook point after a boot attempt succeeds. We don't expect a boot option to
-  return, so the EFI 1.0 specification defines that you will default to an
+  return, so the UEFI 2.0 specification defines that you will default to an
   interactive mode and stop processing the BootOrder list in this case. This
   is alos a platform implementation and can be customized by IBV/OEM.
 
diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c b/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
index 6979db006c..d5e0c4349b 100644
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BdsEntry.c
@@ -317,7 +317,7 @@ Returns:
   PlatformBdsInit (PrivateData);
 
   //
-  // Set up the device list based on EFI 1.1 variables
+  // Set up the device list based on UEFI 2.0 variables
   // process Driver#### and Load the driver's in the
   // driver option list
   //
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGop.h b/Nt32Pkg/WinNtGopDxe/WinNtGop.h
index ac4defe11c..cd52bc175a 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGop.h
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGop.h
@@ -222,7 +222,7 @@ WinNtGopDestructor (
 ;
 
 //
-// EFI 1.1 driver model prototypes for Win NT GOP
+// UEFI 2.0 driver model prototypes for Win NT GOP
 //
 
 
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
index 58ddb1c656..f951e87dfe 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
@@ -16,7 +16,7 @@ Module Name:
 Abstract:
 
   This file produces the graphics abstration of GOP. It is called by
-  WinNtGopDriver.c file which deals with the EFI 1.1 driver model.
+  WinNtGopDriver.c file which deals with the UEFI 2.0 driver model.
   This file just does graphics.