Block Binding: use orignal name where possible

Closes #1274