Merge "Fix variable name to match code"