update namespace aliases

Change-Id: I7ab75df32fa1aca073968b1c717b4b48dac91291