Update code for named type class instances