fix environment variable names