Support unnamed variable and refactor inconsistent variable name