Fixed aliases

closes bug 1310657

Change-Id: Ia06e758d837a3afff358e0a62a39736961398a96
Merge "Fixed aliases"