Merge "chg: use imported name"