FIX: more reasonable file name handling

The expansion is now smarter and hopefully meets the POLS.