cherry-pick name normalization from 2.2 branch