Capitalize more words and fix duplicate string

4 jobs for !1590 with 2162-mailbox-pairing-ui-end in 9 minutes and 18 seconds (queued for 7 seconds)
latest merge request