update namespace aliases

Change-Id: I879c8081e992a15369c3e57cd953a23e7c9bf5d9
Merge "update namespace aliases"