update namespace aliases

Change-Id: I9a04d2fcccba09aeaecc46114fb71ef0fac7bc66