update namespace aliases

Change-Id: Ifdcadbcc1a73a414984f70c4536bcf2560838ee1