Merged File renaming changes

Advise on the same