Fixed name use of old vars.