Fixing up filename generator