diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
index 4a4925afe5..b1c6923035 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.c
@@ -61,8 +61,11 @@ InternalPrintMessage (
 /**
   Find and display image base address and return image base and its entry point.
   
-  @return EFI_SUCCESS     Image base address.
-  @return 0               Image header cannot be found.
+  @param CurrentEip      Current instruction pointer.
+  @param EntryPoint      Return module entry point if module header is found.
+  
+  @return !0     Image base address.
+  @return 0      Image header cannot be found.
 **/
 UINTN 
 FindModuleImageBase (
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
index fa245e2ac8..66847eaae6 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h
@@ -72,8 +72,11 @@ InternalPrintMessage (
 /**
   Find and display image base address and return image base and its entry point.
   
-  @return EFI_SUCCESS     Image base address.
-  @return 0               Image header cannot be found.
+  @param CurrentEip      Current instruction pointer.
+  @param EntryPoint      Return module entry point if module header is found.
+  
+  @return !0     Image base address.
+  @return 0      Image header cannot be found.
 **/
 UINTN 
 FindModuleImageBase (
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeSmmCpuException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeSmmCpuException.c
index 3110687284..682def43be 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeSmmCpuException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeSmmCpuException.c
@@ -68,8 +68,8 @@ CommonExceptionHandler (
 
   This API will setups the CPU exception handler to display CPU contents and run into
   CpuDeadLoop(). 
-  @Note: Before invoking this API, caller must allocate memory for IDT table and load 
-         IDTR by AsmWriteIdtr().
+  Note: Before invoking this API, caller must allocate memory for IDT table and load 
+        IDTR by AsmWriteIdtr().
   
 **/
 VOID
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c
index de76e478ba..ebd9fe32b7 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuException.c
@@ -49,8 +49,8 @@ CommonExceptionHandler (
 
   This API will setups the CPU exception handler to display CPU contents and run into
   CpuDeadLoop(). 
-  @Note: Before invoking this API, caller must allocate memory for IDT table and load 
-         IDTR by AsmWriteIdtr().
+  Note: Before invoking this API, caller must allocate memory for IDT table and load 
+        IDTR by AsmWriteIdtr().
   
 **/
 VOID