Clarifications

- combine metrics provisions that address same topic
- remove provision not applicable to 34 release
- use product names that match UX