correctly handle filenames
 - remove '__'