Changed some aliases