update namespace aliases

Change-Id: I89c05b371f1da6f4411a161f4b97f19c4aa496e5
Merge "update namespace aliases"