Add better environment variable names