update namespace aliases

Change-Id: Idfecef31e9614b851f4b57172f0ae7e49121bdf4