Refact variable name