Better filename generation