Modifying the capture templates
Renaming the protocol capture templates
Minor updates