further improve canonization of S3 file naming