diff --git a/netconf/nc_rpc/ext/get_schema.py b/netconf/nc_rpc/ext/get_schema.py
index a90906e..ff5f511 100644
--- a/netconf/nc_rpc/ext/get_schema.py
+++ b/netconf/nc_rpc/ext/get_schema.py
@@ -57,7 +57,7 @@
 
     def _validate_parameters(self):
         log.info('validate-parameters', session=self.session.session_id)
-        # Validate the GET command
+        # Validate the GET-SCHEMA command
         if self.request:
             try:
                 if self.request['command'] != 'get-schema' or \
@@ -101,7 +101,7 @@
 
     def create_xml_response(self, content):
         ns = {}
-        ns['xmlns'] = "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring"
+        ns['xmlns'] = C.NS_MAP['ncm']
 
         elem = etree.Element('data', attrib=ns)
         elem.text = unicode(content, "utf-8")
diff --git a/netconf/nc_rpc/rpc_response.py b/netconf/nc_rpc/rpc_response.py
index 3b2deba..19e01e2 100644
--- a/netconf/nc_rpc/rpc_response.py
+++ b/netconf/nc_rpc/rpc_response.py
@@ -78,7 +78,7 @@
                     '<data>',
                     '<',
                     request['class'],
-                    ' xmlns="urn:opencord:params:xml:ns:voltha:ietf-voltha">',
+                    ' xmlns="urn:opencord:params:xml:ns:voltha:voltha">',
                     voltha_xml_string,
                     '</',
                     request['class'],
@@ -88,7 +88,7 @@
         else:  # custom_rpc
             body = ''.join([
                 '<rpc-reply',
-                ' xmlns="urn:opencord:params:xml:ns:voltha:ietf-voltha">',
+                ' xmlns="urn:opencord:params:xml:ns:voltha:voltha">',
                 voltha_xml_string,
                 '</rpc-reply>',
             ])