Update: implemented optional file renaming in .