Arch Design edits

Edits to follow our conventions better.

Change-Id: I9bf2d068cecda98db4211c9fc46e5c56cd0b5316
Merge "Arch Design edits"