Simplify type names
Merge pull request #6 from schmichael/simplify-names

Simplify type names