Fixed aliases

closes bug 1308940

Change-Id: Ic2b0ea8c7852fc7ada54f1fb9a333ecbff466661
Merge "Fixed aliases"