Rename file name as well