File rename related modifications