Changed some minor aliases