Merge "Update terminology and figure correcting typo reported by Andreas Issue-ID: DOC-545"