update namespace aliases

Change-Id: I3c1409f22f7db8cd9e5596f61767dd838ac3af26