Fix "symbol aliasing" code

Change-Id: Ic4605c40b9f3467f84732a0e3c956976fae68277