Conform name of EnumString classes to be singular. Refactored to enum_string decorator.
ProductType is now its own enumstring class.
part two of introducing ProductType as separate enum_string class.