diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
index bb4212a459..b14c86f10a 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
@@ -303,7 +303,7 @@ public class EnumerationData {
         vModuleType.addElement("DXE_RUNTIME_DRIVER");
         vModuleType.addElement("DXE_SAL_DRIVER");
         vModuleType.addElement("DXE_SMM_DRIVER");
-        vModuleType.addElement("TOOLS");
+        vModuleType.addElement("TOOL");
         vModuleType.addElement("UEFI_DRIVER");
         vModuleType.addElement("UEFI_APPLICATION");
         vModuleType.addElement("USER_DEFINED");
@@ -358,7 +358,7 @@ public class EnumerationData {
         vFrameworkModuleTypes.addElement("DXE_RUNTIME_DRIVER");
         vFrameworkModuleTypes.addElement("DXE_SAL_DRIVER");
         vFrameworkModuleTypes.addElement("DXE_SMM_DRIVER");
-        vFrameworkModuleTypes.addElement("TOOLS");
+        vFrameworkModuleTypes.addElement("TOOL");
         vFrameworkModuleTypes.addElement("UEFI_DRIVER");
         vFrameworkModuleTypes.addElement("UEFI_APPLICATION");
         vFrameworkModuleTypes.addElement("USER_DEFINED");
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
index 84eee46b16..00f196f811 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
@@ -349,7 +349,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
         jComboBoxSelect.addItem("DXE_RUNTIME_DRIVER");
         jComboBoxSelect.addItem("DXE_SAL_DRIVER");
         jComboBoxSelect.addItem("DXE_SMM_DRIVER");
-        jComboBoxSelect.addItem("TOOLS");
+        jComboBoxSelect.addItem("TOOL");
         jComboBoxSelect.addItem("UEFI_DRIVER");
         jComboBoxSelect.addItem("UEFI_APPLICATION");
         jComboBoxSelect.addItem("USER_DEFINED");
@@ -534,7 +534,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
             jComboBoxSelect.addItem("DXE_RUNTIME_DRIVER");
             jComboBoxSelect.addItem("DXE_SAL_DRIVER");
             jComboBoxSelect.addItem("DXE_SMM_DRIVER");
-            jComboBoxSelect.addItem("TOOLS");
+            jComboBoxSelect.addItem("TOOL");
             jComboBoxSelect.addItem("UEFI_DRIVER");
             jComboBoxSelect.addItem("UEFI_APPLICATION");
             jComboBoxSelect.addItem("USER_DEFINED");