Consistency updates in capitalisation

Change-Id: Iac91654f440a38fbea3cfdc905bef365c66f8c9c