Standardize to device guidelines (terms etc)

Term checklist: https://developer.mozilla.org/en-US/Apps/Design/Content

Test Plan:
- None