Renamed ENV vars