back to a speaking name for nodeid->namespaceId

src/server/ua_application.c

@@ -14,7 +14,7 @@ Application appMockup = {
 UA_Node* create_node_ns0(UA_Int32 class, UA_Int32 nodeClass, UA_Int32 const id, char const * qn, char const * dn, char const * desc) {
 	UA_Node* n; UA_.types[class].new((void **)&n);
 	n->nodeId.nodeIdType = UA_NODEIDTYPE_NUMERIC;
-	n->nodeId.ns = 0;
+	n->nodeId.namespaceId = 0;
 	n->nodeId.identifier.numeric = id;
 	UA_String_copycstring(qn,&(n->browseName.name));
 	UA_String_copycstring(dn,&n->displayName.text);

src/server/ua_namespace_concurrent.c

@@ -221,7 +221,7 @@ UA_Int32 Namespace_delete(Namespace *ns) {
 }
 
 UA_Int32 Namespace_insert(Namespace *ns, UA_Node **node, UA_Byte flags) {
-	if(ns == UA_NULL || node == UA_NULL || *node == UA_NULL || (*node)->nodeId.ns != ns->namespaceId)
+	if(ns == UA_NULL || node == UA_NULL || *node == UA_NULL || (*node)->nodeId.namespaceId != ns->namespaceId)
 		return UA_ERROR;
 
 	UA_UInt32 nodesize;

src/server/ua_services_attribute.c

@@ -37,12 +37,12 @@ static UA_DataValue service_read_node(Application *app, const UA_ReadValueId *id
 	UA_DataValue v;
 	UA_DataValue_init(&v);
 
-	DBG(printf("service_read_node - entered with ns=%d,id=%d,attr=%i\n", id->nodeId.ns,
+	DBG(printf("service_read_node - entered with ns=%d,id=%d,attr=%i\n", id->nodeId.namespaceId,
 	           id->nodeId.identifier.numeric, id->attributeId));
-	Namespace *ns = UA_indexedList_findValue(app->namespaces, id->nodeId.ns);
+	Namespace *ns = UA_indexedList_findValue(app->namespaces, id->nodeId.namespaceId);
 
 	if(ns == UA_NULL) {
-		DBG_VERBOSE(printf("service_read_node - unknown namespace %d\n", id->nodeId.ns));
+		DBG_VERBOSE(printf("service_read_node - unknown namespace %d\n", id->nodeId.namespaceId));
 		v.encodingMask = UA_DATAVALUE_ENCODINGMASK_STATUSCODE;
 		v.status       = UA_STATUSCODE_BADNODEIDUNKNOWN;
 		return v;
@@ -257,7 +257,7 @@ UA_Int32 Service_Read(UA_Session *session, const UA_ReadRequest *request,
 UA_Int32 Service_Write_writeNode(Application *app, UA_WriteValue *writeValue, UA_StatusCode *result)
 {
 	UA_Int32 retval = UA_SUCCESS;
-	Namespace *ns = UA_indexedList_findValue(app->namespaces, writeValue->nodeId.ns);
+	Namespace *ns = UA_indexedList_findValue(app->namespaces, writeValue->nodeId.namespaceId);
 	if(ns==UA_NULL) {
 		*result = UA_STATUSCODE_BADNODEIDINVALID;
 		return UA_ERROR;

src/server/ua_services_nodemanagement.c

@@ -15,7 +15,7 @@ static UA_AddNodesResult addSingleNode(Application *app, UA_AddNodesItem *item)
 	UA_AddNodesResult result;
 	UA_AddNodesResult_init(&result);
 
-	Namespace *parent_ns = UA_indexedList_findValue(app->namespaces, item->parentNodeId.nodeId.ns);
+	Namespace *parent_ns = UA_indexedList_findValue(app->namespaces, item->parentNodeId.nodeId.namespaceId);
 	// TODO: search for namespaceUris and not only ns-ids.
 	if(parent_ns == UA_NULL) {
 		result.statusCode = UA_STATUSCODE_BADPARENTNODEIDINVALID;
@@ -26,9 +26,9 @@ static UA_AddNodesResult addSingleNode(Application *app, UA_AddNodesItem *item)
 	UA_Boolean nodeid_isnull = UA_NodeId_isNull(&item->requestedNewNodeId.nodeId);
 
 	if(nodeid_isnull) ns = parent_ns;
-	else ns = UA_indexedList_findValue(app->namespaces, item->requestedNewNodeId.nodeId.ns);
+	else ns = UA_indexedList_findValue(app->namespaces, item->requestedNewNodeId.nodeId.namespaceId);
 
-	if(ns == UA_NULL || item->requestedNewNodeId.nodeId.ns == 0) {
+	if(ns == UA_NULL || item->requestedNewNodeId.nodeId.namespaceId == 0) {
 		result.statusCode = UA_STATUSCODE_BADNODEIDREJECTED;
 		return result;
 	}

src/server/ua_services_view.c

@@ -204,7 +204,7 @@ UA_Int32 Service_Browse(UA_Session *session, const UA_BrowseRequest *request, UA
 
 	for(UA_Int32 i=0; i < request->nodesToBrowseSize; i++) {
 		Namespace *ns = UA_indexedList_findValue(application->namespaces,
-												 request->nodesToBrowse[i].nodeId.ns);
+												 request->nodesToBrowse[i].nodeId.namespaceId);
 		if(ns == UA_NULL) {
 			response->results[i].statusCode = UA_STATUSCODE_BADNODEIDUNKNOWN;
 			continue;

src/server/ua_session_manager.c

@@ -13,7 +13,7 @@ static UA_SessionManager *sessionManager;
 
 UA_Int32 UA_SessionManager_generateSessionId(UA_NodeId *sessionId) {
 	sessionId->nodeIdType = UA_NODEIDTYPE_NUMERIC;
-	sessionId->ns = 0;
+	sessionId->namespaceId = 0;
 	sessionId->identifier.numeric = sessionManager->lastSessionId++;
 	return UA_SUCCESS;
 }

src/ua_session.c

@@ -27,7 +27,7 @@ UA_Int32 UA_Session_generateToken(UA_NodeId *newToken) {
 	//retval |= UA_NodeId_new(newToken);
 
 	newToken->nodeIdType = UA_NODEIDTYPE_GUID;
-	newToken->ns = 0; // where else?
+	newToken->namespaceId = 0; // where else?
 	newToken->identifier.guid.data1 = rand();
 	r = rand();
 	newToken->identifier.guid.data2 = (UA_UInt16)((r>>16) );

src/ua_transport_binary_secure.c

@@ -23,7 +23,7 @@ static UA_Int32 SL_Send(SL_Channel *channel, const UA_ByteString * responseMessa
 	UA_AsymmetricAlgorithmSecurityHeader *asymAlgSettings = UA_NULL;
 
 	resp_nodeid.nodeIdType = UA_NODEIDTYPE_NUMERIC;
-	resp_nodeid.ns = 0;
+	resp_nodeid.namespaceId = 0;
 	resp_nodeid.identifier.numeric = type + 2; // binary encoding
 
 	const UA_ByteString *response_gather[2]; // securechannel_header, seq_header, security_encryption_header, message_length (eventually + padding + size_signature);
@@ -299,7 +299,7 @@ UA_Int32 SL_handleRequest(SL_Channel *channel, const UA_ByteString* msg, UA_UInt
 		responsetype = UA_SETPUBLISHINGMODERESPONSE_NS0;
 	} else {
 		printf("SL_processMessage - unknown request, namespace=%d, request=%d\n",
-			   serviceRequestType.ns, serviceRequestType.identifier.numeric);
+			   serviceRequestType.namespaceId, serviceRequestType.identifier.numeric);
 		retval = UA_ERROR;
 		UA_RequestHeader p;
 		UA_ResponseHeader r;

src/ua_types.c

@@ -419,7 +419,7 @@ UA_TYPE_AS(UA_XmlElement, UA_ByteString)
 UA_Int32 UA_NodeId_init(UA_NodeId *p) {
 	if(p == UA_NULL) return UA_ERROR;
 	p->nodeIdType = UA_NODEIDTYPE_NUMERIC;
-	p->ns = 0;
+	p->namespaceId = 0;
 	memset(&p->identifier, 0, sizeof(p->identifier));
 	return UA_SUCCESS;
 }
@@ -453,7 +453,7 @@ UA_Int32 UA_NodeId_copy(UA_NodeId const *src, UA_NodeId *dst) {
 }
 
 UA_Boolean UA_NodeId_isBasicType(UA_NodeId const *id) {
-	return (id->ns == 0 &&
+	return (id->namespaceId == 0 &&
 			id->nodeIdType == UA_NODEIDTYPE_NUMERIC &&
 			id->identifier.numeric <= UA_DIAGNOSTICINFO);
 }
@@ -510,7 +510,7 @@ void UA_NodeId_print(const UA_NodeId *p, FILE *stream) {
 		fprintf(stream, "ERROR");
 		break;
 	}
-	fprintf(stream,",%u,", p->ns);
+	fprintf(stream,",%u,", p->namespaceId);
 	switch(p->nodeIdType & UA_NODEIDTYPE_MASK) {
 	case UA_NODEIDTYPE_NUMERIC:
 		fprintf(stream, ".identifier.numeric=%u", p->identifier.numeric);
@@ -538,7 +538,7 @@ void UA_NodeId_print(const UA_NodeId *p, FILE *stream) {
 #endif
 
 UA_Int32 UA_NodeId_equal(const UA_NodeId *n1, const UA_NodeId *n2) {
-	if(n1 == UA_NULL || n2 == UA_NULL || n1->ns != n2->ns)
+	if(n1 == UA_NULL || n2 == UA_NULL || n1->namespaceId != n2->namespaceId)
 		return UA_NOT_EQUAL;
 
 	switch(n1->nodeIdType) {
@@ -563,20 +563,20 @@ UA_Int32 UA_NodeId_equal(const UA_NodeId *n1, const UA_NodeId *n2) {
 UA_Boolean UA_NodeId_isNull(const UA_NodeId *p) {
 	switch(p->nodeIdType) {
 	case UA_NODEIDTYPE_NUMERIC:
-		if(p->ns != 0 || p->identifier.numeric != 0) return UA_FALSE;
+		if(p->namespaceId != 0 || p->identifier.numeric != 0) return UA_FALSE;
 		break;
 
 	case UA_NODEIDTYPE_STRING:
-		if(p->ns != 0 || p->identifier.string.length != 0) return UA_FALSE;
+		if(p->namespaceId != 0 || p->identifier.string.length != 0) return UA_FALSE;
 		break;
 
 	case UA_NODEIDTYPE_GUID:
-		if(p->ns != 0 ||
+		if(p->namespaceId != 0 ||
 		   memcmp(&p->identifier.guid, (char[sizeof(UA_Guid)]) { 0 }, sizeof(UA_Guid)) != 0) return UA_FALSE;
 		break;
 
 	case UA_NODEIDTYPE_BYTESTRING:
-		if(p->ns != 0 || p->identifier.byteString.length != 0) return UA_FALSE;
+		if(p->namespaceId != 0 || p->identifier.byteString.length != 0) return UA_FALSE;
 		break;
 
 	default:

src/ua_types.h

@@ -126,7 +126,7 @@ typedef struct UA_String UA_XmlElement;
 
 /** @brief An identifier for a node in the address space of an OPC UA Server. */
 typedef struct UA_NodeId {
-	UA_UInt16 ns;
+	UA_UInt16 namespaceId;
 	enum {
 		/* The shortened numeric types are introduced during encoding.
 		   UA_NODEIDTYPE_TWOBYTE = 0,
@@ -343,7 +343,7 @@ UA_Boolean UA_NodeId_isNull(const UA_NodeId *p);
 UA_Boolean UA_NodeId_isBasicType(UA_NodeId const *id);
 
 #define NS0NODEID(NUMERIC_ID) \
-	(UA_NodeId){ .ns = 0, .nodeIdType = UA_NODEIDTYPE_NUMERIC, .identifier.numeric = NUMERIC_ID }
+	(UA_NodeId){ .namespaceId = 0, .nodeIdType = UA_NODEIDTYPE_NUMERIC, .identifier.numeric = NUMERIC_ID }
 
 /* ExpandedNodeId */
 UA_Boolean UA_ExpandedNodeId_isNull(const UA_ExpandedNodeId *p);

src/ua_types_encoding_binary.c

@@ -2,7 +2,7 @@
 #include "ua_namespace_0.h"
 
 static INLINE UA_Boolean is_builtin(UA_NodeId *typeid) {
-	return (typeid->ns == 0 && 1 <= typeid->identifier.numeric && typeid->identifier.numeric <= 25);
+	return (typeid->namespaceId == 0 && 1 <= typeid->identifier.numeric && typeid->identifier.numeric <= 25);
 }
 
 /*********/
@@ -389,9 +389,9 @@ UA_Int32 UA_NodeId_calcSizeBinary(UA_NodeId const *p) {
 	else {
 		switch(p->nodeIdType) {
 		case UA_NODEIDTYPE_NUMERIC:
-			if(p->identifier.numeric > UA_UINT16_MAX || p->ns > UA_BYTE_MAX)
+			if(p->identifier.numeric > UA_UINT16_MAX || p->namespaceId > UA_BYTE_MAX)
 				length = sizeof(UA_Byte) + sizeof(UA_UInt16) + sizeof(UA_UInt32);
-			else if(p->identifier.numeric > UA_BYTE_MAX || p->ns > 0)
+			else if(p->identifier.numeric > UA_BYTE_MAX || p->namespaceId > 0)
 				length = 4; /* UA_NODEIDTYPE_FOURBYTE */
 			else
 				length = 2; /* UA_NODEIDTYPE_TWOBYTE*/
@@ -424,15 +424,15 @@ UA_TYPE_ENCODEBINARY(UA_NodeId,
                      UA_Int32 retval = UA_SUCCESS;
                      switch(src->nodeIdType) {
 					 case UA_NODEIDTYPE_NUMERIC:
-						 if(src->identifier.numeric > UA_UINT16_MAX || src->ns > UA_BYTE_MAX) {
+						 if(src->identifier.numeric > UA_UINT16_MAX || src->namespaceId > UA_BYTE_MAX) {
 							 srcByte = UA_NODEIDTYPE_NUMERIC;
 							 retval |= UA_Byte_encodeBinary(&srcByte, dst, offset);
-							 retval |= UA_UInt16_encodeBinary(&src->ns, dst, offset);
+							 retval |= UA_UInt16_encodeBinary(&src->namespaceId, dst, offset);
 							 retval |= UA_UInt32_encodeBinary(&src->identifier.numeric, dst, offset);
-						 } else if(src->identifier.numeric > UA_BYTE_MAX || src->ns > 0) { /* UA_NODEIDTYPE_FOURBYTE */
+						 } else if(src->identifier.numeric > UA_BYTE_MAX || src->namespaceId > 0) { /* UA_NODEIDTYPE_FOURBYTE */
 							 srcByte = UA_NODEIDTYPE_FOURBYTE;
 							 retval |= UA_Byte_encodeBinary(&srcByte, dst, offset);
-							 srcByte = src->ns;
+							 srcByte = src->namespaceId;
 							 srcUInt16 = src->identifier.numeric;
 							 retval |= UA_Byte_encodeBinary(&srcByte, dst, offset);
 							 retval |= UA_UInt16_encodeBinary(&srcUInt16, dst, offset);
@@ -447,21 +447,21 @@ UA_TYPE_ENCODEBINARY(UA_NodeId,
 					 case UA_NODEIDTYPE_STRING:
 						 srcByte = UA_NODEIDTYPE_STRING;
 						 retval |= UA_Byte_encodeBinary(&srcByte, dst, offset);
-						 retval |= UA_UInt16_encodeBinary(&src->ns, dst, offset);
+						 retval |= UA_UInt16_encodeBinary(&src->namespaceId, dst, offset);
 						 retval |= UA_String_encodeBinary(&src->identifier.string, dst, offset);
 						 break;
 
 					 case UA_NODEIDTYPE_GUID:
 						 srcByte = UA_NODEIDTYPE_GUID;
 						 retval |= UA_Byte_encodeBinary(&srcByte, dst, offset);
-						 retval |= UA_UInt16_encodeBinary(&src->ns, dst, offset);
+						 retval |= UA_UInt16_encodeBinary(&src->namespaceId, dst, offset);
 						 retval |= UA_Guid_encodeBinary(&src->identifier.guid, dst, offset);
 						 break;
 
 					 case UA_NODEIDTYPE_BYTESTRING:
 						 srcByte = UA_NODEIDTYPE_BYTESTRING;
 						 retval |= UA_Byte_encodeBinary(&srcByte, dst, offset);
-						 retval |= UA_UInt16_encodeBinary(&src->ns, dst, offset);
+						 retval |= UA_UInt16_encodeBinary(&src->namespaceId, dst, offset);
 						 retval |= UA_ByteString_encodeBinary(&src->identifier.byteString, dst, offset);
 						 break;
 
@@ -485,38 +485,38 @@ UA_Int32 UA_NodeId_decodeBinary(UA_ByteString const *src, UA_UInt32 *offset, UA_
 		dst->nodeIdType = UA_NODEIDTYPE_NUMERIC;
 		CHECKED_DECODE(UA_Byte_decodeBinary(src, offset, &dstByte),; );
 		dst->identifier.numeric = dstByte;
-		dst->ns = 0; // default namespace
+		dst->namespaceId = 0; // default namespace
 		break;
 
 	case UA_NODEIDTYPE_FOURBYTE: // Table 8
 		dst->nodeIdType = UA_NODEIDTYPE_NUMERIC;
 		CHECKED_DECODE(UA_Byte_decodeBinary(src, offset, &dstByte),; );
-		dst->ns = dstByte;
+		dst->namespaceId = dstByte;
 		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dstUInt16),; );
 		dst->identifier.numeric = dstUInt16;
 		break;
 
 	case UA_NODEIDTYPE_NUMERIC: // Table 6, first entry
 		dst->nodeIdType = UA_NODEIDTYPE_NUMERIC;
-		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dst->ns),; );
+		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dst->namespaceId),; );
 		CHECKED_DECODE(UA_UInt32_decodeBinary(src, offset, &dst->identifier.numeric),; );
 		break;
 
 	case UA_NODEIDTYPE_STRING: // Table 6, second entry
 		dst->nodeIdType = UA_NODEIDTYPE_STRING;
-		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dst->ns),; );
+		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dst->namespaceId),; );
 		CHECKED_DECODE(UA_String_decodeBinary(src, offset, &dst->identifier.string),; );
 		break;
 
 	case UA_NODEIDTYPE_GUID: // Table 6, third entry
 		dst->nodeIdType = UA_NODEIDTYPE_GUID;
-		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dst->ns),; );
+		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dst->namespaceId),; );
 		CHECKED_DECODE(UA_Guid_decodeBinary(src, offset, &dst->identifier.guid),; );
 		break;
 
 	case UA_NODEIDTYPE_BYTESTRING: // Table 6, "OPAQUE"
 		dst->nodeIdType = UA_NODEIDTYPE_BYTESTRING;
-		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dst->ns),; );
+		CHECKED_DECODE(UA_UInt16_decodeBinary(src, offset, &dst->namespaceId),; );
 		CHECKED_DECODE(UA_ByteString_decodeBinary(src, offset, &dst->identifier.byteString),; );
 		break;
 
@@ -573,7 +573,7 @@ UA_Int32 UA_ExpandedNodeId_decodeBinary(UA_ByteString const *src, UA_UInt32 *off
 	
 	CHECKED_DECODE(UA_NodeId_decodeBinary(src, offset, &dst->nodeId), UA_ExpandedNodeId_deleteMembers(dst));
 	if(encodingByte & UA_EXPANDEDNODEID_NAMESPACEURI_FLAG) {
-		dst->nodeId.ns = 0;
+		dst->nodeId.namespaceId = 0;
 		CHECKED_DECODE(UA_String_decodeBinary(src, offset, &dst->namespaceUri), UA_ExpandedNodeId_deleteMembers(dst));
 	}
 	if(encodingByte & UA_EXPANDEDNODEID_SERVERINDEX_FLAG)
@@ -831,7 +831,7 @@ UA_TYPE_ENCODEBINARY(UA_Variant,
 					 UA_Boolean hasDimensions;
 					 UA_Boolean isBuiltin;
 
-                     if(src == UA_NULL || src->vt == UA_NULL || src->vt->typeId.ns != 0)
+                     if(src == UA_NULL || src->vt == UA_NULL || src->vt->typeId.namespaceId != 0)
 						 return UA_ERROR;
 
                      isArray       = src->arrayLength != 1;  // a single element is not an array
@@ -889,7 +889,7 @@ UA_Int32 UA_Variant_decodeBinary(UA_ByteString const *src, UA_UInt32 *offset, UA
 	UA_Boolean isArray = encodingByte & UA_VARIANT_ENCODINGMASKTYPE_ARRAY;
 	UA_Boolean hasDimensions = isArray && (encodingByte & UA_VARIANT_ENCODINGMASKTYPE_DIMENSIONS);
 
-	UA_NodeId typeid = { .ns= 0, .nodeIdType = UA_NODEIDTYPE_NUMERIC,
+	UA_NodeId typeid = { .namespaceId= 0, .nodeIdType = UA_NODEIDTYPE_NUMERIC,
 						 .identifier.numeric = encodingByte & UA_VARIANT_ENCODINGMASKTYPE_TYPEID_MASK };
 	UA_Int32 typeNs0Id = UA_ns0ToVTableIndex(&typeid );
 	dst->vt = &UA_.types[typeNs0Id];

src/ua_types_encoding_xml.c

@@ -186,7 +186,7 @@ UA_Int32 UA_NodeId_decodeXmlFromStack(XML_Stack *s, XML_Attr *attr, UA_NodeId *d
 		s->parent[s->depth].len = 0;
 		XML_Stack_addChildHandler(s, "Namespace", strlen(
 		                              "Namespace"), (XML_decoder)UA_Int16_decodeXmlFromStack, UA_INT16,
-		                          &(dst->ns));
+		                          &(dst->namespaceId));
 		XML_Stack_addChildHandler(s, "Numeric", strlen(
 		                              "Numeric"), (XML_decoder)UA_Int32_decodeXmlFromStack, UA_INT32,
 		                          &(dst->identifier.numeric));
@@ -197,7 +197,7 @@ UA_Int32 UA_NodeId_decodeXmlFromStack(XML_Stack *s, XML_Attr *attr, UA_NodeId *d
 		// set attributes
 		for(i = 0; attr[i]; i += 2) {
 		if(0 == strncmp("Namespace", attr[i], strlen("Namespace")))
-			dst->ns = atoi(attr[i + 1]);
+			dst->namespaceId = atoi(attr[i + 1]);
 		else if(0 == strncmp("Numeric", attr[i], strlen("Numeric"))) {
 		dst->identifier.numeric = atoi(attr[i + 1]);
 		dst->nodeIdType = UA_NODEIDTYPE_NUMERIC;
@@ -228,9 +228,9 @@ UA_Int32 UA_ExpandedNodeId_decodeXmlFromStack(XML_Stack *s, XML_Attr *attr, UA_E
 		s->parent[s->depth].len = 0;
 		XML_Stack_addChildHandler(s, "NodeId", strlen(
 		                              "NodeId"), (XML_decoder)UA_NodeId_decodeXmlFromStack, UA_NODEID, &(dst->nodeId));
-		XML_Stack_addChildHandler(s, "Namespace", strlen(
-		                              "Namespace"), (XML_decoder)UA_Int16_decodeXmlFromStack, UA_INT16,
-		                          &(dst->nodeId.ns));
+		XML_Stack_addChildHandler(s, "Namespace", strlen("Namespace"),
+								  (XML_decoder)UA_Int16_decodeXmlFromStack, UA_INT16,
+		                          &(dst->nodeId.namespaceId));
 		XML_Stack_addChildHandler(s, "Numeric", strlen("Numeric"), (XML_decoder)UA_Int32_decodeXmlFromStack, UA_INT32,
 		                          &(dst->nodeId.identifier.numeric));
 		XML_Stack_addChildHandler(s, "Id", strlen("Id"), (XML_decoder)UA_String_decodeXmlFromStack, UA_STRING, UA_NULL);
@@ -239,7 +239,7 @@ UA_Int32 UA_ExpandedNodeId_decodeXmlFromStack(XML_Stack *s, XML_Attr *attr, UA_E
 		// set attributes
 		for(i = 0; attr[i]; i += 2) {
 		if(0 == strncmp("Namespace", attr[i], strlen("Namespace")))
-			UA_UInt16_copycstring((cstring)attr[i + 1], &(dst->nodeId.ns));
+			UA_UInt16_copycstring((cstring)attr[i + 1], &(dst->nodeId.namespaceId));
 		else if(0 == strncmp("Numeric", attr[i], strlen("Numeric"))) {
 		UA_NodeId_copycstring((cstring)attr[i + 1], &(dst->nodeId), s->aliases);
 		} else if(0 == strncmp("NodeId", attr[i], strlen("NodeId")))

src/ua_xml.c

@@ -67,7 +67,7 @@ UA_Int32 UA_NodeSetAliases_println(cstring label, UA_NodeSetAliases *p) {
 }
 
 UA_Int32 UA_NodeSet_init(UA_NodeSet *p, UA_UInt32 nsid) {
-	Namespace_new(&(p->ns), nsid);
+	Namespace_new(&p->ns, nsid);
 	p->aliases.size    = -1;
 	p->aliases.aliases = UA_NULL;
 	return UA_SUCCESS;
@@ -85,7 +85,7 @@ UA_Int32 _UA_NodeId_copycstring(cstring src, UA_NodeId* dst, UA_NodeSetAliases*
 		if (src[0] == 'i' && src[1] == '=') { // namespace zero numeric identifier
 			dst->identifier.numeric = atoi(&src[2]);
 		} else if (src[0] == 'n' && src[1] == 's' && src[2] == '=') { // namespace
-			dst->ns = atoi(&src[3]);
+			dst->namespaceId = atoi(&src[3]);
 			src = strchr(&src[3],';');
 			if (src != UA_NULL)
 				retval = _UA_NodeId_copycstring(src+1,dst,aliases);  // +1 to start beyond ;
@@ -111,7 +111,7 @@ UA_Int32 _UA_NodeId_copycstring(cstring src, UA_NodeId* dst, UA_NodeSetAliases*
 
 UA_Int32 UA_NodeId_copycstring(cstring src, UA_NodeId* dst, UA_NodeSetAliases* aliases) {
 	dst->nodeIdType = UA_NODEIDTYPE_NUMERIC;
-	dst->ns = 0;
+	dst->namespaceId = 0;
 	dst->identifier.numeric = 0;
 	return _UA_NodeId_copycstring(src,dst,aliases);
 }
@@ -126,8 +126,8 @@ UA_Int32 UA_ReferenceNode_println(cstring label, UA_ReferenceNode *a) {
 }
 
 UA_Int32 UA_ExpandedNodeId_copycstring(cstring src, UA_ExpandedNodeId *dst, UA_NodeSetAliases *aliases) {
-	dst->nodeId.nodeIdType       = UA_NODEIDTYPE_NUMERIC;
-	dst->nodeId.ns          = 0;
+	dst->nodeId.nodeIdType         = UA_NODEIDTYPE_NUMERIC;
+	dst->nodeId.namespaceId        = 0;
 	dst->nodeId.identifier.numeric = 0;
 	UA_NodeId_copycstring(src, &(dst->nodeId), aliases);
 	DBG_VERBOSE(printf("UA_ExpandedNodeId_copycstring src=%s,id=%d\n", src, dst->nodeId.identifier.numeric));
@@ -593,7 +593,7 @@ UA_Int32 UA_TypedArray_decodeXmlFromStack(XML_Stack* s, XML_Attr* attr, UA_Typed
 /* } */
 
 _Bool UA_NodeId_isBuiltinType(UA_NodeId* nodeid) {
-	return (nodeid->ns == 0 && nodeid->identifier.numeric >= UA_BOOLEAN_NS0 &&
+	return (nodeid->namespaceId == 0 && nodeid->identifier.numeric >= UA_BOOLEAN_NS0 &&
 			nodeid->identifier.numeric <= UA_DIAGNOSTICINFO_NS0
 			);
 }

tests/check_builtin.c

@@ -339,7 +339,7 @@ START_TEST(UA_NodeId_calcSizeEncodingTwoByteShallReturnEncodingSize) {
 	// given
 	UA_NodeId arg;
 	arg.nodeIdType = UA_NODEIDTYPE_NUMERIC;
-	arg.ns = 0;
+	arg.namespaceId = 0;
 	arg.identifier.numeric = 1;
 	// when
 	UA_UInt32 encodingSize = UA_NodeId_calcSizeBinary(&arg);
@@ -351,7 +351,7 @@ START_TEST(UA_NodeId_calcSizeEncodingFourByteShallReturnEncodingSize) {
 	// given
 	UA_NodeId arg;
 	arg.nodeIdType = UA_NODEIDTYPE_NUMERIC;
-	arg.ns = 1;
+	arg.namespaceId = 1;
 	arg.identifier.numeric = 1;
 	// when
 	UA_UInt32 encodingSize = UA_NodeId_calcSizeBinary(&arg);
@@ -812,7 +812,7 @@ START_TEST(UA_NodeId_decodeTwoByteShallReadTwoBytesAndSetNamespaceToZero) {
 	ck_assert_int_eq(pos, 2);
 	ck_assert_int_eq(dst.nodeIdType, UA_NODEIDTYPE_NUMERIC);
 	ck_assert_int_eq(dst.identifier.numeric, 16);
-	ck_assert_int_eq(dst.ns, 0);
+	ck_assert_int_eq(dst.namespaceId, 0);
 }
 END_TEST
 START_TEST(UA_NodeId_decodeFourByteShallReadFourBytesAndRespectNamespace) {
@@ -829,7 +829,7 @@ START_TEST(UA_NodeId_decodeFourByteShallReadFourBytesAndRespectNamespace) {
 	ck_assert_int_eq(pos, 4);
 	ck_assert_int_eq(dst.nodeIdType, UA_NODEIDTYPE_NUMERIC);
 	ck_assert_int_eq(dst.identifier.numeric, 256);
-	ck_assert_int_eq(dst.ns, 1);
+	ck_assert_int_eq(dst.namespaceId, 1);
 }
 END_TEST
 START_TEST(UA_NodeId_decodeStringShallAllocateMemory) {
@@ -845,7 +845,7 @@ START_TEST(UA_NodeId_decodeStringShallAllocateMemory) {
 	ck_assert_int_eq(retval, UA_SUCCESS);
 	ck_assert_int_eq(pos, 10);
 	ck_assert_int_eq(dst.nodeIdType, UA_NODEIDTYPE_STRING);
-	ck_assert_int_eq(dst.ns, 1);
+	ck_assert_int_eq(dst.namespaceId, 1);
 	ck_assert_int_eq(dst.identifier.string.length, 3);
 	ck_assert_ptr_eq(dst.identifier.string.data, UA_alloc_lastptr);
 	ck_assert_int_eq(dst.identifier.string.data[1], 'L');

tests/check_namespace.c

@@ -32,7 +32,7 @@ END_TEST
 UA_Int32 createNode(UA_Node** p, UA_Int16 nsid, UA_Int32 id) {
 	UA_VariableNode_new((UA_VariableNode **)p);
 	(*p)->nodeId.nodeIdType = UA_NODEIDTYPE_NUMERIC;
-	(*p)->nodeId.ns = nsid;
+	(*p)->nodeId.namespaceId = nsid;
 	(*p)->nodeId.identifier.numeric = id;
 	(*p)->nodeClass = UA_NODECLASS_VARIABLE;
 	return UA_SUCCESS;

tools/generate_namespace.py

@@ -120,7 +120,7 @@ printc('''/**********************************************************
 #include "''' + args.outfile.split("/")[-1] + '''.h"\n
 UA_Int32 UA_ns0ToVTableIndex(const UA_NodeId *id) {
 	UA_Int32 retval = 0; // InvalidType
-        if(id->ns != 0) return retval;
+        if(id->namespaceId != 0) return retval;
 	switch (id->identifier.numeric) {''')
 
 i = 0
@@ -158,7 +158,7 @@ for row in rows:
 	i=i+1
     printh('#define '+name.upper()+'_NS0 '+row[1])
 
-    printc("\t{.typeId={.nodeIdType = UA_NODEIDTYPE_NUMERIC, .ns = 0,.identifier.numeric=" + row[1] + "}" + 
+    printc("\t{.typeId={.namespaceId = 0, .nodeIdType = UA_NODEIDTYPE_NUMERIC, .identifier.numeric=" + row[1] + "}" + 
           ",\n.name=(UA_Byte*)&\"%(name)s\"" +
           ",\n.new=(UA_Int32(*)(void **))%(name)s_new" +
           ",\n.init=(UA_Int32(*)(void *))%(name)s_init"+