Changed env vars names