Include org name in serialized output

Makes it easy for display purposes
Serialize enum value as string