update namespace aliases

Change-Id: Ieb71dc043e84e07de6977f36c91f40c32b0affbe
Merge "update namespace aliases"