update namespace aliases

Change-Id: Ia9c74db1484704a12203f0230c4d10a38306a014