Fix for env names