Update templates to 3.x syntax