Simplify type names