Updating namespace aliases based on change 90564 patch set 2

Change-Id: I770bf6037778d9bfd767a8ca66c3a7b51294ece3