changing ENV key names to match config vars
merge