diff --git a/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm b/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm
index d0e56b2360..71e3e5a1e2 100644
--- a/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm
+++ b/IntelFspPkg/FspSecCore/Ia32/FspApiEntry.asm
@@ -368,15 +368,15 @@ TempRamInitApi   PROC    NEAR    PUBLIC
   mov       eax, dword ptr [esp + 4]
   cmp       eax, 0
   mov       eax, 80000002h
-  jz        NemInitExit
+  jz        TempRamInitExit
 
   ;
   ; Sec Platform Init
   ;
   CALL_MMX  SecPlatformInit
   cmp       eax, 0
-  jnz       NemInitExit
-  
+  jnz       TempRamInitExit
+
   ; Load microcode
   LOAD_ESP
   CALL_MMX  LoadMicrocode
@@ -387,14 +387,14 @@ TempRamInitApi   PROC    NEAR    PUBLIC
   LOAD_ESP
   CALL_MMX  SecCarInit
   cmp       eax, 0
-  jnz       NemInitExit
+  jnz       TempRamInitExit
 
   LOAD_ESP
   CALL_MMX  EstablishStackFsp
 
   LXMMN      xmm6, eax, 3  ;Restore microcode status if no CAR init error from ECX-SLOT 3 in xmm6.
 
-NemInitExit:
+TempRamInitExit:
   ;
   ; Load EBP, EBX, ESI, EDI & ESP from XMM7 & XMM6
   ;
diff --git a/IntelFspPkg/FspSecCore/SecMain.c b/IntelFspPkg/FspSecCore/SecMain.c
index 63376e9b6e..99acefaefa 100644
--- a/IntelFspPkg/FspSecCore/SecMain.c
+++ b/IntelFspPkg/FspSecCore/SecMain.c
@@ -104,7 +104,7 @@ SecStartup (
   AsmWriteIdtr (&IdtDescriptor);
 
   //
-  // Iniitalize the global FSP data region
+  // Initialize the global FSP data region
   //
   FspGlobalDataInit (&PeiFspData, BootLoaderStack, (UINT8)ApiIdx);
 
diff --git a/IntelFspPkg/Library/BaseCacheLib/CacheLib.c b/IntelFspPkg/Library/BaseCacheLib/CacheLib.c
index 1a08918597..b38dce32a8 100644
--- a/IntelFspPkg/Library/BaseCacheLib/CacheLib.c
+++ b/IntelFspPkg/Library/BaseCacheLib/CacheLib.c
@@ -45,7 +45,7 @@ SearchForExactMtrr (
   @param[in] MemoryCacheType  input cache type to be checked.
 
   @retval TRUE MemoryCacheType is default MTRR setting.
-  @retval TRUE MemoryCacheType is NOT default MTRR setting.
+  @retval FALSE MemoryCacheType is NOT default MTRR setting.
 **/
 BOOLEAN
 IsDefaultType (