fixing renaming issues'