Updated template name to remove hyphens, updated template actions