#2141 normalize other names