update namespace aliases

Change-Id: Ib474749271e9afe37c7a5938d65d58eafbdbef3f