RAZ-2302: File renaming will convert spaces to "_" (again)