diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 482698cbad..1b9c5a0e4a 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -751,7 +751,7 @@ public class AutoGen {
                     if (!entryPointList[i].equals("")) {
                         fileBuffer.append("  Status = ");
                         fileBuffer.append(entryPointList[i]);
-                        fileBuffer.append(" (FfsHeader, PeiServices)\r\n");
+                        fileBuffer.append(" (FfsHeader, PeiServices);\r\n");
                         fileBuffer
                                 .append("  if (!EFI_ERROR (Status) || EFI_ERROR (CombinedStatus)) {\r\n");
                         fileBuffer.append("    CombinedStatus = Status;\r\n");
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
index ce0bafeb67..2da1c6b6f5 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
@@ -148,10 +148,10 @@ public class CommonDefinition {
                     new MyEnum("PEI_CORE", ModuleTypePeiCore),
                     new MyEnum("PEIM", ModuleTypePeim),
                     new MyEnum("DXE_CORE", ModuleTypeDxeCore),
-                    new MyEnum("DXE_DRIVER", ModuleTypeDxeRuntimeDriver),
+                    new MyEnum("DXE_DRIVER", ModuleTypeDxeDriver),
                     new MyEnum("DXE_RUNTIME_DRIVER", ModuleTypeDxeRuntimeDriver),
-                    new MyEnum("DXE_SAL_DRIVER", ModuleTypeDxeSmmDriver),
-                    new MyEnum("DXE_SMM_DRIVER", ModuleTypeDxeSalDriver),
+                    new MyEnum("DXE_SMM_DRIVER", ModuleTypeDxeSmmDriver),
+                    new MyEnum("DXE_SAL_DRIVER", ModuleTypeDxeSalDriver),
                     new MyEnum("UEFI_DRIVER", ModuleTypeUefiDriver),
                     new MyEnum("UEFI_APPLICATION", ModuleTypeUefiApplication) };
     
@@ -279,4 +279,4 @@ public class CommonDefinition {
 			return false;
 		}
 		
-}
\ No newline at end of file
+}