correct env names, convert to props