FIXED: New file name generator did not recurse.