update namespace aliases

Change-Id: I6e0ab8ab952ac819002e6883d93590aa4c2a4f7d