Redefine terms and mappings for types and formats

A more accurate representation of the various types and formats combined
for a bibliographic resource.