Better support for environment variable naming