re-work the file-naming a bit