Changed: order by file name