Fix uncollectables.
Use better filenames in exploded form.