Lots of general rename changes, and a few pieces of minor tidy up. Change-Id: Ia88b75af0e2d294cfc57164ac42155234d8ba71a