Refactor a bit where the filenames are created.
Refactor a bit where the filenames are created.

slibby/machine,openaddresses/machine,slibby/machine,openaddresses/machine,slibby/machine,openaddresses/machine,slibby/machine