diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 06c08f9bc4..7b74edb69a 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -730,12 +730,19 @@ PeiFfsGetFileInfo (
 /**
   Returns information about the specified volume.
 
-  @param VolumeHandle    Handle of the volume.
-  @param VolumeInfo      Upon exit, points to the volume’s information.
+  This function returns information about a specific firmware
+  volume, including its name, type, attributes, starting address
+  and size.
+
+  @param VolumeHandle   Handle of the volume.
+  @param VolumeInfo     Upon exit, points to the volume's information.
+
+  @retval EFI_SUCCESS             Volume information returned.
+  @retval EFI_INVALID_PARAMETER   If VolumeHandle does not represent a valid volume.
+  @retval EFI_INVALID_PARAMETER   If VolumeHandle is NULL.
+  @retval EFI_SUCCESS             Information successfully returned.
+  @retval EFI_INVALID_PARAMETER   The volume designated by the VolumeHandle is not available.
 
-  @retval EFI_INVALID_PARAMETER If VolumeHandle does not represent a valid volume.
-  @retval EFI_INVALID_PARAMETER If VolumeInfo is NULL.
-  @retval EFI_SUCCESS           Volume information returned.
 **/
 EFI_STATUS
 EFIAPI 
diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index 8ceebedd15..8e4a5cbea7 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -3,7 +3,7 @@
   Implement ReadOnly Variable Services required by PEIM and install
   PEI ReadOnly Varaiable2 PPI. These services operates the non volatile storage space.
 
-Copyright (c) 2006 - 2008 Intel Corporation. <BR>
+Copyright (c) 2006 - 2009 Intel Corporation. <BR>
 All rights reserved. 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
@@ -592,7 +592,7 @@ PeiGetVariable (
   @param  VariableNameSize  On entry, points to the size of the buffer pointed to by VariableName.
   @param  VariableName      On entry, a pointer to a null-terminated string that is the variable's name.
                             On return, points to the next variable's null-terminated name string.
-  @param  VariableGuid      On entry, a pointer to an UEFI _GUID that is the variable's GUID. 
+  @param  VendorGuid        On entry, a pointer to an EFI_GUID that is the variable's GUID. 
                             On return, a pointer to the next variable's GUID.
 
   @retval EFI_SUCCESS           The variable was read successfully.
diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index c93179a828..96bd78dec0 100644
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -649,14 +649,13 @@ typedef struct {
   and size.
 
   @param VolumeHandle   Handle of the volume.
+  @param VolumeInfo     Upon exit, points to the volume's information.
 
-  @param VolumeInfo     Upon exit, points to the volume's
-                        information.
-
-  @retval EFI_SUCCESS             File information returned.
-  @retval EFI_INVALID_PARAMETER   If FileHandle does not
-                                  represent a valid file.
-  @retval EFI_INVALID_PARAMETER   If FileInfo is NULL.
+  @retval EFI_SUCCESS             Volume information returned.
+  @retval EFI_INVALID_PARAMETER   If VolumeHandle does not represent a valid volume.
+  @retval EFI_INVALID_PARAMETER   If VolumeHandle is NULL.
+  @retval EFI_SUCCESS             Information successfully returned.
+  @retval EFI_INVALID_PARAMETER   The volume designated by the VolumeHandle is not available.
 
 **/
 typedef
diff --git a/MdePkg/Include/Ppi/ReadOnlyVariable2.h b/MdePkg/Include/Ppi/ReadOnlyVariable2.h
index ceede7452d..23de911989 100644
--- a/MdePkg/Include/Ppi/ReadOnlyVariable2.h
+++ b/MdePkg/Include/Ppi/ReadOnlyVariable2.h
@@ -2,7 +2,7 @@
   This file declares Read-only Variable Service2 PPI.
   This ppi permits read-only access to the UEFI variable store during the PEI phase.
 
-  Copyright (c) 2006 - 2008, Intel Corporation                                                         
+  Copyright (c) 2006 - 2009, Intel Corporation                                                         
   All rights reserved. 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        
@@ -79,7 +79,7 @@ EFI_STATUS
   @param  VariableName      On entry, a pointer to a null-terminated string that is the variable's name.
                             On return, points to the next variable's null-terminated name string.
 
-  @param  VendorGuid        On entry, a pointer to an UEFI _GUID that is the variable's GUID. 
+  @param  VendorGuid        On entry, a pointer to an EFI_GUID that is the variable's GUID. 
                             On return, a pointer to the next variable's GUID.
 
   @retval EFI_SUCCESS           The variable was read successfully.
@@ -94,7 +94,7 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_PEI_NEXT_VARIABLE_NAME2)(
+(EFIAPI *EFI_PEI_GET_NEXT_VARIABLE_NAME2)(
   IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,
   IN OUT    UINTN                           *VariableNameSize,
   IN OUT    CHAR16                          *VariableName,
@@ -106,8 +106,8 @@ EFI_STATUS
 /// variable services. 
 ///
 struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {
-  EFI_PEI_GET_VARIABLE2       GetVariable;
-  EFI_PEI_NEXT_VARIABLE_NAME2 NextVariableName;
+  EFI_PEI_GET_VARIABLE2           GetVariable;
+  EFI_PEI_GET_NEXT_VARIABLE_NAME2 NextVariableName;
 };
 
 extern EFI_GUID gEfiPeiReadOnlyVariable2PpiGuid;