Fixed namespace definitions in templates and sample-data