FIX:(#846)(#830) Renaming of files erroring out