Fix rename bug 2/2.