Fix and rename variable