Even shorter file names now