update namespace aliases

Change-Id: I8cf3c98bd44aef2db660a73562690748c40213d9
Merge "update namespace aliases"