diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c
index 6ad91b8cdb..3b3e7f2c3c 100644
--- a/MdePkg/Library/BasePcdLibNull/PcdLib.c
+++ b/MdePkg/Library/BasePcdLibNull/PcdLib.c
@@ -847,18 +847,12 @@ LibPcdGetNextToken (
 /**
   Used to retrieve the list of available PCD token space GUIDs.
   
-  Retrieves the next PCD token space from a token space specified by Guid.
-  Guid of NULL is reserved to mark the default local token namespace on the current
-  platform. If Guid is NULL, then the GUID of the first non-local token space of the 
-  current platform is returned. If Guid is the last non-local token space, 
-  then NULL is returned. 
-
-  If Guid is not NULL and is not a valid token space in the current platform, then ASSERT().
-
-
+  Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces
+  in the platform.
+  If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.
+  If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.
   
-  @param[in]  Guid  Pointer to a 128-bit unique value that designates from which namespace 
-                    to start the search.
+  @param  TokenSpaceGuid  Pointer to the a PCD token space GUID
 
   @return The next valid token namespace.
 
diff --git a/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c b/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
index 9f414d8e39..696f7bbf47 100644
--- a/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
+++ b/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
@@ -183,7 +183,8 @@ DxeRuntimePciExpressLibDestructor (
   This internal functions retrieves PCI Express Base Address via a PCD entry
   PcdPciExpressBaseAddress.
   
-  @return The base address of PCI Express.
+  @param  Address  Address that encodes the PCI Bus, Device, Function and Register.
+  @return          The base address of PCI Express.
 
 **/
 UINTN
diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
index 57cf646f6e..9a5587521c 100644
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.c
@@ -954,18 +954,12 @@ LibPcdGetNextToken (
 /**
   Used to retrieve the list of available PCD token space GUIDs.
   
-  Retrieves the next PCD token space from a token space specified by Guid.
-  Guid of NULL is reserved to mark the default local token namespace on the current
-  platform. If Guid is NULL, then the GUID of the first non-local token space of the 
-  current platform is returned. If Guid is the last non-local token space, 
-  then NULL is returned. 
-
-  If Guid is not NULL and is not a valid token space in the current platform, then ASSERT().
-
-
+  Returns the PCD token space GUID that follows TokenSpaceGuid in the list of token spaces
+  in the platform.
+  If TokenSpaceGuid is NULL, then a pointer to the first PCD token spaces returned.
+  If TokenSpaceGuid is the last PCD token space GUID in the list, then NULL is returned.
   
-  @param[in]  Guid  Pointer to a 128-bit unique value that designates from which namespace 
-                    to start the search.
+  @param  TokenSpaceGuid  Pointer to the a PCD token space GUID
 
   @return The next valid token namespace.
 
diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
index b2602e2a58..15b16a237a 100644
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c
@@ -222,12 +222,12 @@ IsDevicePathEndInstance (
 UINT16
 SetDevicePathNodeLength (
   IN OUT VOID  *Node,
-  IN UINTN     NodeLength
+  IN UINTN     Length
   )
 {
   ASSERT (Node != NULL);
-  ASSERT (NodeLength < 0x10000);
-  return WriteUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(NodeLength));
+  ASSERT (Length < 0x10000);
+  return WriteUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(Length));
 }
 
 /**
diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
index 8f2488a3b2..5dd0998762 100644
--- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c
@@ -251,12 +251,12 @@ IsDevicePathEndInstance (
 UINT16
 SetDevicePathNodeLength (
   IN OUT VOID  *Node,
-  IN UINTN     NodeLength
+  IN UINTN     Length
   )
 {
   ASSERT (Node != NULL);
-  ASSERT (NodeLength < 0x10000);
-  return WriteUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(NodeLength));
+  ASSERT (Length < 0x10000);
+  return WriteUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(Length));
 }
 
 /**