Renamed environment variables to match psql