A bit of cleanup for the next release.

- Clarifying a few terms based on updates to mime-types.