fix templates to include namespace