move to a better matching name