Changed names of instance variable