APR-21 - Convert type classes to enum types.