fixed renaming issue