Changes for more explicit Type-class names