Fix Renaming issue