update namespace aliases

Change-Id: I751550334acb4f5a3b525240a15a793973b0933b