Use correct environment variable names