More nicks and aliases, removed a useless alias