Rename some elements to be more in line with rest of framework.

Change-Id: Icb007bafca9c76959eee2e8134b1d7c592ca885c
11 files changed