Better names to distinguish blocks and variables #614

Closed oflatt closed 3 months ago