Correct template variable names