Added: Some more regex for file name stripping.