Slightly improved media type nomenclature.