A more robust backend, file renaming