Cleaned up xml namespaces (xml doc comment & template)