diff --git a/MdePkg/Include/Ppi/DeviceRecoveryModule.h b/MdePkg/Include/Ppi/DeviceRecoveryModule.h
index 7ca678a0ed..83e03a4fa6 100644
--- a/MdePkg/Include/Ppi/DeviceRecoveryModule.h
+++ b/MdePkg/Include/Ppi/DeviceRecoveryModule.h
@@ -10,7 +10,7 @@
   The module determines the internal search order, with capsule number 1 as the highest load
   priority and number N as the lowest priority.
 
-  Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2007 - 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
@@ -107,7 +107,7 @@ EFI_STATUS
   This function, by whatever mechanism, retrieves a DXE capsule from some device
   and loads it into memory. Note that the published interface is device neutral.
 
-  @param[in,out] PeiServices       General-purpose services that are available 
+  @param[in]     PeiServices       General-purpose services that are available 
                                    to every PEIM
   @param[in]     This              Indicates the EFI_PEI_DEVICE_RECOVERY_MODULE_PPI
                                    instance.
@@ -123,7 +123,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *EFI_PEI_DEVICE_LOAD_RECOVERY_CAPSULE)(
-  IN OUT EFI_PEI_SERVICES                    **PeiServices,
+  IN     EFI_PEI_SERVICES                    **PeiServices,
   IN     EFI_PEI_DEVICE_RECOVERY_MODULE_PPI  *This,
   IN     UINTN                               CapsuleInstance,
   OUT    VOID                                *Buffer
diff --git a/MdePkg/Include/Ppi/LoadFile.h b/MdePkg/Include/Ppi/LoadFile.h
index 7e175909b2..fdc9ce2605 100644
--- a/MdePkg/Include/Ppi/LoadFile.h
+++ b/MdePkg/Include/Ppi/LoadFile.h
@@ -1,7 +1,7 @@
 /** @file
   Load image file from fv to memory. 
 
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 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        
@@ -45,7 +45,7 @@ typedef struct _EFI_PEI_LOAD_FILE_PPI EFI_PEI_LOAD_FILE_PPI;
   @retval EFI_LOAD_ERROR        There was no supported image in the file.
   @retval EFI_INVALID_PARAMETER FileHandle was not a valid firmware file handle.
   @retval EFI_INVALID_PARAMETER EntryPoint was NULL.
-  @retval EFI_NOT_SUPPORTED     An image requires relocations or is not
+  @retval EFI_UNSUPPORTED       An image requires relocations or is not
                                 memory mapped.
    
 **/
diff --git a/MdePkg/Include/Protocol/FirmwareVolumeBlock.h b/MdePkg/Include/Protocol/FirmwareVolumeBlock.h
index 7fbe3c81e1..bb32d10341 100644
--- a/MdePkg/Include/Protocol/FirmwareVolumeBlock.h
+++ b/MdePkg/Include/Protocol/FirmwareVolumeBlock.h
@@ -1,7 +1,7 @@
 /** @file
   This file provides control over block-oriented firmware devices.
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 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 that accompanies this distribution.  
 The full text of the license may be found at
@@ -100,7 +100,7 @@ EFI_STATUS
   
   @retval EFI_SUCCESS       The firmware volume base address was returned.
   
-  @retval EFI_NOT_SUPPORTED The firmware volume is not memory mapped.
+  @retval EFI_UNSUPPORTED   The firmware volume is not memory mapped.
 
 **/
 typedef
diff --git a/MdePkg/Include/Protocol/IdeControllerInit.h b/MdePkg/Include/Protocol/IdeControllerInit.h
index a6f436a30a..8f9c46bd8f 100644
--- a/MdePkg/Include/Protocol/IdeControllerInit.h
+++ b/MdePkg/Include/Protocol/IdeControllerInit.h
@@ -13,7 +13,7 @@
   
   A device handle for an IDE controller must contain an EFI_DEVICE_PATH_PROTOCOL.
 
-Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 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 that accompanies this distribution.  
 The full text of the license may be found at
@@ -297,7 +297,7 @@ EFI_STATUS
   @param[in] Channel   Zero-based channel number.
 
   @retval EFI_SUCCESS             The notification was accepted without any errors.
-  @retval EFI_NOT_SUPPORTED       Phase is not supported.
+  @retval EFI_UNSUPPORTED         Phase is not supported.
   @retval EFI_INVALID_PARAMETER   Channel is invalid (Channel >= ChannelCount).
   @retval EFI_NOT_READY           This phase cannot be entered at this time; for 
                                   example, an attempt was made to enter a Phase