Further de-branding

Change-Id: I44b53eedb5ee778e2c501e3a16fe746281a41b1b