Improving the naming and usage of the environment settings.