Update nomenclature.

Bug: 8870289
Bug: 8670147
Change-Id: I905678ed07c0d2a4a35ccf551014fb45f9e03376
82 files changed