Use dashes for the template names too