Fixing renaming issues