Corrected handling of templates for CFV1.
Updated templates.

Signed-off-by: podonoghue <podonoghue@swin.edu.au>