Tweak template variable names