Changes to filename generation