update namespace aliases

Change-Id: I7d676b4a71a0c797305dad91d2b1ffb90bd7460b