Bug 20941: (follow-up) Switch 'media' -> 'types'