Revert some of the invalid name changes done during the rebranding.

Change-Id: Iff07b64ad49bcc1a9add4c0dc7597de48a7f8c80