Rename block variables.
Merge.