Prepare to have public / private aliases.

Identification: none
Change-Id: I7db193275fc63ec5c90af62c176152132bf18bd7