cg: more type name changes