diff --git a/Utilities/AppleEfiSignTool/AppleEfiSignTool.c b/Utilities/AppleEfiSignTool/AppleEfiSignTool.c
index 636a0152..4df3e5fa 100644
--- a/Utilities/AppleEfiSignTool/AppleEfiSignTool.c
+++ b/Utilities/AppleEfiSignTool/AppleEfiSignTool.c
@@ -118,7 +118,12 @@ VerifySignature (
   return 0;
 }
 
-int ENTRY_POINT(int argc, const char *argv[]) {
+INT32
+ENTRY_POINT (
+  IN INT32        Argc,
+  IN CONST CHAR8  *Argv[]
+  )
+{
   CONST CHAR8          *ImageFileName;
   UINT32               ImageSize;
   UINT8                *ImageFileBuffer;
@@ -136,12 +141,12 @@ int ENTRY_POINT(int argc, const char *argv[]) {
   //
   // Print usage.
   //
-  if (argc != 2) {
+  if (Argc != 2) {
     PrintHelp ();
     return EXIT_FAILURE;
   }
 
-  ImageFileName   = argv[1];
+  ImageFileName   = Argv[1];
   ImageFileBuffer = UserReadFile (ImageFileName, &ImageSize);
   if (ImageFileBuffer == NULL) {
     DEBUG ((DEBUG_ERROR, "Failed to read %a\n", ImageFileName));
@@ -175,7 +180,7 @@ int ENTRY_POINT(int argc, const char *argv[]) {
 INT32
 LLVMFuzzerTestOneInput (
   IN  CONST UINT8  *Data,
-  IN        UINTN  Size
+  IN  UINTN        Size
   )
 {
 #if 0
diff --git a/Utilities/TestBmf/Bmf.c b/Utilities/TestBmf/Bmf.c
index ea11792a..a44ac634 100644
--- a/Utilities/TestBmf/Bmf.c
+++ b/Utilities/TestBmf/Bmf.c
@@ -53,7 +53,11 @@ GuiBmpToImage (
   return EFI_SUCCESS;
 }
 
-int main (int argc, const char *argv[])
+INT32
+ENTRY_POINT (
+  IN INT32        Argc,
+  IN CONST CHAR8  *Argv[]
+  )
 {
   BOOLEAN           Result;
   GUI_FONT_CONTEXT  Context;
@@ -66,13 +70,13 @@ int main (int argc, const char *argv[])
   VOID              *BmpImage;
   UINT32            BmpImageSize;
 
-  if (argc != 3) {
+  if (Argc != 3) {
     DEBUG ((DEBUG_ERROR, "./Bmf <FontImage> <FontMetrics>"));
     return -1;
   }
 
-  FontImage   = UserReadFile (argv[1], &FontImageSize);
-  FontMetrics = UserReadFile (argv[2], &FontMetricsSize);
+  FontImage   = UserReadFile (Argv[1], &FontImageSize);
+  FontMetrics = UserReadFile (Argv[2], &FontMetricsSize);
   Result      = GuiFontConstruct (&Context, FontImage, FontImageSize, FontMetrics, FontMetricsSize, 1);
   if (!Result) {
     DEBUG ((DEBUG_WARN, "BMF: Helvetica failed\n"));
diff --git a/Utilities/TestCpuFrequency/CpuFrequency.c b/Utilities/TestCpuFrequency/CpuFrequency.c
index e860fa21..9fea0a28 100644
--- a/Utilities/TestCpuFrequency/CpuFrequency.c
+++ b/Utilities/TestCpuFrequency/CpuFrequency.c
@@ -33,7 +33,12 @@ STATIC FREQUENCY_TEST mTests[] = {
   { 2389242546 /* Hz */, 2400 /* MHz, Raw 2389 MHz */, "C2D P8600" },
 };
 
-int main() {
+INT32
+ENTRY_POINT (
+  IN INT32        Argc,
+  IN CONST CHAR8  *Argv[]
+  )
+{
   int     RetVal;
   UINT16  Read;
   UINTN   Index;
diff --git a/Utilities/TestDiskImage/DiskImage.c b/Utilities/TestDiskImage/DiskImage.c
index 660d0590..911d5543 100644
--- a/Utilities/TestDiskImage/DiskImage.c
+++ b/Utilities/TestDiskImage/DiskImage.c
@@ -15,7 +15,12 @@
 
 #define  NUM_EXTENTS  20
 
-int ENTRY_POINT (int argc, const char *argv[]) {
+INT32
+ENTRY_POINT (
+  IN INT32        Argc,
+  IN CONST CHAR8  *Argv[]
+  )
+{
   int                          Index;
   BOOLEAN                      DmgContextValid;
   UINT8                        *Dmg;
@@ -30,22 +35,22 @@ int ENTRY_POINT (int argc, const char *argv[]) {
   UINT32                       Index2;
   OC_APPLE_CHUNKLIST_CONTEXT   ChunklistContext;
 
-  if (argc < 2) {
+  if (Argc < 2) {
     DEBUG ((DEBUG_ERROR, "Please provide a valid Disk Image path\n"));
     return -1;
   }
   
-  if ((argc % 2) != 1) {
+  if ((Argc % 2) != 1) {
     DEBUG ((DEBUG_ERROR, "Please provide a chunklist file for each DMG, enter \'n\' to skip\n"));
   }
 
-  for (Index = 1; Index < (argc - 1); Index += 2) {
+  for (Index = 1; Index < (Argc - 1); Index += 2) {
     DmgContextValid = FALSE;
     Dmg             = NULL;
     Chunklist       = NULL;
     UncompDmg       = NULL;
 
-    if ((Dmg = UserReadFile (argv[Index], &DmgSize)) == NULL) {
+    if ((Dmg = UserReadFile (Argv[Index], &DmgSize)) == NULL) {
       DEBUG ((DEBUG_ERROR, "Read fail\n"));
       goto ContinueDmgLoop;
     }
@@ -72,8 +77,8 @@ int ENTRY_POINT (int argc, const char *argv[]) {
 
     DmgContextValid = TRUE;
 
-    if (AsciiStrCmp (argv[Index + 1], "n") != 0) {
-      if ((Chunklist = UserReadFile (argv[Index + 1], &ChunklistSize)) == NULL) {
+    if (AsciiStrCmp (Argv[Index + 1], "n") != 0) {
+      if ((Chunklist = UserReadFile (Argv[Index + 1], &ChunklistSize)) == NULL) {
         DEBUG ((DEBUG_ERROR, "Read fail\n"));
         goto ContinueDmgLoop;
       }
@@ -145,7 +150,12 @@ int ENTRY_POINT (int argc, const char *argv[]) {
   return 0;
 }
 
-INT32 LLVMFuzzerTestOneInput(CONST UINT8 *Data, UINTN Size) {
+INT32
+LLVMFuzzerTestOneInput (
+  IN  CONST UINT8  *Data,
+  IN  UINTN        Size
+  )
+{
   #define  MAX_INPUT   256
   #define  MAX_OUTPUT  4096
 
diff --git a/Utilities/TestHelloWorld/HelloWorld.c b/Utilities/TestHelloWorld/HelloWorld.c
index f3bcadc4..e25fb599 100644
--- a/Utilities/TestHelloWorld/HelloWorld.c
+++ b/Utilities/TestHelloWorld/HelloWorld.c
@@ -18,7 +18,12 @@ UefiMain (
   return EFI_SUCCESS;
 }
 
-int main(int argc, const char *argv[]) {
+INT32
+ENTRY_POINT (
+  IN INT32        Argc,
+  IN CONST CHAR8  *Argv[]
+  )
+{
   UefiMain (gImageHandle, gST);
 
   return 0;
diff --git a/Utilities/TestImg4/Img4.c b/Utilities/TestImg4/Img4.c
index addc4800..15cebfe7 100644
--- a/Utilities/TestImg4/Img4.c
+++ b/Utilities/TestImg4/Img4.c
@@ -190,34 +190,34 @@ VerifyImg4 (
 
 INT32
 ENTRY_POINT (
-  INT32 argc,
-  char *argv[]
+  IN INT32        Argc,
+  IN CONST CHAR8  *Argv[]
   )
 {
   INT32  RetVal;
   INT32  Index;
 
-  if (argc < 2 || ((argc % 3) != 1 && argc != 2)) {
+  if (Argc < 2 || ((Argc % 3) != 1 && Argc != 2)) {
     DEBUG ((DEBUG_ERROR, "Usage: ./Img4 ([image path] [manifest path] [object type])*\n"));
     DEBUG ((DEBUG_ERROR, "Usage: Img4 [manifest path]\n"));
     return -1;
   }
 
-  if (argc == 2) {
-    return DebugManifest (argv[1]);
+  if (Argc == 2) {
+    return DebugManifest (Argv[1]);
   }
 
   RetVal = 0;
-  for (Index = 1; Index < (argc - 1); Index += 3) {
-    if (AsciiStrLen (argv[Index + 2]) != 4) {
+  for (Index = 1; Index < (Argc - 1); Index += 3) {
+    if (AsciiStrLen (Argv[Index + 2]) != 4) {
       DEBUG ((DEBUG_ERROR, "Object types require exactly 4 characters.\n"));
       return -1;
     }
 
     RetVal = VerifyImg4 (
-               argv[Index + 0],
-               argv[Index + 1],
-               argv[Index + 2]
+               Argv[Index + 0],
+               Argv[Index + 1],
+               Argv[Index + 2]
                );
     if (RetVal != 0) {
       return RetVal;
@@ -230,7 +230,7 @@ ENTRY_POINT (
 INT32
 LLVMFuzzerTestOneInput (
   IN CONST UINT8  *Data,
-  IN       UINTN  Size
+  IN UINTN        Size
   )
 {
   STATIC CONST UINT32  Signatures[] = {
diff --git a/Utilities/ocpasswordgen/ocpasswordgen.c b/Utilities/ocpasswordgen/ocpasswordgen.c
index ce8a0220..0f373baa 100644
--- a/Utilities/ocpasswordgen/ocpasswordgen.c
+++ b/Utilities/ocpasswordgen/ocpasswordgen.c
@@ -9,7 +9,12 @@
 #include <Library/OcCryptoLib.h>
 #include <UserPseudoRandom.h>
 
-int main(void) {
+INT32
+ENTRY_POINT (
+  IN INT32        Argc,
+  IN CONST CHAR8  *Argv[]
+  )
+{
   CHAR8   Char;
   UINT8   Password[OC_PASSWORD_MAX_LEN];
   UINT8   PasswordLen;