Fix rename bug