Fix an issue of renaming