change namespaces, work on templates