update namespace aliases

Change-Id: If303107903afbcf853acd93b4cd47f000c3a001c