Changed Format enum to use '_' between the prefix (enum name) and the actual enumerated value. The reasoning is that this is intentionally not an 'enum class' and in this case the enum values are prefixed with the enum name which is made clear by the inclusion of the '_'. This change will match the coming changes to the JSON serialization.