Fixed bad varaibles names