Move type names to their own class