Refactor and rename to prepare for inline editing

Change-Id: I084755c762704a5e2ea7272d4f1e9888266c2707
15 files changed