Enhance environment variable names