Fix external file renaming
Merge branch 'fix_rename' into fix_err_output