diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
index 9c5707ecf3..ba62c6ac27 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c
@@ -166,7 +166,7 @@ DebuggerDisplaySymbolAccrodingToAddress (
 //  EDBPrint (L"  0xFFFFFFFF00000000 ( F) TestMain\n");
     EDBPrint (
       L"  0x%016lx %s %a\n",
-      (UINT64)Entry->RVA + Object->BaseAddress,
+      (UINT64)Entry->Rva + Object->BaseAddress,
       EdbSymbolTypeToStr (Entry->Type),
       Entry->Name
       );
@@ -176,7 +176,7 @@ DebuggerDisplaySymbolAccrodingToAddress (
 //  EDBPrint (L"  0xFFFF0000 ( F) TestMain\n");
     EDBPrint (
       L"  0x%08x %s %a\n",
-      Entry->RVA + Object->BaseAddress,
+      Entry->Rva + Object->BaseAddress,
       EdbSymbolTypeToStr (Entry->Type),
       Entry->Name
       );
@@ -273,7 +273,7 @@ DebuggerDisplaySymbolAccrodingToName (
       if (sizeof(UINTN) == sizeof(UINT64)) {
         EDBPrint (
           L"  0x%016lx %s %a (%a)\n",
-          (UINT64)Entry->RVA + Object->BaseAddress,
+          (UINT64)Entry->Rva + Object->BaseAddress,
           EdbSymbolTypeToStr (Entry->Type),
           Entry->Name,
           Entry->ObjName
@@ -281,7 +281,7 @@ DebuggerDisplaySymbolAccrodingToName (
       } else {
         EDBPrint (
           L"  0x%08x %s %a (%a)\n",
-          Entry->RVA + Object->BaseAddress,
+          Entry->Rva + Object->BaseAddress,
           EdbSymbolTypeToStr (Entry->Type),
           Entry->Name,
           Entry->ObjName
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
index 2a54be1605..d452b2bb2e 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommon.h
@@ -90,7 +90,7 @@ typedef enum {
 
 typedef struct {
   CHAR8                      Name[EFI_DEBUGGER_SYMBOL_NAME_MAX];
-  UINTN                      RVA;
+  UINTN                      Rva;
   EFI_DEBUGGER_SYMBOL_TYPE   Type;
   CHAR8                      ObjName[EFI_DEBUGGER_SYMBOL_NAME_MAX];
   CHAR8                      *CodBuffer;
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
index e6a677d764..4e640ea0e6 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
@@ -67,7 +67,7 @@ EdbLoadSymbolSingleEntry (
   if (ObjName != NULL) {
     AsciiStrnCpyS (Entry->ObjName, sizeof(Entry->ObjName), ObjName, sizeof(Entry->ObjName) - 1);
   }
-  Entry->RVA = Address % EFI_DEBUGGER_DEFAULT_LINK_IMAGEBASE;
+  Entry->Rva = Address % EFI_DEBUGGER_DEFAULT_LINK_IMAGEBASE;
   Entry->Type = Type;
 
   //
@@ -515,16 +515,16 @@ EbdFindSymbolAddress (
     //
     Entry = Object->Entry;
     for (SubIndex = 0; SubIndex < Object->EntryCount; SubIndex++, Entry++) {
-      if (Address != Entry->RVA + Object->BaseAddress) {
+      if (Address != Entry->Rva + Object->BaseAddress) {
         //
         // Check for nearest address
         //
-        if (Address > Entry->RVA + Object->BaseAddress) {
+        if (Address > Entry->Rva + Object->BaseAddress) {
           //
           // Record it if Current RVA < Address
           //
-          if (CandidateLowerAddress < Entry->RVA + Object->BaseAddress) {
-            CandidateLowerAddress = Entry->RVA + Object->BaseAddress;
+          if (CandidateLowerAddress < Entry->Rva + Object->BaseAddress) {
+            CandidateLowerAddress = Entry->Rva + Object->BaseAddress;
             LowEntry = Entry;
             LowObject = Object;
           }
@@ -532,8 +532,8 @@ EbdFindSymbolAddress (
           //
           // Record it if Current RVA > Address
           //
-          if (CandidateUpperAddress > Entry->RVA + Object->BaseAddress) {
-            CandidateUpperAddress = Entry->RVA + Object->BaseAddress;
+          if (CandidateUpperAddress > Entry->Rva + Object->BaseAddress) {
+            CandidateUpperAddress = Entry->Rva + Object->BaseAddress;
             UpperEntry = Entry;
             UpperObject = Object;
           }
@@ -1712,7 +1712,7 @@ FindSymbolStr (
       //
       // if Address match, return Name
       //
-      if (Address == (Entry[EntryIndex].RVA + Object[ObjectIndex].BaseAddress)) {
+      if (Address == (Entry[EntryIndex].Rva + Object[ObjectIndex].BaseAddress)) {
         return Entry[EntryIndex].Name;
       }
     }
@@ -2219,7 +2219,7 @@ Symboltoi (
           //
           // record Address
           //
-          *Address = (Entry[EntryIndex].RVA + Object[ObjectIndex].BaseAddress);
+          *Address = (Entry[EntryIndex].Rva + Object[ObjectIndex].BaseAddress);
         }
       }
     }