change env variable name, handle empty string