Cleanup new environment variable names.