Fix names of variables