Improve environment variable naming scheme