Fixing up filename/foldername variables