artf48630 : Rename enviroment variable names