Rename TemplateType->ParameterizedType and Generic->TypeParameter.
Add spec type to spec output during solve.