Change env variable names