update namespace aliases

Change-Id: I48d49e3e4772ff510a7aa7cc5e1c5b0be65df715