Njw/cron filenames

I can't get the testsuite to work for me yet, so this is currently *not* tested