Update ES metric document mapping

Update ES metric document mapping to match the layout we discussed
during metrics week:
- Use 'human' names - no all-upper case names.
- Ditch type - it is going away, and is only a single letter.