more type name changes