diff --git a/Library/OcCryptoLib/BigNumLibInternal.h b/Library/OcCryptoLib/BigNumLibInternal.h
index e483a47ce3c..21393b3caa1 100644
--- a/Library/OcCryptoLib/BigNumLibInternal.h
+++ b/Library/OcCryptoLib/BigNumLibInternal.h
@@ -95,7 +95,7 @@ BigNumOrWord (
   @param[in]     A             The dividend.
   @param[in]     NumWordsA     The number of Words of A.
   @param[in]     B             The divisor.
-  @param[in]     Memory        Scratch buffer 2 * NumWordsA * OC_BN_WORD_SIZE.
+  @param[in]     ModTmp        Scratch buffer 2 * NumWordsA * OC_BN_WORD_SIZE.
 **/
 VOID
 BigNumMod (
@@ -104,7 +104,7 @@ BigNumMod (
   IN     CONST OC_BN_WORD  *A,
   IN     OC_BN_NUM_WORDS   NumWordsA,
   IN     CONST OC_BN_WORD  *B,
-  IN     VOID              *Memory
+  IN     OC_BN_WORD        *ModTmp
   );
 
 /**
diff --git a/Library/OcCryptoLib/BigNumPrimitives.c b/Library/OcCryptoLib/BigNumPrimitives.c
index d0082b0ea95..7bf30fd4ce2 100644
--- a/Library/OcCryptoLib/BigNumPrimitives.c
+++ b/Library/OcCryptoLib/BigNumPrimitives.c
@@ -565,12 +565,11 @@ BigNumMod (
   IN     CONST OC_BN_WORD  *A,
   IN     OC_BN_NUM_WORDS   NumWordsA,
   IN     CONST OC_BN_WORD  *B,
-  IN     VOID              *Memory
+  IN     OC_BN_WORD        *ModTmp
   )
 {
   INTN            CmpResult;
 
-  OC_BN_WORD      *ModTmp;
   OC_BN_NUM_BITS  SigBitsModTmp;
   OC_BN_NUM_WORDS SigWordsModTmp;
 
@@ -601,7 +600,6 @@ BigNumMod (
     "An overflow verification must be added"
     );
 
-  ModTmp         = Memory;
   BigDiv         = &ModTmp[SigWordsModTmp];
   SigWordsBigDiv = SigWordsModTmp;
   //