More meaningful default filenames. Defaults not currently used, but for the record.
Update type map