Refactor: Type enum should use appropriate naming style.  Type renamed to Subtype.