update namespace aliases

Change-Id: Ib0913ed1b98f5f365ffe66bec2f55f47ff37f134