Changed the name of variables