fix template variable names