Dir rename and file name corrections