Consistify handling of NAME env var.