updated template to new namespace definitions