diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/Library/MemEncryptSevLib.h
index 88b272ebed..2d574dd306 100644
--- a/OvmfPkg/Include/Library/MemEncryptSevLib.h
+++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h
@@ -32,29 +32,31 @@ MemEncryptSevIsEnabled (
   );
 
 /**
-  This function clears memory encryption bit for the memory region specified
-  by BaseAddress and Number of pages from the current page table context.
+  This function clears memory encryption bit for the memory region specified by
+  BaseAddress and NumPages from the current page table context.
 
-  @param[in]  BaseAddress           The physical address that is the start
-                                    address of a memory region.
-  @param[in]  NumberOfPages         The number of pages from start memory
-                                    region.
-  @param[in]  Flush                 Flush the caches before clearing the bit
-                                    (mostly TRUE except MMIO addresses)
+  @param[in]  Cr3BaseAddress          Cr3 Base Address (if zero then use
+                                      current CR3)
+  @param[in]  BaseAddress             The physical address that is the start
+                                      address of a memory region.
+  @param[in]  NumPages                The number of pages from start memory
+                                      region.
+  @param[in]  Flush                   Flush the caches before clearing the bit
+                                      (mostly TRUE except MMIO addresses)
 
-  @retval RETURN_SUCCESS            The attributes were cleared for the memory
-                                    region.
-  @retval RETURN_INVALID_PARAMETER  Number of pages is zero.
-  @retval RETURN_UNSUPPORTED        Clearing memory encryption attribute is not
-                                    supported
-  **/
+  @retval RETURN_SUCCESS              The attributes were cleared for the
+                                      memory region.
+  @retval RETURN_INVALID_PARAMETER    Number of pages is zero.
+  @retval RETURN_UNSUPPORTED          Clearing the memory encryption attribute
+                                      is not supported
+**/
 RETURN_STATUS
 EFIAPI
 MemEncryptSevClearPageEncMask (
   IN PHYSICAL_ADDRESS         Cr3BaseAddress,
   IN PHYSICAL_ADDRESS         BaseAddress,
-  IN UINTN                    NumberOfPages,
-  IN BOOLEAN                  CacheFlush
+  IN UINTN                    NumPages,
+  IN BOOLEAN                  Flush
   );
 
 /**
diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c
index d1130df2d0..d6067c52aa 100644
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c
@@ -22,30 +22,30 @@
 #include <Library/MemEncryptSevLib.h>
 
 /**
-  This function clears memory encryption bit for the memory region specified
-  by BaseAddress and Number of pages from the current page table context.
+  This function clears memory encryption bit for the memory region specified by
+  BaseAddress and NumPages from the current page table context.
 
-  @param[in]  Cr3BaseAddress        Cr3 Base Address (if zero then use current
-                                    CR3)
-  @param[in]  BaseAddress           The physical address that is the start
-                                    address of a memory region.
-  @param[in]  NumberOfPages         The number of pages from start memory
-                                    region.
-  @param[in]  Flush                 Flush the caches before clearing the bit
-                                    (mostly TRUE except MMIO addresses)
+  @param[in]  Cr3BaseAddress          Cr3 Base Address (if zero then use
+                                      current CR3)
+  @param[in]  BaseAddress             The physical address that is the start
+                                      address of a memory region.
+  @param[in]  NumPages                The number of pages from start memory
+                                      region.
+  @param[in]  Flush                   Flush the caches before clearing the bit
+                                      (mostly TRUE except MMIO addresses)
 
-  @retval RETURN_SUCCESS            The attributes were cleared for the memory
-                                    region.
-  @retval RETURN_INVALID_PARAMETER  Number of pages is zero.
-  @retval RETURN_UNSUPPORTED        Clearing memory encryption attribute is not
-                                    supported
-  **/
+  @retval RETURN_SUCCESS              The attributes were cleared for the
+                                      memory region.
+  @retval RETURN_INVALID_PARAMETER    Number of pages is zero.
+  @retval RETURN_UNSUPPORTED          Clearing the memory encryption attribute
+                                      is not supported
+**/
 RETURN_STATUS
 EFIAPI
 MemEncryptSevClearPageEncMask (
   IN PHYSICAL_ADDRESS         Cr3BaseAddress,
   IN PHYSICAL_ADDRESS         BaseAddress,
-  IN UINTN                    NumberOfPages,
+  IN UINTN                    NumPages,
   IN BOOLEAN                  Flush
   )
 {
diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c
index 4b7fdf7d04..5b8bc73764 100644
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c
@@ -24,15 +24,14 @@
 #include "VirtualMemory.h"
 
 /**
-
   This function clears memory encryption bit for the memory region specified by
-  BaseAddress and Number of pages from the current page table context.
+  BaseAddress and NumPages from the current page table context.
 
   @param[in]  Cr3BaseAddress          Cr3 Base Address (if zero then use
                                       current CR3)
   @param[in]  BaseAddress             The physical address that is the start
                                       address of a memory region.
-  @param[in]  NumberOfPages           The number of pages from start memory
+  @param[in]  NumPages                The number of pages from start memory
                                       region.
   @param[in]  Flush                   Flush the caches before clearing the bit
                                       (mostly TRUE except MMIO addresses)
@@ -42,7 +41,7 @@
   @retval RETURN_INVALID_PARAMETER    Number of pages is zero.
   @retval RETURN_UNSUPPORTED          Clearing the memory encryption attribute
                                       is not supported
-  **/
+**/
 RETURN_STATUS
 EFIAPI
 MemEncryptSevClearPageEncMask (