Fix name of variables