Merge "Re-add getAliasName to fix build breakage"