Changed names of private vars