77 files changed, 114 insertions, 114 deletions
diff --git a/MdePkg/Library/BaseLib/BaseLibInternals.h b/MdePkg/Library/BaseLib/BaseLibInternals.h
index 431c1e3533..3223de55ac 100644
--- a/MdePkg/Library/BaseLib/BaseLibInternals.h
+++ b/MdePkg/Library/BaseLib/BaseLibInternals.h
@@ -579,7 +579,7 @@ InternalLongJump (
   Reads the current Global Descriptor Table Register(GDTR) descriptor.
 
   Reads and returns the current GDTR descriptor and returns it in Gdtr. This
-  function is only available on IA-32 and X64.
+  function is only available on IA-32 and x64.
 
   @param  Gdtr  Pointer to a GDTR descriptor.
 
@@ -594,7 +594,7 @@ InternalX86ReadGdtr (
   Writes the current Global Descriptor Table Register (GDTR) descriptor.
 
   Writes and the current GDTR descriptor specified by Gdtr. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   @param  Gdtr  Pointer to a GDTR descriptor.
 
@@ -609,7 +609,7 @@ InternalX86WriteGdtr (
   Reads the current Interrupt Descriptor Table Register(GDTR) descriptor.
 
   Reads and returns the current IDTR descriptor and returns it in Idtr. This
-  function is only available on IA-32 and X64.
+  function is only available on IA-32 and x64.
 
   @param  Idtr  Pointer to a IDTR descriptor.
 
@@ -624,7 +624,7 @@ InternalX86ReadIdtr (
   Writes the current Interrupt Descriptor Table Register(GDTR) descriptor.
 
   Writes the current IDTR descriptor and returns it in Idtr. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   @param  Idtr  Pointer to a IDTR descriptor.
 
@@ -640,7 +640,7 @@ InternalX86WriteIdtr (
 
   Saves the current floating point/SSE/SSE2 state to the buffer specified by
   Buffer. Buffer must be aligned on a 16-byte boundary. This function is only
-  available on IA-32 and X64.
+  available on IA-32 and x64.
 
   @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
 
@@ -656,7 +656,7 @@ InternalX86FxSave (
 
   Restores the current floating point/SSE/SSE2 state from the buffer specified
   by Buffer. Buffer must be aligned on a 16-byte boundary. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
 
@@ -790,7 +790,7 @@ InternalX86EnablePaging64 (
 
   Disables the 64-bit paging mode on the CPU and returns to 32-bit protected
   mode. This function assumes the current execution mode is 64-paging mode.
-  This function is only available on X64. After the 64-bit paging mode is
+  This function is only available on x64. After the 64-bit paging mode is
   disabled, control is transferred to the function specified by EntryPoint
   using the new stack specified by NewStack and passing in the parameters
   specified by Context1 and Context2. Context1 and Context2 are optional and
diff --git a/MdePkg/Library/BaseLib/Ia32/CpuId.c b/MdePkg/Library/BaseLib/Ia32/CpuId.c
index 9745ae21d4..2473797bbe 100644
--- a/MdePkg/Library/BaseLib/Ia32/CpuId.c
+++ b/MdePkg/Library/BaseLib/Ia32/CpuId.c
@@ -21,7 +21,7 @@
   If Ebx is not NULL, then the value of EBX after CPUID is returned in Ebx.
   If Ecx is not NULL, then the value of ECX after CPUID is returned in Ecx.
   If Edx is not NULL, then the value of EDX after CPUID is returned in Edx.
-  This function is only available on IA-32 and X64.
+  This function is only available on IA-32 and x64.
 
   @param  Index         The 32-bit value to load into EAX prior to invoking the CPUID
                         instruction.
diff --git a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
index f4caabedd4..d157fbfb67 100644
--- a/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
+++ b/MdePkg/Library/BaseLib/Ia32/FlushCacheLine.c
@@ -20,7 +20,7 @@
   coherency domain of the CPU.
 
   Flushed the cache line specified by LinearAddress, and returns LinearAddress.
-  This function is only available on IA-32 and X64.
+  This function is only available on IA-32 and x64.
 
   @param  LinearAddress The address of the cache line to flush. If the CPU is
                         in a physical addressing mode, then LinearAddress is a
diff --git a/MdePkg/Library/BaseLib/Ia32/FxRestore.c b/MdePkg/Library/BaseLib/Ia32/FxRestore.c
index 655db517d1..2f7b11da14 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxRestore.c
+++ b/MdePkg/Library/BaseLib/Ia32/FxRestore.c
@@ -21,7 +21,7 @@
 
   Restores the current floating point/SSE/SSE2 state from the buffer specified
   by Buffer. Buffer must be aligned on a 16-byte boundary. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/FxSave.c b/MdePkg/Library/BaseLib/Ia32/FxSave.c
index a59d2a56f5..70183b790b 100644
--- a/MdePkg/Library/BaseLib/Ia32/FxSave.c
+++ b/MdePkg/Library/BaseLib/Ia32/FxSave.c
@@ -21,7 +21,7 @@
 
   Saves the current floating point/SSE/SSE2 state to the buffer specified by
   Buffer. Buffer must be aligned on a 16-byte boundary. This function is only
-  available on IA-32 and X64.
+  available on IA-32 and x64.
 
   @param  Buffer  Pointer to a buffer to save the floating point/SSE/SSE2 context.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.c b/MdePkg/Library/BaseLib/Ia32/Invd.c
index b1db5a2959..0e3749b807 100644
--- a/MdePkg/Library/BaseLib/Ia32/Invd.c
+++ b/MdePkg/Library/BaseLib/Ia32/Invd.c
@@ -19,7 +19,7 @@
   Executes a INVD instruction.
 
   Executes a INVD instruction. This function is only available on IA-32 and
-  X64.
+  x64.
 
 **/
 VOID
diff --git a/MdePkg/Library/BaseLib/Ia32/Monitor.c b/MdePkg/Library/BaseLib/Ia32/Monitor.c
index 8e2bb29fa5..ef5a7929b2 100644
--- a/MdePkg/Library/BaseLib/Ia32/Monitor.c
+++ b/MdePkg/Library/BaseLib/Ia32/Monitor.c
@@ -16,7 +16,7 @@
   Sets up a monitor buffer that is used by AsmMwait().
 
   Executes a MONITOR instruction with the register state specified by Eax, Ecx
-  and Edx. Returns Eax. This function is only available on IA-32 and X64.
+  and Edx. Returns Eax. This function is only available on IA-32 and x64.
 
   @param  RegisterEax The value to load into EAX or RAX before executing the MONITOR
                       instruction.
diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.c b/MdePkg/Library/BaseLib/Ia32/Mwait.c
index 1a28d2eca7..8e6993725e 100644
--- a/MdePkg/Library/BaseLib/Ia32/Mwait.c
+++ b/MdePkg/Library/BaseLib/Ia32/Mwait.c
@@ -16,7 +16,7 @@
   Executes an MWAIT instruction.
 
   Executes an MWAIT instruction with the register state specified by Eax and
-  Ecx. Returns Eax. This function is only available on IA-32 and X64.
+  Ecx. Returns Eax. This function is only available on IA-32 and x64.
 
   @param  RegisterEax The value to load into EAX or RAX before executing the MONITOR
                       instruction.
diff --git a/MdePkg/Library/BaseLib/Ia32/Non-existing.c b/MdePkg/Library/BaseLib/Ia32/Non-existing.c
index a83a1689b3..4d94e15421 100644
--- a/MdePkg/Library/BaseLib/Ia32/Non-existing.c
+++ b/MdePkg/Library/BaseLib/Ia32/Non-existing.c
@@ -19,7 +19,7 @@
 
   Disables the 64-bit paging mode on the CPU and returns to 32-bit protected
   mode. This function assumes the current execution mode is 64-paging mode.
-  This function is only available on X64. After the 64-bit paging mode is
+  This function is only available on x64. After the 64-bit paging mode is
   disabled, control is transferred to the function specified by EntryPoint
   using the new stack specified by NewStack and passing in the parameters
   specified by Context1 and Context2. Context1 and Context2 are optional and
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c b/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
index 3f95c50bf8..e5d34934b6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr0.c
@@ -19,8 +19,8 @@
   Reads the current value of the Control Register 0 (CR0).
 
   Reads and returns the current value of CR4. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of the Control Register 0 (CR0).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c b/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
index 4acf74c5ad..61e7fb3b43 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr2.c
@@ -19,8 +19,8 @@
   Reads the current value of the Control Register 2 (CR2).
 
   Reads and returns the current value of CR2. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of the Control Register 2 (CR2).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c b/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
index 8d99f34bb7..eb16d48dfd 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr3.c
@@ -19,8 +19,8 @@
   Reads the current value of the Control Register 3 (CR3).
 
   Reads and returns the current value of CR3. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of the Control Register 3 (CR3).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c b/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
index ec001d14fa..2fe77d3719 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCr4.c
@@ -19,8 +19,8 @@
   Reads the current value of the Control Register 4 (CR4).
 
   Reads and returns the current value of CR4. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of the Control Register 4 (CR4).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadCs.c b/MdePkg/Library/BaseLib/Ia32/ReadCs.c
index c2e8b8d061..4ff0bc06a2 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadCs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadCs.c
@@ -19,7 +19,7 @@
   Reads the current value of Code Segment Register (CS).
 
   Reads and returns the current value of CS. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @return The current value of CS.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c b/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
index 70c1e70e31..fdd840f8cb 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr0.c
@@ -19,8 +19,8 @@
   Reads the current value of Debug Register 0 (DR0).
 
   Reads and returns the current value of DR0. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of Debug Register 0 (DR0).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c b/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
index 109da75b7f..33ff3df35f 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr1.c
@@ -19,8 +19,8 @@
   Reads the current value of Debug Register 1 (DR1).
 
   Reads and returns the current value of DR1. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of Debug Register 1 (DR1).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c b/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
index 1b1d6845cb..326f82a897 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr2.c
@@ -19,8 +19,8 @@
   Reads the current value of Debug Register 2 (DR2).
 
   Reads and returns the current value of DR2. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of Debug Register 2 (DR2).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c b/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
index 47341fea7e..c38994a23d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr3.c
@@ -19,8 +19,8 @@
   Reads the current value of Debug Register 3 (DR3).
 
   Reads and returns the current value of DR3. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of Debug Register 3 (DR3).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c b/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
index a5cc8a19d5..810b0ebf5c 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr4.c
@@ -19,8 +19,8 @@
   Reads the current value of Debug Register 4 (DR4).
 
   Reads and returns the current value of DR4. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of Debug Register 4 (DR4).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c b/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
index 24b5b88f18..10e7a6aae6 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr5.c
@@ -19,8 +19,8 @@
   Reads the current value of Debug Register 5 (DR5).
 
   Reads and returns the current value of DR5. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of Debug Register 5 (DR5).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c b/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
index 676186e25d..8480441268 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr6.c
@@ -19,8 +19,8 @@
   Reads the current value of Debug Register 6 (DR6).
 
   Reads and returns the current value of DR6. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of Debug Register 6 (DR6).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c b/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
index aad514a480..3d9a8f19c3 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDr7.c
@@ -19,8 +19,8 @@
   Reads the current value of Debug Register 7 (DR7).
 
   Reads and returns the current value of DR7. This function is only available
-  on IA-32 and X64. This returns a 32-bit value on IA-32 and a 64-bit value on
-  X64.
+  on IA-32 and x64. This returns a 32-bit value on IA-32 and a 64-bit value on
+  x64.
 
   @return The value of Debug Register 7 (DR7).
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadDs.c b/MdePkg/Library/BaseLib/Ia32/ReadDs.c
index 0215e35e36..3177cd5754 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadDs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadDs.c
@@ -19,7 +19,7 @@
   Reads the current value of Data Segment Register (DS).
 
   Reads and returns the current value of DS. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @return The current value of DS.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c b/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
index 0773fb27e4..8342c0382b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEflags.c
@@ -19,10 +19,10 @@
   Reads the current value of the EFLAGS register.
 
   Reads and returns the current value of the EFLAGS register. This function is
-  only available on IA-32 and X64. This returns a 32-bit value on IA-32 and a
-  64-bit value on X64.
+  only available on IA-32 and x64. This returns a 32-bit value on IA-32 and a
+  64-bit value on x64.
 
-  @return EFLAGS on IA-32 or RFLAGS on X64.
+  @return EFLAGS on IA-32 or RFLAGS on x64.
 
 **/
 UINTN
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadEs.c b/MdePkg/Library/BaseLib/Ia32/ReadEs.c
index 3c5c981ed7..3704125ea3 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadEs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadEs.c
@@ -19,7 +19,7 @@
   Reads the current value of ES Data Segment Register (ES).
 
   Reads and returns the current value of ES. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @return The current value of ES.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadFs.c b/MdePkg/Library/BaseLib/Ia32/ReadFs.c
index 2f64955fe9..de551e4348 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadFs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadFs.c
@@ -19,7 +19,7 @@
   Reads the current value of FS Data Segment Register (FS).
 
   Reads and returns the current value of FS. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @return The current value of FS.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
index 9429eb6cda..4979174c82 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGdtr.c
@@ -20,7 +20,7 @@
   Reads the current Global Descriptor Table Register(GDTR) descriptor.
 
   Reads and returns the current GDTR descriptor and returns it in Gdtr. This
-  function is only available on IA-32 and X64.
+  function is only available on IA-32 and x64.
 
   @param  Gdtr  Pointer to a GDTR descriptor.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadGs.c b/MdePkg/Library/BaseLib/Ia32/ReadGs.c
index c71d238b2d..947cf4e875 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadGs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadGs.c
@@ -19,7 +19,7 @@
   Reads the current value of GS Data Segment Register (GS).
 
   Reads and returns the current value of GS. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @return The current value of GS.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
index 0825c47b24..9c32d05ee2 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadIdtr.c
@@ -20,7 +20,7 @@
   Reads the current Interrupt Descriptor Table Register(GDTR) descriptor.
 
   Reads and returns the current IDTR descriptor and returns it in Idtr. This
-  function is only available on IA-32 and X64.
+  function is only available on IA-32 and x64.
 
   @param  Idtr  Pointer to a IDTR descriptor.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
index 8b9277d754..a2ddeff225 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadLdtr.c
@@ -19,7 +19,7 @@
   Reads the current Local Descriptor Table Register(LDTR) selector.
 
   Reads and returns the current 16-bit LDTR descriptor value. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   @return The current selector of LDT.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c b/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
index 83a06b720e..0f2de145ab 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm0.c
@@ -19,7 +19,7 @@
   Reads the current value of 64-bit MMX Register #0 (MM0).
 
   Reads and returns the current value of MM0. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of MM0.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c b/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
index 38c9a6d276..65cb677fcd 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm1.c
@@ -19,7 +19,7 @@
   Reads the current value of 64-bit MMX Register #1 (MM1).
 
   Reads and returns the current value of MM1. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of MM1.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c b/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
index baa9fde126..6b7060b9a2 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm2.c
@@ -19,7 +19,7 @@
   Reads the current value of 64-bit MMX Register #2 (MM2).
 
   Reads and returns the current value of MM2. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of MM2.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c b/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
index d77f5107b0..fdd64fdd81 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm3.c
@@ -19,7 +19,7 @@
   Reads the current value of 64-bit MMX Register #3 (MM3).
 
   Reads and returns the current value of MM3. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of MM3.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c b/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
index d52bcb872c..5d2ab0d71d 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm4.c
@@ -19,7 +19,7 @@
   Reads the current value of 64-bit MMX Register #4 (MM4).
 
   Reads and returns the current value of MM4. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of MM4.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c b/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
index 242691e7a5..e5728008ca 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm5.c
@@ -19,7 +19,7 @@
   Reads the current value of 64-bit MMX Register #5 (MM5).
 
   Reads and returns the current value of MM5. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of MM5.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c b/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
index a2b6c990b0..7647e7990b 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm6.c
@@ -19,7 +19,7 @@
   Reads the current value of 64-bit MMX Register #6 (MM6).
 
   Reads and returns the current value of MM6. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of MM6.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c b/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
index dd065a5eb5..6d5dab8d74 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMm7.c
@@ -19,7 +19,7 @@
   Reads the current value of 64-bit MMX Register #7 (MM7).
 
   Reads and returns the current value of MM7. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of MM7.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
index 222c46e642..7d7de3ab5e 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadMsr64.c
@@ -22,7 +22,7 @@
   performed on Index, and some Index values may cause CPU exceptions. The
   caller must either guarantee that Index is valid, or the caller must set up
   exception handlers to catch the exceptions. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @param  Index The 32-bit MSR index to read.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c b/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
index e37425ada4..b6e0fe6498 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadPmc.c
@@ -16,7 +16,7 @@
   Reads the current value of a Performance Counter (PMC).
 
   Reads and returns the current value of performance counter specified by
-  Index. This function is only available on IA-32 and X64.
+  Index. This function is only available on IA-32 and x64.
 
   @param  Index The 32-bit Performance Counter index to read.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadSs.c b/MdePkg/Library/BaseLib/Ia32/ReadSs.c
index 2625332bdd..469393bb38 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadSs.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadSs.c
@@ -19,7 +19,7 @@
   Reads the current value of Stack Segment Register (SS).
 
   Reads and returns the current value of SS. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @return The current value of SS.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTr.c b/MdePkg/Library/BaseLib/Ia32/ReadTr.c
index b306139c9d..2cd78508f9 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTr.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTr.c
@@ -19,7 +19,7 @@
   Reads the current value of Task Register (TR).
 
   Reads and returns the current value of TR. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @return The current value of TR.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c b/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
index 71e5d4e952..4ffc0f2001 100644
--- a/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
+++ b/MdePkg/Library/BaseLib/Ia32/ReadTsc.c
@@ -19,7 +19,7 @@
   Reads the current value of Time Stamp Counter (TSC).
 
   Reads and returns the current value of TSC. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   @return The current value of TSC
 
diff --git a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c b/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
index d2cb54cdb0..11b213248d 100644
--- a/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
+++ b/MdePkg/Library/BaseLib/Ia32/Wbinvd.c
@@ -19,7 +19,7 @@
   Executes a WBINVD instruction.
 
   Executes a WBINVD instruction. This function is only available on IA-32 and
-  X64.
+  x64.
 
 **/
 VOID
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c b/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
index 733bb4eae5..776a44db5e 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr0.c
@@ -16,7 +16,7 @@
   Writes a value to Control Register 0 (CR0).
 
   Writes and returns a new value to CR0. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to CR0.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c b/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
index 436a00a8b9..67f45649f5 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr2.c
@@ -16,7 +16,7 @@
   Writes a value to Control Register 2 (CR2).
 
   Writes and returns a new value to CR2. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to CR2.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c b/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
index eff61f8436..d1a4e6b615 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr3.c
@@ -16,7 +16,7 @@
   Writes a value to Control Register 3 (CR3).
 
   Writes and returns a new value to CR3. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to CR3.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c b/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
index e118d824a5..85212dd627 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteCr4.c
@@ -16,7 +16,7 @@
   Writes a value to Control Register 4 (CR4).
 
   Writes and returns a new value to CR4. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to CR4.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c b/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
index 93704b97dd..11700afa4a 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr0.c
@@ -16,7 +16,7 @@
   Writes a value to Debug Register 0 (DR0).
 
   Writes and returns a new value to DR0. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to Dr0.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c b/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
index 762a7c3a46..779222d189 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr1.c
@@ -16,7 +16,7 @@
   Writes a value to Debug Register 1 (DR1).
 
   Writes and returns a new value to DR1. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to Dr1.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c b/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
index c98bea53c8..d8a5a5be5e 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr2.c
@@ -16,7 +16,7 @@
   Writes a value to Debug Register 2 (DR2).
 
   Writes and returns a new value to DR2. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to Dr2.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c b/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
index 4b1c04c8d1..55635865a7 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr3.c
@@ -16,7 +16,7 @@
   Writes a value to Debug Register 3 (DR3).
 
   Writes and returns a new value to DR3. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to Dr3.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c b/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
index 0712d15018..e66cd6cb48 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr4.c
@@ -16,7 +16,7 @@
   Writes a value to Debug Register 4 (DR4).
 
   Writes and returns a new value to DR4. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to Dr4.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c b/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
index 5b8dcae3f0..ee7b55c057 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr5.c
@@ -16,7 +16,7 @@
   Writes a value to Debug Register 5 (DR5).
 
   Writes and returns a new value to DR5. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to Dr5.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c b/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
index 57697a1742..9da9ba8904 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr6.c
@@ -16,7 +16,7 @@
   Writes a value to Debug Register 6 (DR6).
 
   Writes and returns a new value to DR6. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to Dr6.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c b/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
index 2f9f88d69e..3dec535d98 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteDr7.c
@@ -16,7 +16,7 @@
   Writes a value to Debug Register 7 (DR7).
 
   Writes and returns a new value to DR7. This function is only available on
-  IA-32 and X64. This writes a 32-bit value on IA-32 and a 64-bit value on X64.
+  IA-32 and x64. This writes a 32-bit value on IA-32 and a 64-bit value on x64.
 
   @param  Value The value to write to Dr7.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
index a7013531c7..544ceb6b1a 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteGdtr.c
@@ -20,7 +20,7 @@
   Writes the current Global Descriptor Table Register (GDTR) descriptor.
 
   Writes and the current GDTR descriptor specified by Gdtr. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   @param  Gdtr  Pointer to a GDTR descriptor.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
index daea4f9728..de24ab3d8c 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteIdtr.c
@@ -19,7 +19,7 @@
   Writes the current Interrupt Descriptor Table Register(GDTR) descriptor.
 
   Writes the current IDTR descriptor and returns it in Idtr. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   @param  Idtr  Pointer to a IDTR descriptor.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
index 65eec0d4e2..fa48208b99 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.c
@@ -19,7 +19,7 @@
   Writes the current Local Descriptor Table Register (GDTR) selector.
 
   Writes and the current LDTR descriptor specified by Ldtr. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   @param  Ldtr  16-bit LDTR selector value.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c b/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
index f65291e020..55aa43abd0 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm0.c
@@ -19,7 +19,7 @@
   Writes the current value of 64-bit MMX Register #0 (MM0).
 
   Writes the current value of MM0. This function is only available on IA32 and
-  X64.
+  x64.
 
   @param  Value The 64-bit value to write to MM0.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c b/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
index 999094acd0..a4bc96d6ec 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm1.c
@@ -19,7 +19,7 @@
   Writes the current value of 64-bit MMX Register #1 (MM1).
 
   Writes the current value of MM1. This function is only available on IA32 and
-  X64.
+  x64.
 
   @param  Value The 64-bit value to write to MM1.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c b/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
index 0df50214dd..c6a09a14f3 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm2.c
@@ -19,7 +19,7 @@
   Writes the current value of 64-bit MMX Register #2 (MM2).
 
   Writes the current value of MM2. This function is only available on IA32 and
-  X64.
+  x64.
 
   @param  Value The 64-bit value to write to MM2.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c b/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
index 78f7f611a6..692d2a84ae 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm3.c
@@ -19,7 +19,7 @@
   Writes the current value of 64-bit MMX Register #3 (MM3).
 
   Writes the current value of MM3. This function is only available on IA32 and
-  X64.
+  x64.
 
   @param  Value The 64-bit value to write to MM3.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c b/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
index 109bd403fd..e66347e932 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm4.c
@@ -19,7 +19,7 @@
   Writes the current value of 64-bit MMX Register #4 (MM4).
 
   Writes the current value of MM4. This function is only available on IA32 and
-  X64.
+  x64.
 
   @param  Value The 64-bit value to write to MM4.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c b/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
index 0fb8770fd8..8085bf3bdd 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm5.c
@@ -19,7 +19,7 @@
   Writes the current value of 64-bit MMX Register #5 (MM5).
 
   Writes the current value of MM5. This function is only available on IA32 and
-  X64.
+  x64.
 
   @param  Value The 64-bit value to write to MM5.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c b/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
index e79bddb56f..5fd464fe55 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm6.c
@@ -19,7 +19,7 @@
   Writes the current value of 64-bit MMX Register #6 (MM6).
 
   Writes the current value of MM6. This function is only available on IA32 and
-  X64.
+  x64.
 
   @param  Value The 64-bit value to write to MM6.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c b/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
index cce4662e12..c82ba20b6f 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMm7.c
@@ -19,7 +19,7 @@
   Writes the current value of 64-bit MMX Register #7 (MM7).
 
   Writes the current value of MM7. This function is only available on IA32 and
-  X64.
+  x64.
 
   @param  Value The 64-bit value to write to MM7.
 
diff --git a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
index 5937ac8044..f59570fd7e 100644
--- a/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
+++ b/MdePkg/Library/BaseLib/Ia32/WriteMsr64.c
@@ -24,7 +24,7 @@
   performed on Index or Value, and some of these may cause CPU exceptions. The
   caller must either guarantee that Index and Value are valid, or the caller
   must establish proper exception handlers. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @param  Index The 32-bit MSR index to write.
   @param  Value The 64-bit value to write to the MSR.
diff --git a/MdePkg/Library/BaseLib/X86DisablePaging64.c b/MdePkg/Library/BaseLib/X86DisablePaging64.c
index c67e535da7..6b890be2cc 100644
--- a/MdePkg/Library/BaseLib/X86DisablePaging64.c
+++ b/MdePkg/Library/BaseLib/X86DisablePaging64.c
@@ -22,7 +22,7 @@
 
   Disables the 64-bit paging mode on the CPU and returns to 32-bit protected
   mode. This function assumes the current execution mode is 64-paging mode.
-  This function is only available on X64. After the 64-bit paging mode is
+  This function is only available on x64. After the 64-bit paging mode is
   disabled, control is transferred to the function specified by EntryPoint
   using the new stack specified by NewStack and passing in the parameters
   specified by Context1 and Context2. Context1 and Context2 are optional and
diff --git a/MdePkg/Library/BaseLib/X86FxRestore.c b/MdePkg/Library/BaseLib/X86FxRestore.c
index ac6f472983..a484b87836 100644
--- a/MdePkg/Library/BaseLib/X86FxRestore.c
+++ b/MdePkg/Library/BaseLib/X86FxRestore.c
@@ -22,7 +22,7 @@
 
   Restores the current floating point/SSE/SSE2 state from the buffer specified
   by Buffer. Buffer must be aligned on a 16-byte boundary. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   If Buffer is NULL, then ASSERT().
   If Buffer is not aligned on a 16-byte boundary, then ASSERT().
diff --git a/MdePkg/Library/BaseLib/X86FxSave.c b/MdePkg/Library/BaseLib/X86FxSave.c
index f6efa92c7e..8774a8c1c0 100644
--- a/MdePkg/Library/BaseLib/X86FxSave.c
+++ b/MdePkg/Library/BaseLib/X86FxSave.c
@@ -22,7 +22,7 @@
 
   Saves the current floating point/SSE/SSE2 state to the buffer specified by
   Buffer. Buffer must be aligned on a 16-byte boundary. This function is only
-  available on IA-32 and X64.
+  available on IA-32 and x64.
 
   If Buffer is NULL, then ASSERT().
   If Buffer is not aligned on a 16-byte boundary, then ASSERT().
diff --git a/MdePkg/Library/BaseLib/X86Msr.c b/MdePkg/Library/BaseLib/X86Msr.c
index 13ad455255..13065dd467 100644
--- a/MdePkg/Library/BaseLib/X86Msr.c
+++ b/MdePkg/Library/BaseLib/X86Msr.c
@@ -23,7 +23,7 @@
   No parameter checking is performed on Index, and some Index values may cause
   CPU exceptions. The caller must either guarantee that Index is valid, or the
   caller must set up exception handlers to catch the exceptions. This function
-  is only available on IA-32 and X64.
+  is only available on IA-32 and x64.
 
   @param  Index The 32-bit MSR index to read.
 
@@ -47,7 +47,7 @@ AsmReadMsr32 (
   the MSR is returned. No parameter checking is performed on Index or Value,
   and some of these may cause CPU exceptions. The caller must either guarantee
   that Index and Value are valid, or the caller must establish proper exception
-  handlers. This function is only available on IA-32 and X64.
+  handlers. This function is only available on IA-32 and x64.
 
   @param  Index The 32-bit MSR index to write.
   @param  Value The 32-bit value to write to the MSR.
@@ -76,7 +76,7 @@ AsmWriteMsr32 (
   performed on Index or OrData, and some of these may cause CPU exceptions. The
   caller must either guarantee that Index and OrData are valid, or the caller
   must establish proper exception handlers. This function is only available on
-  IA-32 and X64.
+  IA-32 and x64.
 
   @param  Index   The 32-bit MSR index to write.
   @param  OrData  The value to OR with the read value from the MSR.
@@ -105,7 +105,7 @@ AsmMsrOr32 (
   on Index or AndData, and some of these may cause CPU exceptions. The caller
   must either guarantee that Index and AndData are valid, or the caller must
   establish proper exception handlers. This function is only available on IA-32
-  and X64.
+  and x64.
 
   @param  Index   The 32-bit MSR index to write.
   @param  AndData The value to AND with the read value from the MSR.
@@ -136,7 +136,7 @@ AsmMsrAnd32 (
   AndData, or OrData, and some of these may cause CPU exceptions. The caller
   must either guarantee that Index, AndData, and OrData are valid, or the
   caller must establish proper exception handlers. This function is only
-  available on IA-32 and X64.
+  available on IA-32 and x64.
 
   @param  Index   The 32-bit MSR index to write.
   @param  AndData The value to AND with the read value from the MSR.
@@ -163,7 +163,7 @@ AsmMsrAndThenOr32 (
   specified by the StartBit and the EndBit. The value of the bit field is
   returned. The caller must either guarantee that Index is valid, or the caller
   must set up exception handlers to catch the exceptions. This function is only
-  available on IA-32 and X64.
+  available on IA-32 and x64.
 
   If StartBit is greater than 31, then ASSERT().
   If EndBit is greater than 31, then ASSERT().
@@ -198,7 +198,7 @@ AsmMsrBitFieldRead32 (
   returned. Extra left bits in Value are stripped. The caller must either
   guarantee that Index and the data written is valid, or the caller must set up
   exception handlers to catch the exceptions. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   If StartBit is greater than 31, then ASSERT().
   If EndBit is greater than 31, then ASSERT().
@@ -238,7 +238,7 @@ AsmMsrBitFieldWrite32 (
   written to the MSR are returned. Extra left bits in OrData are stripped. The
   caller must either guarantee that Index and the data written is valid, or
   the caller must set up exception handlers to catch the exceptions. This
-  function is only available on IA-32 and X64.
+  function is only available on IA-32 and x64.
 
   If StartBit is greater than 31, then ASSERT().
   If EndBit is greater than 31, then ASSERT().
@@ -278,7 +278,7 @@ AsmMsrBitFieldOr32 (
   MSR are returned. Extra left bits in AndData are stripped. The caller must
   either guarantee that Index and the data written is valid, or the caller must
   set up exception handlers to catch the exceptions. This function is only
-  available on IA-32 and X64.
+  available on IA-32 and x64.
 
   If StartBit is greater than 31, then ASSERT().
   If EndBit is greater than 31, then ASSERT().
@@ -320,7 +320,7 @@ AsmMsrBitFieldAnd32 (
   in both AndData and OrData are stripped. The caller must either guarantee
   that Index and the data written is valid, or the caller must set up exception
   handlers to catch the exceptions. This function is only available on IA-32
-  and X64.
+  and x64.
 
   If StartBit is greater than 31, then ASSERT().
   If EndBit is greater than 31, then ASSERT().
@@ -368,7 +368,7 @@ AsmMsrBitFieldAndThenOr32 (
   returned. No parameter checking is performed on Index or OrData, and some of
   these may cause CPU exceptions. The caller must either guarantee that Index
   and OrData are valid, or the caller must establish proper exception handlers.
-  This function is only available on IA-32 and X64.
+  This function is only available on IA-32 and x64.
 
   @param  Index   The 32-bit MSR index to write.
   @param  OrData  The value to OR with the read value from the MSR.
@@ -396,7 +396,7 @@ AsmMsrOr64 (
   parameter checking is performed on Index or OrData, and some of these may
   cause CPU exceptions. The caller must either guarantee that Index and OrData
   are valid, or the caller must establish proper exception handlers. This
-  function is only available on IA-32 and X64.
+  function is only available on IA-32 and x64.
 
   @param  Index   The 32-bit MSR index to write.
   @param  AndData The value to AND with the read value from the MSR.
@@ -426,7 +426,7 @@ AsmMsrAnd64 (
   or OrData, and some of these may cause CPU exceptions. The caller must either
   guarantee that Index, AndData, and OrData are valid, or the caller must
   establish proper exception handlers. This function is only available on IA-32
-  and X64.
+  and x64.
 
   @param  Index   The 32-bit MSR index to write.
   @param  AndData The value to AND with the read value from the MSR.
@@ -453,7 +453,7 @@ AsmMsrAndThenOr64 (
   StartBit and the EndBit. The value of the bit field is returned. The caller
   must either guarantee that Index is valid, or the caller must set up
   exception handlers to catch the exceptions. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   If StartBit is greater than 63, then ASSERT().
   If EndBit is greater than 63, then ASSERT().
@@ -487,7 +487,7 @@ AsmMsrBitFieldRead64 (
   preserved. The MSR written is returned. Extra left bits in Value are
   stripped. The caller must either guarantee that Index and the data written is
   valid, or the caller must set up exception handlers to catch the exceptions.
-  This function is only available on IA-32 and X64.
+  This function is only available on IA-32 and x64.
 
   If StartBit is greater than 63, then ASSERT().
   If EndBit is greater than 63, then ASSERT().
@@ -528,7 +528,7 @@ AsmMsrBitFieldWrite64 (
   returned. Extra left bits in OrData are stripped. The caller must either
   guarantee that Index and the data written is valid, or the caller must set up
   exception handlers to catch the exceptions. This function is only available
-  on IA-32 and X64.
+  on IA-32 and x64.
 
   If StartBit is greater than 63, then ASSERT().
   If EndBit is greater than 63, then ASSERT().
@@ -569,7 +569,7 @@ AsmMsrBitFieldOr64 (
   Extra left bits in AndData are stripped. The caller must either guarantee
   that Index and the data written is valid, or the caller must set up exception
   handlers to catch the exceptions. This function is only available on IA-32
-  and X64.
+  and x64.
 
   If StartBit is greater than 63, then ASSERT().
   If EndBit is greater than 63, then ASSERT().
@@ -611,7 +611,7 @@ AsmMsrBitFieldAnd64 (
   value written to the MSR is returned. Extra left bits in both AndData and
   OrData are stripped. The caller must either guarantee that Index and the data
   written is valid, or the caller must set up exception handlers to catch the
-  exceptions. This function is only available on IA-32 and X64.
+  exceptions. This function is only available on IA-32 and x64.
 
   If StartBit is greater than 63, then ASSERT().
   If EndBit is greater than 63, then ASSERT().
diff --git a/MdePkg/Library/BaseLib/X86ReadGdtr.c b/MdePkg/Library/BaseLib/X86ReadGdtr.c
index 80d35863cf..dc2532d688 100644
--- a/MdePkg/Library/BaseLib/X86ReadGdtr.c
+++ b/MdePkg/Library/BaseLib/X86ReadGdtr.c
@@ -21,7 +21,7 @@
   Reads the current Global Descriptor Table Register(GDTR) descriptor.
 
   Reads and returns the current GDTR descriptor and returns it in Gdtr. This
-  function is only available on IA-32 and X64.
+  function is only available on IA-32 and x64.
 
   If Gdtr is NULL, then ASSERT().
 
diff --git a/MdePkg/Library/BaseLib/X86ReadIdtr.c b/MdePkg/Library/BaseLib/X86ReadIdtr.c
index dc6cfa5c44..94b2b10a20 100644
--- a/MdePkg/Library/BaseLib/X86ReadIdtr.c
+++ b/MdePkg/Library/BaseLib/X86ReadIdtr.c
@@ -21,7 +21,7 @@
   Reads the current Interrupt Descriptor Table Register(GDTR) descriptor.
 
   Reads and returns the current IDTR descriptor and returns it in Idtr. This
-  function is only available on IA-32 and X64.
+  function is only available on IA-32 and x64.
 
   If Idtr is NULL, then ASSERT().
 
diff --git a/MdePkg/Library/BaseLib/X86Thunk.c b/MdePkg/Library/BaseLib/X86Thunk.c
index ff9f2c5f88..7bcde8389d 100644
--- a/MdePkg/Library/BaseLib/X86Thunk.c
+++ b/MdePkg/Library/BaseLib/X86Thunk.c
@@ -1,5 +1,5 @@
 /** @file
-  Real Mode Thunk Functions for IA32 and X64.
+  Real Mode Thunk Functions for IA32 and x64.
 
   Copyright (c) 2006, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
diff --git a/MdePkg/Library/BaseLib/X86WriteGdtr.c b/MdePkg/Library/BaseLib/X86WriteGdtr.c
index d513ec19e5..7eb55167cf 100644
--- a/MdePkg/Library/BaseLib/X86WriteGdtr.c
+++ b/MdePkg/Library/BaseLib/X86WriteGdtr.c
@@ -21,7 +21,7 @@
   Writes the current Global Descriptor Table Register (GDTR) descriptor.
 
   Writes and the current GDTR descriptor specified by Gdtr. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   If Gdtr is NULL, then ASSERT().
 
diff --git a/MdePkg/Library/BaseLib/X86WriteIdtr.c b/MdePkg/Library/BaseLib/X86WriteIdtr.c
index a25c9885a9..a2c5b545b9 100644
--- a/MdePkg/Library/BaseLib/X86WriteIdtr.c
+++ b/MdePkg/Library/BaseLib/X86WriteIdtr.c
@@ -21,7 +21,7 @@
   Writes the current Interrupt Descriptor Table Register(GDTR) descriptor.
 
   Writes the current IDTR descriptor and returns it in Idtr. This function is
-  only available on IA-32 and X64.
+  only available on IA-32 and x64.
 
   If Idtr is NULL, then ASSERT().