updated setup var names