Better file name handling