Tidying up bad folder names