Removed some aliases in basic API