r8848: more usql to clsql renaming