ENH: change of names of variables