Make ApiAliases intent and use clearer /w more comments