Fix environmental aliases