Fixing renaming problem