Fix renaming issue