Accommodate type class name changes.