Rename block variables to avoid shadowing