Fix variable name in each block