Fixed rename bug