Update template names. Include util.js