Ensure unique filenames for structured imports, see #85