Fixing bug
Fixing rename bug