rename variable properly