fix renaming issue