FIX: update templates for 3.1 template syntax