Rename queue files to avoid race conditions
More robust