Avoid using code name in comments.

Signed-off-by: niruiyu
Reviewed-by: lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12552 6f19259b-4bc3-4df7-8a09-765794883524

29 files changed, 72 insertions, 80 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.c b/EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.c
index 42e5787a9d..2d342d841e 100644
--- a/EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.c
@@ -51,7 +51,7 @@ GetSrmamHobData (
 

 /**

   This routine will split SmramReserve hob to reserve 1 page for SMRAM content in S3 phase

-  for R9 SMM core.

+  for PI SMM core.

   

   @retval EFI_SUCCESS           The gEfiSmmPeiSmramMemoryReserveGuid is splited successfully.

   @retval EFI_NOT_FOUND         The gEfiSmmPeiSmramMemoryReserveGuid is not found.

@@ -108,7 +108,7 @@ SplitSmramReserveHob (
 

   ASSERT (SmramRanges >= 1);

   //

-  // Copy last entry to the end - we assume TSEG is last entry, which is same assumption as R8 CPU/SMM driver

+  // Copy last entry to the end - we assume TSEG is last entry, which is same assumption as Framework CPU/SMM driver

   //

   CopyMem (&NewDescriptorBlock->Descriptor[SmramRanges], &NewDescriptorBlock->Descriptor[SmramRanges - 1], sizeof(EFI_SMRAM_DESCRIPTOR));

 

@@ -126,7 +126,7 @@ SplitSmramReserveHob (
   NewDescriptorBlock->Descriptor[SmramRanges].PhysicalSize  -= EFI_PAGE_SIZE;

 

   //

-  // Now, we have created SmramReserve Hob for SmmAccess drive. But the issue is that, R8 SmmAccess will assume there is 2 SmramReserve region only.

+  // Now, we have created SmramReserve Hob for SmmAccess drive. But the issue is that, Framework SmmAccess will assume there is 2 SmramReserve region only.

   // Reporting 3 SmramReserve region will cause buffer overflow. Moreover, we would like to filter AB-SEG or H-SEG to avoid SMM cache-poisoning issue.

   // So we uses scan SmmReserve Hob to remove AB-SEG or H-SEG.

   //

@@ -170,7 +170,7 @@ SplitSmramReserveHob (
 

 /**

   This routine will create AcpiVariable hob to point the reserved smram in S3 phase

-  for R9 SMM core.

+  for PI SMM core.

   

   @retval EFI_SUCCESS           The gEfiAcpiVariableGuid is created successfully.

   @retval EFI_NOT_FOUND         The gEfiSmmPeiSmramMemoryReserveGuid is not found.

@@ -233,7 +233,7 @@ AcpiVariableHobEntry (
   EFI_STATUS              Status;

 

   //

-  // Split SmramReserve hob, which is required for R9 SMM Core for S3.

+  // Split SmramReserve hob, which is required for PI SMM Core for S3.

   //

   Status = SplitSmramReserveHob ();

   if (EFI_ERROR (Status)) {

@@ -241,7 +241,7 @@ AcpiVariableHobEntry (
   }

 

   //

-  // Create AcpiVariable hob, which is required for R9 SMM Core for S3.

+  // Create AcpiVariable hob, which is required for PI SMM Core for S3.

   //

   Status = CreateAcpiVariableHob ();

 

diff --git a/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.c b/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.c
index 160cac205c..5171a66b0a 100644
--- a/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.c
@@ -7,12 +7,12 @@ drivers/apps that may have used Device I/O.
 Device I/O is on list of deprecated protocols for UEFI 2.0 and later.

 This module module layers Device I/O on top of PCI Root Bridge I/O (Segment 0)

  Use if:

-   There are no R8.x modules present that produces Device I/O

+   There are no EDK modules present that produces Device I/O

    EFI drivers included that consume Device I/O

    Platform required to support EFI drivers that consume Device I/O

    Platform required to support EFI applications that consume Device I/O

 

-Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

diff --git a/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.inf b/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.inf
index 19981acd80..6faa4a178f 100644
--- a/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.inf
@@ -4,12 +4,12 @@
 # Device I/O is on list of deprecated protocols for UEFI 2.0 and later.

 # This module layers Device I/O on top of PCI Root Bridge I/O (Segment 0)

 # Use if:

-#   There are no R8.x modules present that produces Device I/O

+#   There are no EDK modules present that produces Device I/O

 #   EFI drivers included that consume Device I/O

 #   Platform required to support EFI drivers that consume Device I/O

 #   Platform required to support EFI applications that consume Device I/O

 #

-# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

diff --git a/EdkCompatibilityPkg/Compatibility/DxeSmmReadyToLockOnExitPmAuthThunk/DxeSmmReadyToLockOnExitPmAuthThunk.c b/EdkCompatibilityPkg/Compatibility/DxeSmmReadyToLockOnExitPmAuthThunk/DxeSmmReadyToLockOnExitPmAuthThunk.c
index 6625231ba1..51ea68eeed 100644
--- a/EdkCompatibilityPkg/Compatibility/DxeSmmReadyToLockOnExitPmAuthThunk/DxeSmmReadyToLockOnExitPmAuthThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/DxeSmmReadyToLockOnExitPmAuthThunk/DxeSmmReadyToLockOnExitPmAuthThunk.c
@@ -1,9 +1,9 @@
 /** @file

   DxeSmmReadyToLock Protocol on ExitPmAuth Protocol Thunk driver.

-  R8 platform uses ExitPmAuth point to lock SMRAM and SMM API.

-  But R9 uses DxeSmmReadyToLock. We need a thunk driver to convert this event.

+  EDK platform uses ExitPmAuth point to lock SMRAM and SMM API.

+  But EDKII uses DxeSmmReadyToLock. We need a thunk driver to convert this event.

 

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -37,7 +37,7 @@ ExitPmAuthProtocolNotification (
 

   //

   // Add more check to locate protocol after got event, because

-  // R8 ECP will signal this event immediately once it is register

+  // ECP will signal this event immediately once it is register

   // just in case it is already installed.

   //

   Status = gBS->LocateProtocol (

diff --git a/EdkCompatibilityPkg/Compatibility/PciCfgOnPciCfg2Thunk/PciCfgOnPciCfg2Thunk.inf b/EdkCompatibilityPkg/Compatibility/PciCfgOnPciCfg2Thunk/PciCfgOnPciCfg2Thunk.inf
index 5f540c0344..167080562b 100644
--- a/EdkCompatibilityPkg/Compatibility/PciCfgOnPciCfg2Thunk/PciCfgOnPciCfg2Thunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/PciCfgOnPciCfg2Thunk/PciCfgOnPciCfg2Thunk.inf
@@ -7,7 +7,7 @@
 # This module produces PciCfgPpi on top of PciCfgPpi2. This module is used on platform when both of

 # these two conditions are true:

 # 1) Framework module is present that consumes PCI CFG  AND

-# 2) R9 module is present that produces PCI CFG2 but not PCI CFG

+# 2) EDKII module is present that produces PCI CFG2 but not PCI CFG

 #

 # The Usage of this module is rare since EDK II module IntelFrameworkModulePkg\Universal\PcatSingleSegmentPciCfgPei\PcatSingleSegmentPciCfgPei.inf

 # that produce PCI CFG2 can also produce PCI CFG by setting Pcd Feature Flag gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciCfgDisable

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h
index dbefc8e926..4539520ab5 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -27,7 +27,7 @@ Abstract:
 

 //

 // Tiano added a couple of return types. These are owned by UEFI specification

-// and Tiano can not use them. Thus for UEFI 2.0/R8.6 support we moved the values

+// and Tiano can not use them. Thus for UEFI 2.0 support we moved the values

 // to a UEFI OEM extension range to conform to UEFI specification.

 //

 #if (EFI_SPECIFICATION_VERSION < 0x00020000)

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Event.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Event.c
index f42bc5bfb4..643ba7152c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Event.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Event.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -229,7 +229,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification by 

   declaring a GUID for the legacy boot event class. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to 

   work both ways.

 

 Arguments:

@@ -308,7 +308,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification and use 

   the ready to boot event class defined in UEFI 2.0. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to 

   work both ways.

 

 Arguments:

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
index c417242552..f28f209fb1 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiDriverLib.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -1124,8 +1124,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification by 

   declaring a GUID for the legacy boot event class. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

-  work both ways.

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 

 Arguments:

   LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)

@@ -1154,8 +1153,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification and use 

   the ready to boot event class defined in UEFI 2.0. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

-  work both ways.

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 

 Arguments:

   @param LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h
index c984880f99..e130492a7e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiRuntimeLib.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -1699,8 +1699,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification by 

   declaring a GUID for the legacy boot event class. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

-  work both ways.

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 

 Arguments:

   LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)

@@ -1729,8 +1728,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification and use 

   the ready to boot event class defined in UEFI 2.0. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

-  work both ways.

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 

 Arguments:

   ReadyToBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiSmmDriverLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiSmmDriverLib.h
index 0642d3a3cc..f1e8471a1a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiSmmDriverLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiSmmDriverLib.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -174,8 +174,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification by 

   declaring a GUID for the legacy boot event class. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

-  work both ways.

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 

 Arguments:

   LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)

@@ -204,8 +203,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification and use 

   the ready to boot event class defined in UEFI 2.0. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

-  work both ways.

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 

 Arguments:

   ReadyToBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueDxeDriverEntryPoint.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueDxeDriverEntryPoint.c
index be5bf00f7c..58ee6e076a 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueDxeDriverEntryPoint.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueDxeDriverEntryPoint.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -691,7 +691,7 @@ EfiMain (
 #endif

 

 //

-// Guids not present in R8.6 code base

+// Guids not present in EDK code base

 //

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c
index 60b9c5ae8f..1144cc00cb 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -119,7 +119,7 @@ EfiMain (
 }

 

 //

-// Guids not present in R8.6 code base

+// Guids not present in EDK code base

 //

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueSmmDriverEntryPoint.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueSmmDriverEntryPoint.c
index 13cddfbe1d..781eb860f7 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueSmmDriverEntryPoint.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGlueSmmDriverEntryPoint.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -438,7 +438,7 @@ EfiMain (
 }

 

 //

-// Guids not present in R8.6 code base

+// Guids not present in EDK code base

 //

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/AutoGen.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/AutoGen.h
index 2bfc91bcab..93dca90174 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/AutoGen.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/AutoGen.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -16,9 +16,9 @@ Module Name:
   

 Abstract: 

 

-  This file is supposed to be used by a .dxe file. To write common .dxs file for R8.x 

-  and R9, a header file named AutoGen.h musted be present. In R8.x-GlueLib code base, 

-  this AutoGen.h plays the role as the AutoGen.h in R9. Here the AutoGen.h isn't auto-generated 

+  This file is supposed to be used by a .dxe file. To write common .dxs file for EDK

+  and EDKII, a header file named AutoGen.h musted be present. In EDK-GlueLib code base, 

+  this AutoGen.h plays the role as the AutoGen.h in EDKII. Here the AutoGen.h isn't auto-generated 

   by any tool.

 

 --*/

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h
index 1705d47f34..e303d5f4f9 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -104,7 +104,7 @@ typedef EFI_GUID GUID;
 #define TPL_HIGH_LEVEL                                EFI_TPL_HIGH_LEVEL

 

 //

-// Typos in R8.x

+// Typos in EDK

 //

 #define gEfiHobMemoryAllocModuleGuid        gEfiHobMemeryAllocModuleGuid

 #define gEfiHobMemoryAllocStackGuid         gEfiHobMemeryAllocStackGuid

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
index 321e5fb0ec..b5f8230be9 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDependencies.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -26,7 +26,7 @@ Abstract:
 #include "EdkIIGlueProcessorBind.h"

 

 //

-// Declarations of dependencies among EdkII Glue Library instances and R8 Libraries

+// Declarations of dependencies among EDKII Glue Library instances and EDK Libraries

 // Pay attention to the order of following #define structures

 //

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/DxeDepex.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/DxeDepex.h
index af8d87e55c..60c9325625 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/DxeDepex.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/DxeDepex.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -16,7 +16,7 @@ Module Name:
   

 Abstract: 

 

-  This file is used by .dxs file. To write common .dxs for R8.x and R9, a 

+  This file is used by .dxs file. To write common .dxs for EDK and EDKII, a 

   header file named DxeDepex.h musted be present. 

 

 --*/

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueBase.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueBase.h
index be284e8513..696364a4d9 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueBase.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueBase.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -49,7 +49,7 @@ Abstract:
 #include "EdkIIGlueProcessorBind.h"

 

 //

-// Some Status Code data type definitions are in TianoSpecTypes.h in R8.5

+// Some Status Code data type definitions are in TianoSpecTypes.h in EDK

 //

 #if (TIANO_RELEASE_VERSION <= 0x00080005)

 #include "TianoSpecTypes.h"

@@ -57,7 +57,7 @@ Abstract:
 #include "EfiStatusCode.h"

 

 //

-// R8.x Library headers used by EdkII Glue Libraries

+// EDK Library headers used by EdkII Glue Libraries

 //

 #include "LinkedList.h"

 #include "EfiCommonLib.h"

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h
index d647bf3623..0e1e340ec9 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueDxe.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -238,7 +238,7 @@ Abstract:
 #endif

 

 //

-// R8.x Library headers used by EdkII Glue Libraries

+// EDK Library headers used by EDKII Glue Libraries

 //

 #include "EfiDriverLib.h"

 #include "EfiCapsule.h"

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueUefi.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueUefi.h
index 8c4e2ae946..def6dd12b1 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueUefi.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueUefi.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -142,7 +142,7 @@ Abstract:
 

 #if (TIANO_RELEASE_VERSION > 0x00080005) 

 //

-// Need due to R8.5 Tiano contamination of UEFI enumes. 

+// Need due to EDK Tiano contamination of UEFI enumes. 

 // There is a UEFI library that does things the new way and the old way

 // This is why these definitions are need in Uefi.h

 //

@@ -151,7 +151,7 @@ Abstract:
 #endif

 

 //

-// R8.x Library headers used by EdkII Glue Libraries

+// EDK Library headers used by EdkII Glue Libraries

 //

 #include "TianoSpecTypes.h"

 #include "TianoSpecApi.h"

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDebugLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDebugLib.h
index 62e07d49fe..27e597403e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDebugLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDebugLib.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -24,7 +24,7 @@ Abstract:
 #define __EDKII_GLUE_DEBUG_LIB_H__

 

 //

-// To use EdkII code, these R8.x macros are undefined

+// To use EDKII code, these EDK macros are undefined

 //

 #undef ASSERT

 #undef DEBUG

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/PeimDepex.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/PeimDepex.h
index aa3b87d901..c87fa4b9c6 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/PeimDepex.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/PeimDepex.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -16,7 +16,7 @@ Module Name:
   

 Abstract: 

 

-  This file is used by .dxs file. To write common .dxs for R8.x and R9, a 

+  This file is used by .dxs file. To write common .dxs for EDK and EDKII, a 

   header file named PeimDepex.h musted be present. 

 

 --*/

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
index 13862e5203..9141bfcad3 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeHobLib/DxeHobLib.inf
@@ -1,6 +1,6 @@
 #/*++

 #

-# Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials                          

 # are licensed and made available under the terms and conditions of the BSD License         

 # which accompanies this distribution.  The full text of the license may be found at        

@@ -54,7 +54,7 @@ COMPONENT_TYPE  = LIBRARY
   EdkIIGlueBaseMemoryLib

   EdkIIGlueUefiLib

 #

-# R8.x Library, GUID needed: gEfiHobListGuid

+# EDK Library, GUID needed: gEfiHobListGuid

 #  

   EdkFrameworkGuidLib

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
index de1d4c03d5..cc82863210 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
@@ -1,6 +1,6 @@
 #/*++

 #

-# Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials                          

 # are licensed and made available under the terms and conditions of the BSD License         

 # which accompanies this distribution.  The full text of the license may be found at        

@@ -61,7 +61,7 @@ COMPONENT_TYPE  = LIBRARY
 # when EFI_SPECIFICATION_VERSION < 0x00020000, gRT is used

 # 

   EdkIIGlueUefiRuntimeServicesTableLib

-# R8.x lib

+# EDK lib

   EfiProtocolLib

 # Possibly, gEfiCallerIdGuid might be used.

   EdkGuidLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
index ad486201a1..7a2e1365c4 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/EdkDxeRuntimeDriverLib/EdkDxeRuntimeDriverLib.inf
@@ -1,6 +1,6 @@
 #/*++

 #

-# Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials                          

 # are licensed and made available under the terms and conditions of the BSD License         

 # which accompanies this distribution.  The full text of the license may be found at        

@@ -66,7 +66,7 @@ COMPONENT_TYPE  = LIBRARY
   EdkIIGlueBaseLib

   EdkIIGlueUefiBootServicesTableLib

 #

-# R8.x Library

+# EDK Library

 #  

   EfiProtocolLib

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
index af6a64f346..be7e735a9b 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
@@ -1,6 +1,6 @@
 #/*++

 #

-# Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials                          

 # are licensed and made available under the terms and conditions of the BSD License         

 # which accompanies this distribution.  The full text of the license may be found at        

@@ -56,7 +56,7 @@ COMPONENT_TYPE  = LIBRARY
   EdkIIGlueBaseLib

   EdkIIGlueBaseMemoryLib

 #

-# R8.x

+# EDK Library

 #

   EdkFrameworkGuidLib

 #

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf
index 55f644f0eb..4137bb6367 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/SmmRuntimeDxeReportStatusCodeLib/SmmRuntimeDxeReportStatusCodeLib.inf
@@ -1,6 +1,6 @@
 #/*++

 #

-# Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 # This program and the accompanying materials                          

 # are licensed and made available under the terms and conditions of the BSD License         

 # which accompanies this distribution.  The full text of the license may be found at        

@@ -63,7 +63,7 @@ COMPONENT_TYPE  = LIBRARY
 # when EFI_SPECIFICATION_VERSION < 0x00020000, gRT is used

 # 

   EdkIIGlueUefiRuntimeServicesTableLib

-# R8.x lib

+# EDK lib

   EfiProtocolLib

 # Possibly, gEfiCallerIdGuid might be used.

   EdkGuidLib

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiNotTiano.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiNotTiano.c
index bccb35a44b..4a8809b90c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiNotTiano.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/UefiLib/UefiNotTiano.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -19,7 +19,7 @@ Abstract:
 

   Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the

   oldconflicts with library functions and supporting implementations of the old 

-  (R8.5/EFI 1.10) and new (EdkII/UEFI 2.0) way.

+  (EFI 1.10) and new (EdkII/UEFI 2.0) way.

 

 --*/

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Event.c b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Event.c
index 033a0840ac..e8200af365 100644
--- a/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Event.c
+++ b/EdkCompatibilityPkg/Foundation/Library/RuntimeDxe/EfiRuntimeLib/Event.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -211,8 +211,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification by 

   declaring a GUID for the legacy boot event class. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

-  work both ways.

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 

 Arguments:

   LegacyBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)

@@ -290,8 +289,7 @@ Routine Description:
   This was bad as Tiano did not own the enum. In UEFI 2.0 CreateEventEx was

   added and now it's possible to not voilate the UEFI specification and use 

   the ready to boot event class defined in UEFI 2.0. This library supports

-  the R8.5/EFI 1.10 form and R8.6/UEFI 2.0 form and allows common code to 

-  work both ways.

+  the EFI 1.10 form and UEFI 2.0 form and allows common code to work both ways.

 

 Arguments:

   ReadyToBootEvent  Returns the EFI event returned from gBS->CreateEvent(Ex)