And rename Enum values that include Name in the value
Comments: Fixed: http://aspnetwebstack.codeplex.com/SourceControl/changeset/8001699c86bd
Comments: Fixed: http://aspnetwebstack.codeplex.com/SourceControl/changeset/8001699c86bd