Refactored names of Type classes