Changed the group names VpdGroup and HiiGroup to HiiEnable and VpdEnable. Changed...