Some vars renamed