rename variable and use it consistently