Fixing some aliases