template variable cleanup

...turned dialog relabeling.

At first, I was like ...

![then](https://f.cloud.github.com/assets/1410427/2222007/0ade15f4-9a60-11e3-942a-c4acafab9722.png)

But then ...

![now](https://f.cloud.github.com/assets/1410427/2222086/0b333a7e-9a61-11e3-801f-80ae368321e5.png)