Fixed template file var names