Fixed invalid template variable names