node-opcua-types 2.72.0 → 2.73.0

package/dist/_generated_opcua_types.js

@@ -1,5 +1,5 @@
 "use strict";
-// --------- This code has been automatically generated !!! 2022-07-12T11:52:31.681Z
+// --------- This code has been automatically generated !!! 2022-08-08T13:27:16.527Z
 /**
  * @module node-opcua-types
  */
@@ -36,7 +36,7 @@ const schemaEUInformation = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "namespaceUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "unitId",
@@ -76,7 +76,7 @@ class EUInformation extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaEUInformation; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.namespaceUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.namespaceUri, stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.unitId, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.displayName, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.description, stream);
@@ -84,7 +84,7 @@ class EUInformation extends node_opcua_extension_object_1.ExtensionObject {
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaceUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.namespaceUri);
+        this.namespaceUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.namespaceUri);
         this.unitId = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.unitId);
         this.displayName = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.displayName);
         this.description = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.description);
@@ -432,7 +432,7 @@ const schemaRequestHeader = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "auditEntryId",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "timeoutHint",
@@ -478,7 +478,7 @@ class RequestHeader extends node_opcua_extension_object_1.ExtensionObject {
         (0, node_opcua_basic_types_1.encodeDateTime)(this.timestamp, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.requestHandle, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.returnDiagnostics, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.auditEntryId, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.auditEntryId, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.timeoutHint, stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.additionalHeader, stream);
     }
@@ -489,7 +489,7 @@ class RequestHeader extends node_opcua_extension_object_1.ExtensionObject {
         this.timestamp = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.timestamp);
         this.requestHandle = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.requestHandle);
         this.returnDiagnostics = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.returnDiagnostics);
-        this.auditEntryId = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.auditEntryId);
+        this.auditEntryId = (0, node_opcua_basic_types_1.decodeString)(stream, this.auditEntryId);
         this.timeoutHint = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.timeoutHint);
         this.additionalHeader = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.additionalHeader);
     }
@@ -521,7 +521,7 @@ const schemaSignatureData = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "algorithm",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "signature",
@@ -549,13 +549,13 @@ class SignatureData extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaSignatureData; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.algorithm, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.algorithm, stream);
         (0, node_opcua_basic_types_1.encodeByteString)(this.signature, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.algorithm = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.algorithm);
+        this.algorithm = (0, node_opcua_basic_types_1.decodeString)(stream, this.algorithm);
         this.signature = (0, node_opcua_basic_types_1.decodeByteString)(stream, this.signature);
     }
     get schema() { return schemaSignatureData; }
@@ -654,7 +654,7 @@ const schemaActivateSessionRequest = (0, node_opcua_factory_1.buildStructuredTyp
         },
         {
             name: "localeIds",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -702,7 +702,7 @@ class ActivateSessionRequest extends node_opcua_extension_object_1.ExtensionObje
         this.requestHeader.encode(stream);
         this.clientSignature.encode(stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.clientSoftwareCertificates, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeString);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.userIdentityToken, stream);
         this.userTokenSignature.encode(stream);
     }
@@ -716,7 +716,7 @@ class ActivateSessionRequest extends node_opcua_extension_object_1.ExtensionObje
             obj.decode(stream1);
             return obj;
         });
-        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.userIdentityToken = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.userIdentityToken);
         this.userTokenSignature.decode(stream);
     }
@@ -763,7 +763,7 @@ const schemaResponseHeader = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "stringTable",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -804,7 +804,7 @@ class ResponseHeader extends node_opcua_extension_object_1.ExtensionObject {
         (0, node_opcua_basic_types_1.encodeUInt32)(this.requestHandle, stream);
         (0, node_opcua_status_code_1.encodeStatusCode)(this.serviceResult, stream);
         (0, node_opcua_data_model_1.encodeDiagnosticInfo)(this.serviceDiagnostics, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.stringTable, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.stringTable, stream, node_opcua_basic_types_1.encodeString);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.additionalHeader, stream);
     }
     decode(stream) {
@@ -814,7 +814,7 @@ class ResponseHeader extends node_opcua_extension_object_1.ExtensionObject {
         this.requestHandle = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.requestHandle);
         this.serviceResult = (0, node_opcua_status_code_1.decodeStatusCode)(stream, this.serviceResult);
         this.serviceDiagnostics = (0, node_opcua_data_model_1.decodeDiagnosticInfo)(stream, this.serviceDiagnostics);
-        this.stringTable = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.stringTable = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.additionalHeader = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.additionalHeader);
     }
     get schema() { return schemaResponseHeader; }
@@ -1281,11 +1281,11 @@ const schemaAddReferencesItem = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "isForward",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "targetServerUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "targetNodeId",
@@ -1327,8 +1327,8 @@ class AddReferencesItem extends node_opcua_extension_object_1.ExtensionObject {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.sourceNodeId, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.referenceTypeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isForward, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.targetServerUri, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isForward, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.targetServerUri, stream);
         (0, node_opcua_basic_types_1.encodeExpandedNodeId)(this.targetNodeId, stream);
         encodeNodeClass(this.targetNodeClass, stream);
     }
@@ -1337,8 +1337,8 @@ class AddReferencesItem extends node_opcua_extension_object_1.ExtensionObject {
         /* NEEDED !!! */ super.decode(stream);
         this.sourceNodeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.sourceNodeId);
         this.referenceTypeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.referenceTypeId);
-        this.isForward = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isForward);
-        this.targetServerUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.targetServerUri);
+        this.isForward = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isForward);
+        this.targetServerUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.targetServerUri);
         this.targetNodeId = (0, node_opcua_basic_types_1.decodeExpandedNodeId)(stream, this.targetNodeId);
         this.targetNodeClass = decodeNodeClass(stream, this.targetNodeClass);
     }
@@ -1639,11 +1639,11 @@ const schemaAggregateConfiguration = (0, node_opcua_factory_1.buildStructuredTyp
     fields: [
         {
             name: "useServerCapabilitiesDefaults",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "treatUncertainAsBad",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "percentDataBad",
@@ -1655,7 +1655,7 @@ const schemaAggregateConfiguration = (0, node_opcua_factory_1.buildStructuredTyp
         },
         {
             name: "useSlopedExtrapolation",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -1685,20 +1685,20 @@ class AggregateConfiguration extends node_opcua_extension_object_1.ExtensionObje
     static get schema() { return schemaAggregateConfiguration; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.useServerCapabilitiesDefaults, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.treatUncertainAsBad, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.useServerCapabilitiesDefaults, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.treatUncertainAsBad, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.percentDataBad, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.percentDataGood, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.useSlopedExtrapolation, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.useSlopedExtrapolation, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.useServerCapabilitiesDefaults = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.useServerCapabilitiesDefaults);
-        this.treatUncertainAsBad = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.treatUncertainAsBad);
+        this.useServerCapabilitiesDefaults = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.useServerCapabilitiesDefaults);
+        this.treatUncertainAsBad = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.treatUncertainAsBad);
         this.percentDataBad = (0, node_opcua_basic_types_1.decodeByte)(stream, this.percentDataBad);
         this.percentDataGood = (0, node_opcua_basic_types_1.decodeByte)(stream, this.percentDataGood);
-        this.useSlopedExtrapolation = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.useSlopedExtrapolation);
+        this.useSlopedExtrapolation = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.useSlopedExtrapolation);
     }
     get schema() { return schemaAggregateConfiguration; }
 }
@@ -2014,11 +2014,11 @@ const schemaAnnotation = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "message",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "userName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "annotationTime",
@@ -2048,15 +2048,15 @@ class Annotation extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaAnnotation; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.message, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.userName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.message, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.userName, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.annotationTime, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.message = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.message);
-        this.userName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.userName);
+        this.message = (0, node_opcua_basic_types_1.decodeString)(stream, this.message);
+        this.userName = (0, node_opcua_basic_types_1.decodeString)(stream, this.userName);
         this.annotationTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.annotationTime);
     }
     get schema() { return schemaAnnotation; }
@@ -2083,7 +2083,7 @@ const schemaUserIdentityToken = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "policyId",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -2105,12 +2105,12 @@ class UserIdentityToken extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaUserIdentityToken; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.policyId, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.policyId, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.policyId = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.policyId);
+        this.policyId = (0, node_opcua_basic_types_1.decodeString)(stream, this.policyId);
     }
     get schema() { return schemaUserIdentityToken; }
 }
@@ -2200,11 +2200,11 @@ const schemaApplicationDescription = (0, node_opcua_factory_1.buildStructuredTyp
     fields: [
         {
             name: "applicationUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "productUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "applicationName",
@@ -2216,15 +2216,15 @@ const schemaApplicationDescription = (0, node_opcua_factory_1.buildStructuredTyp
         },
         {
             name: "gatewayServerUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "discoveryProfileUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "discoveryUrls",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -2259,24 +2259,24 @@ class ApplicationDescription extends node_opcua_extension_object_1.ExtensionObje
     static get schema() { return schemaApplicationDescription; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.applicationUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.productUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.applicationUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.productUri, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.applicationName, stream);
         encodeApplicationType(this.applicationType, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.gatewayServerUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.discoveryProfileUri, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.discoveryUrls, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.gatewayServerUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.discoveryProfileUri, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.discoveryUrls, stream, node_opcua_basic_types_1.encodeString);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.applicationUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.applicationUri);
-        this.productUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.productUri);
+        this.applicationUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.applicationUri);
+        this.productUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.productUri);
         this.applicationName = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.applicationName);
         this.applicationType = decodeApplicationType(stream, this.applicationType);
-        this.gatewayServerUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.gatewayServerUri);
-        this.discoveryProfileUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.discoveryProfileUri);
-        this.discoveryUrls = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.gatewayServerUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.gatewayServerUri);
+        this.discoveryProfileUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.discoveryProfileUri);
+        this.discoveryUrls = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
     }
     // Define Enumeration setters
     setApplicationType(value) {
@@ -2316,7 +2316,7 @@ const schemaArgument = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "dataType",
@@ -2363,7 +2363,7 @@ class Argument extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaArgument; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.dataType, stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.valueRank, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.arrayDimensions, stream, node_opcua_basic_types_1.encodeUInt32);
@@ -2372,7 +2372,7 @@ class Argument extends node_opcua_extension_object_1.ExtensionObject {
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
         this.dataType = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.dataType);
         this.valueRank = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.valueRank);
         this.arrayDimensions = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUInt32);
@@ -2408,11 +2408,11 @@ const schemaRelativePathElement = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "isInverse",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "includeSubtypes",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "targetName",
@@ -2445,16 +2445,16 @@ class RelativePathElement extends node_opcua_extension_object_1.ExtensionObject
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.referenceTypeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isInverse, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.includeSubtypes, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isInverse, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.includeSubtypes, stream);
         (0, node_opcua_data_model_1.encodeQualifiedName)(this.targetName, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.referenceTypeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.referenceTypeId);
-        this.isInverse = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isInverse);
-        this.includeSubtypes = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.includeSubtypes);
+        this.isInverse = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isInverse);
+        this.includeSubtypes = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.includeSubtypes);
         this.targetName = (0, node_opcua_data_model_1.decodeQualifiedName)(stream, this.targetName);
     }
     get schema() { return schemaRelativePathElement; }
@@ -2546,7 +2546,7 @@ const schemaAttributeOperand = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "alias",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "browsePath",
@@ -2589,7 +2589,7 @@ class AttributeOperand extends FilterOperand {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.nodeId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.alias, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.alias, stream);
         this.browsePath.encode(stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.attributeId, stream);
         (0, node_opcua_numeric_range_1.encodeNumericRange)(this.indexRange, stream);
@@ -2598,7 +2598,7 @@ class AttributeOperand extends FilterOperand {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.nodeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.nodeId);
-        this.alias = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.alias);
+        this.alias = (0, node_opcua_basic_types_1.decodeString)(stream, this.alias);
         this.browsePath.decode(stream);
         this.attributeId = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.attributeId);
         this.indexRange = (0, node_opcua_numeric_range_1.decodeNumericRange)(stream, this.indexRange);
@@ -2669,11 +2669,11 @@ const schemaBrokerConnectionTransportDataType = (0, node_opcua_factory_1.buildSt
     fields: [
         {
             name: "resourceUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "authenticationProfileUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -2697,14 +2697,14 @@ class BrokerConnectionTransportDataType extends ConnectionTransportDataType {
     static get schema() { return schemaBrokerConnectionTransportDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.resourceUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.authenticationProfileUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.resourceUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.authenticationProfileUri, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.resourceUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.resourceUri);
-        this.authenticationProfileUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.authenticationProfileUri);
+        this.resourceUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.resourceUri);
+        this.authenticationProfileUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.authenticationProfileUri);
     }
     get schema() { return schemaBrokerConnectionTransportDataType; }
 }
@@ -2796,15 +2796,15 @@ const schemaBrokerDataSetReaderTransportDataType = (0, node_opcua_factory_1.buil
     fields: [
         {
             name: "queueName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "resourceUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "authenticationProfileUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "requestedDeliveryGuarantee",
@@ -2812,7 +2812,7 @@ const schemaBrokerDataSetReaderTransportDataType = (0, node_opcua_factory_1.buil
         },
         {
             name: "metaDataQueueName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -2842,20 +2842,20 @@ class BrokerDataSetReaderTransportDataType extends DataSetReaderTransportDataTyp
     static get schema() { return schemaBrokerDataSetReaderTransportDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.queueName, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.resourceUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.authenticationProfileUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.queueName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.resourceUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.authenticationProfileUri, stream);
         encodeBrokerTransportQualityOfService(this.requestedDeliveryGuarantee, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.metaDataQueueName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.metaDataQueueName, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.queueName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.queueName);
-        this.resourceUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.resourceUri);
-        this.authenticationProfileUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.authenticationProfileUri);
+        this.queueName = (0, node_opcua_basic_types_1.decodeString)(stream, this.queueName);
+        this.resourceUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.resourceUri);
+        this.authenticationProfileUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.authenticationProfileUri);
         this.requestedDeliveryGuarantee = decodeBrokerTransportQualityOfService(stream, this.requestedDeliveryGuarantee);
-        this.metaDataQueueName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.metaDataQueueName);
+        this.metaDataQueueName = (0, node_opcua_basic_types_1.decodeString)(stream, this.metaDataQueueName);
     }
     // Define Enumeration setters
     setRequestedDeliveryGuarantee(value) {
@@ -2933,15 +2933,15 @@ const schemaBrokerDataSetWriterTransportDataType = (0, node_opcua_factory_1.buil
     fields: [
         {
             name: "queueName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "resourceUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "authenticationProfileUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "requestedDeliveryGuarantee",
@@ -2949,7 +2949,7 @@ const schemaBrokerDataSetWriterTransportDataType = (0, node_opcua_factory_1.buil
         },
         {
             name: "metaDataQueueName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "metaDataUpdateTime",
@@ -2985,21 +2985,21 @@ class BrokerDataSetWriterTransportDataType extends DataSetWriterTransportDataTyp
     static get schema() { return schemaBrokerDataSetWriterTransportDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.queueName, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.resourceUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.authenticationProfileUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.queueName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.resourceUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.authenticationProfileUri, stream);
         encodeBrokerTransportQualityOfService(this.requestedDeliveryGuarantee, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.metaDataQueueName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.metaDataQueueName, stream);
         (0, node_opcua_basic_types_1.encodeDouble)(this.metaDataUpdateTime, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.queueName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.queueName);
-        this.resourceUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.resourceUri);
-        this.authenticationProfileUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.authenticationProfileUri);
+        this.queueName = (0, node_opcua_basic_types_1.decodeString)(stream, this.queueName);
+        this.resourceUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.resourceUri);
+        this.authenticationProfileUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.authenticationProfileUri);
         this.requestedDeliveryGuarantee = decodeBrokerTransportQualityOfService(stream, this.requestedDeliveryGuarantee);
-        this.metaDataQueueName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.metaDataQueueName);
+        this.metaDataQueueName = (0, node_opcua_basic_types_1.decodeString)(stream, this.metaDataQueueName);
         this.metaDataUpdateTime = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.metaDataUpdateTime);
     }
     // Define Enumeration setters
@@ -3079,15 +3079,15 @@ const schemaBrokerWriterGroupTransportDataType = (0, node_opcua_factory_1.buildS
     fields: [
         {
             name: "queueName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "resourceUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "authenticationProfileUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "requestedDeliveryGuarantee",
@@ -3119,17 +3119,17 @@ class BrokerWriterGroupTransportDataType extends WriterGroupTransportDataType {
     static get schema() { return schemaBrokerWriterGroupTransportDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.queueName, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.resourceUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.authenticationProfileUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.queueName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.resourceUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.authenticationProfileUri, stream);
         encodeBrokerTransportQualityOfService(this.requestedDeliveryGuarantee, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.queueName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.queueName);
-        this.resourceUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.resourceUri);
-        this.authenticationProfileUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.authenticationProfileUri);
+        this.queueName = (0, node_opcua_basic_types_1.decodeString)(stream, this.queueName);
+        this.resourceUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.resourceUri);
+        this.authenticationProfileUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.authenticationProfileUri);
         this.requestedDeliveryGuarantee = decodeBrokerTransportQualityOfService(stream, this.requestedDeliveryGuarantee);
     }
     // Define Enumeration setters
@@ -3179,7 +3179,7 @@ const schemaBrowseDescription = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "includeSubtypes",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "nodeClassMask",
@@ -3222,7 +3222,7 @@ class BrowseDescription extends node_opcua_extension_object_1.ExtensionObject {
         (0, node_opcua_basic_types_1.encodeNodeId)(this.nodeId, stream);
         (0, node_opcua_data_model_1.encodeBrowseDirection)(this.browseDirection, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.referenceTypeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.includeSubtypes, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.includeSubtypes, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.nodeClassMask, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.resultMask, stream);
     }
@@ -3232,7 +3232,7 @@ class BrowseDescription extends node_opcua_extension_object_1.ExtensionObject {
         this.nodeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.nodeId);
         this.browseDirection = (0, node_opcua_data_model_1.decodeBrowseDirection)(stream, this.browseDirection);
         this.referenceTypeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.referenceTypeId);
-        this.includeSubtypes = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.includeSubtypes);
+        this.includeSubtypes = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.includeSubtypes);
         this.nodeClassMask = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.nodeClassMask);
         this.resultMask = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.resultMask);
     }
@@ -3277,7 +3277,7 @@ const schemaBrowseNextRequest = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "releaseContinuationPoints",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "continuationPoints",
@@ -3309,14 +3309,14 @@ class BrowseNextRequest extends node_opcua_extension_object_1.ExtensionObject {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.releaseContinuationPoints, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.releaseContinuationPoints, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.continuationPoints, stream, node_opcua_basic_types_1.encodeByteString);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.releaseContinuationPoints = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.releaseContinuationPoints);
+        this.releaseContinuationPoints = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.releaseContinuationPoints);
         this.continuationPoints = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeByteString);
     }
     get schema() { return schemaBrowseNextRequest; }
@@ -3347,7 +3347,7 @@ const schemaReferenceDescription = (0, node_opcua_factory_1.buildStructuredType)
         },
         {
             name: "isForward",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "nodeId",
@@ -3402,7 +3402,7 @@ class ReferenceDescription extends node_opcua_extension_object_1.ExtensionObject
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.referenceTypeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isForward, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isForward, stream);
         (0, node_opcua_basic_types_1.encodeExpandedNodeId)(this.nodeId, stream);
         (0, node_opcua_data_model_1.encodeQualifiedName)(this.browseName, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.displayName, stream);
@@ -3413,7 +3413,7 @@ class ReferenceDescription extends node_opcua_extension_object_1.ExtensionObject
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.referenceTypeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.referenceTypeId);
-        this.isForward = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isForward);
+        this.isForward = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isForward);
         this.nodeId = (0, node_opcua_basic_types_1.decodeExpandedNodeId)(stream, this.nodeId);
         this.browseName = (0, node_opcua_data_model_1.decodeQualifiedName)(stream, this.browseName);
         this.displayName = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.displayName);
@@ -4039,23 +4039,23 @@ const schemaBuildInfo = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "productUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "manufacturerName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "productName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "softwareVersion",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "buildNumber",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "buildDate",
@@ -4091,21 +4091,21 @@ class BuildInfo extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaBuildInfo; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.productUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.manufacturerName, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.productName, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.softwareVersion, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.buildNumber, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.productUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.manufacturerName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.productName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.softwareVersion, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.buildNumber, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.buildDate, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.productUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.productUri);
-        this.manufacturerName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.manufacturerName);
-        this.productName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.productName);
-        this.softwareVersion = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.softwareVersion);
-        this.buildNumber = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.buildNumber);
+        this.productUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.productUri);
+        this.manufacturerName = (0, node_opcua_basic_types_1.decodeString)(stream, this.manufacturerName);
+        this.productName = (0, node_opcua_basic_types_1.decodeString)(stream, this.productName);
+        this.softwareVersion = (0, node_opcua_basic_types_1.decodeString)(stream, this.softwareVersion);
+        this.buildNumber = (0, node_opcua_basic_types_1.decodeString)(stream, this.buildNumber);
         this.buildDate = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.buildDate);
     }
     get schema() { return schemaBuildInfo; }
@@ -4778,7 +4778,7 @@ const schemaCloseSessionRequest = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "deleteSubscriptions",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -4803,13 +4803,13 @@ class CloseSessionRequest extends node_opcua_extension_object_1.ExtensionObject
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.deleteSubscriptions, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.deleteSubscriptions, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.deleteSubscriptions = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.deleteSubscriptions);
+        this.deleteSubscriptions = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.deleteSubscriptions);
     }
     get schema() { return schemaCloseSessionRequest; }
 }
@@ -5436,7 +5436,7 @@ const schemaMonitoringParameters = (0, node_opcua_factory_1.buildStructuredType)
         },
         {
             name: "discardOldest",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -5470,7 +5470,7 @@ class MonitoringParameters extends node_opcua_extension_object_1.ExtensionObject
         (0, node_opcua_basic_types_1.encodeDouble)(this.samplingInterval, stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.filter, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.queueSize, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.discardOldest, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.discardOldest, stream);
     }
     decode(stream) {
         // call base class implementation first
@@ -5479,7 +5479,7 @@ class MonitoringParameters extends node_opcua_extension_object_1.ExtensionObject
         this.samplingInterval = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.samplingInterval);
         this.filter = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.filter);
         this.queueSize = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.queueSize);
-        this.discardOldest = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.discardOldest);
+        this.discardOldest = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.discardOldest);
     }
     get schema() { return schemaMonitoringParameters; }
 }
@@ -5857,15 +5857,15 @@ const schemaCreateSessionRequest = (0, node_opcua_factory_1.buildStructuredType)
         },
         {
             name: "serverUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "endpointUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "sessionName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "clientNonce",
@@ -5921,9 +5921,9 @@ class CreateSessionRequest extends node_opcua_extension_object_1.ExtensionObject
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
         this.clientDescription.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.serverUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.endpointUrl, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.sessionName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.serverUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.endpointUrl, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.sessionName, stream);
         (0, node_opcua_basic_types_1.encodeByteString)(this.clientNonce, stream);
         (0, node_opcua_basic_types_1.encodeByteString)(this.clientCertificate, stream);
         (0, node_opcua_basic_types_1.encodeDouble)(this.requestedSessionTimeout, stream);
@@ -5934,9 +5934,9 @@ class CreateSessionRequest extends node_opcua_extension_object_1.ExtensionObject
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
         this.clientDescription.decode(stream);
-        this.serverUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.serverUri);
-        this.endpointUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.endpointUrl);
-        this.sessionName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.sessionName);
+        this.serverUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.serverUri);
+        this.endpointUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.endpointUrl);
+        this.sessionName = (0, node_opcua_basic_types_1.decodeString)(stream, this.sessionName);
         this.clientNonce = (0, node_opcua_basic_types_1.decodeByteString)(stream, this.clientNonce);
         this.clientCertificate = (0, node_opcua_basic_types_1.decodeByteString)(stream, this.clientCertificate);
         this.requestedSessionTimeout = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.requestedSessionTimeout);
@@ -6023,7 +6023,7 @@ const schemaUserTokenPolicy = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "policyId",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "tokenType",
@@ -6031,15 +6031,15 @@ const schemaUserTokenPolicy = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "issuedTokenType",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "issuerEndpointUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityPolicyUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -6069,20 +6069,20 @@ class UserTokenPolicy extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaUserTokenPolicy; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.policyId, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.policyId, stream);
         encodeUserTokenType(this.tokenType, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.issuedTokenType, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.issuerEndpointUrl, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityPolicyUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.issuedTokenType, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.issuerEndpointUrl, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityPolicyUri, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.policyId = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.policyId);
+        this.policyId = (0, node_opcua_basic_types_1.decodeString)(stream, this.policyId);
         this.tokenType = decodeUserTokenType(stream, this.tokenType);
-        this.issuedTokenType = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.issuedTokenType);
-        this.issuerEndpointUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.issuerEndpointUrl);
-        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityPolicyUri);
+        this.issuedTokenType = (0, node_opcua_basic_types_1.decodeString)(stream, this.issuedTokenType);
+        this.issuerEndpointUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.issuerEndpointUrl);
+        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityPolicyUri);
     }
     // Define Enumeration setters
     setTokenType(value) {
@@ -6120,7 +6120,7 @@ const schemaEndpointDescription = (0, node_opcua_factory_1.buildStructuredType)(
     fields: [
         {
             name: "endpointUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "server",
@@ -6136,7 +6136,7 @@ const schemaEndpointDescription = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "securityPolicyUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "userIdentityTokens",
@@ -6145,7 +6145,7 @@ const schemaEndpointDescription = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "transportProfileUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityLevel",
@@ -6189,29 +6189,29 @@ class EndpointDescription extends node_opcua_extension_object_1.ExtensionObject
     static get schema() { return schemaEndpointDescription; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.endpointUrl, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.endpointUrl, stream);
         this.server.encode(stream);
         (0, node_opcua_basic_types_1.encodeByteString)(this.serverCertificate, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityPolicyUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityPolicyUri, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.userIdentityTokens, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeUAString)(this.transportProfileUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.transportProfileUri, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.securityLevel, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.endpointUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.endpointUrl);
+        this.endpointUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.endpointUrl);
         this.server.decode(stream);
         this.serverCertificate = (0, node_opcua_basic_types_1.decodeByteString)(stream, this.serverCertificate);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityPolicyUri);
+        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityPolicyUri);
         this.userIdentityTokens = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new UserTokenPolicy(null);
             obj.decode(stream1);
             return obj;
         });
-        this.transportProfileUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.transportProfileUri);
+        this.transportProfileUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.transportProfileUri);
         this.securityLevel = (0, node_opcua_basic_types_1.decodeByte)(stream, this.securityLevel);
     }
     // Define Enumeration setters
@@ -6423,7 +6423,7 @@ const schemaCreateSubscriptionRequest = (0, node_opcua_factory_1.buildStructured
         },
         {
             name: "publishingEnabled",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "priority",
@@ -6466,7 +6466,7 @@ class CreateSubscriptionRequest extends node_opcua_extension_object_1.ExtensionO
         (0, node_opcua_basic_types_1.encodeUInt32)(this.requestedLifetimeCount, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.requestedMaxKeepAliveCount, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxNotificationsPerPublish, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.publishingEnabled, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.publishingEnabled, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.priority, stream);
     }
     decode(stream) {
@@ -6477,7 +6477,7 @@ class CreateSubscriptionRequest extends node_opcua_extension_object_1.ExtensionO
         this.requestedLifetimeCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.requestedLifetimeCount);
         this.requestedMaxKeepAliveCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.requestedMaxKeepAliveCount);
         this.maxNotificationsPerPublish = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxNotificationsPerPublish);
-        this.publishingEnabled = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.publishingEnabled);
+        this.publishingEnabled = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.publishingEnabled);
         this.priority = (0, node_opcua_basic_types_1.decodeByte)(stream, this.priority);
     }
     get schema() { return schemaCreateSubscriptionRequest; }
@@ -6603,7 +6603,7 @@ const schemaCurrencyUnitType = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "alphabeticCode",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "currency",
@@ -6637,7 +6637,7 @@ class CurrencyUnitType extends node_opcua_extension_object_1.ExtensionObject {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeInt16)(this.numericCode, stream);
         (0, node_opcua_basic_types_1.encodeSByte)(this.exponent, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.alphabeticCode, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.alphabeticCode, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.currency, stream);
     }
     decode(stream) {
@@ -6645,7 +6645,7 @@ class CurrencyUnitType extends node_opcua_extension_object_1.ExtensionObject {
         /* NEEDED !!! */ super.decode(stream);
         this.numericCode = (0, node_opcua_basic_types_1.decodeInt16)(stream, this.numericCode);
         this.exponent = (0, node_opcua_basic_types_1.decodeSByte)(stream, this.exponent);
-        this.alphabeticCode = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.alphabeticCode);
+        this.alphabeticCode = (0, node_opcua_basic_types_1.decodeString)(stream, this.alphabeticCode);
         this.currency = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.currency);
     }
     get schema() { return schemaCurrencyUnitType; }
@@ -7074,7 +7074,7 @@ const schemaStructureField = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "description",
@@ -7099,7 +7099,7 @@ const schemaStructureField = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "isOptional",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -7133,24 +7133,24 @@ class StructureField extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaStructureField; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.description, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.dataType, stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.valueRank, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.arrayDimensions, stream, node_opcua_basic_types_1.encodeUInt32);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxStringLength, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isOptional, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isOptional, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
         this.description = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.description);
         this.dataType = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.dataType);
         this.valueRank = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.valueRank);
         this.arrayDimensions = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUInt32);
         this.maxStringLength = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxStringLength);
-        this.isOptional = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isOptional);
+        this.isOptional = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isOptional);
     }
     get schema() { return schemaStructureField; }
 }
@@ -7397,7 +7397,7 @@ const schemaEnumField = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -7419,12 +7419,12 @@ class EnumField extends EnumValueType {
     static get schema() { return schemaEnumField; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
     }
     get schema() { return schemaEnumField; }
 }
@@ -7628,7 +7628,7 @@ const schemaDataTypeSchemaHeader = (0, node_opcua_factory_1.buildStructuredType)
     fields: [
         {
             name: "namespaces",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -7684,7 +7684,7 @@ class DataTypeSchemaHeader extends node_opcua_extension_object_1.ExtensionObject
     static get schema() { return schemaDataTypeSchemaHeader; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.namespaces, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.namespaces, stream, node_opcua_basic_types_1.encodeString);
         (0, node_opcua_basic_types_1.encodeArray)(this.structureDataTypes, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.enumDataTypes, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.simpleDataTypes, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -7692,7 +7692,7 @@ class DataTypeSchemaHeader extends node_opcua_extension_object_1.ExtensionObject
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaces = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.namespaces = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.structureDataTypes = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new StructureDescription(null);
             obj.decode(stream1);
@@ -7758,7 +7758,7 @@ const schemaFieldMetaData = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "description",
@@ -7840,7 +7840,7 @@ class FieldMetaData extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaFieldMetaData; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.description, stream);
         encodeDataSetFieldFlags(this.fieldFlags, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.builtInType, stream);
@@ -7854,7 +7854,7 @@ class FieldMetaData extends node_opcua_extension_object_1.ExtensionObject {
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
         this.description = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.description);
         this.fieldFlags = decodeDataSetFieldFlags(stream, this.fieldFlags);
         this.builtInType = (0, node_opcua_basic_types_1.decodeByte)(stream, this.builtInType);
@@ -7910,7 +7910,7 @@ const schemaDataSetMetaDataType = (0, node_opcua_factory_1.buildStructuredType)(
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "description",
@@ -7961,7 +7961,7 @@ class DataSetMetaDataType extends DataTypeSchemaHeader {
     static get schema() { return schemaDataSetMetaDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.description, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.fields, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeGuid)(this.dataSetClassId, stream);
@@ -7970,7 +7970,7 @@ class DataSetMetaDataType extends DataTypeSchemaHeader {
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
         this.description = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.description);
         this.fields = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new FieldMetaData(null);
@@ -8030,11 +8030,11 @@ const schemaDataSetReaderDataType = (0, node_opcua_factory_1.buildStructuredType
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "enabled",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "publisherId",
@@ -8066,7 +8066,7 @@ const schemaDataSetReaderDataType = (0, node_opcua_factory_1.buildStructuredType
         },
         {
             name: "headerLayoutUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityMode",
@@ -8074,7 +8074,7 @@ const schemaDataSetReaderDataType = (0, node_opcua_factory_1.buildStructuredType
         },
         {
             name: "securityGroupId",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityKeyServices",
@@ -8158,8 +8158,8 @@ class DataSetReaderDataType extends node_opcua_extension_object_1.ExtensionObjec
     static get schema() { return schemaDataSetReaderDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.enabled, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.enabled, stream);
         (0, node_opcua_variant_1.encodeVariant)(this.publisherId, stream);
         (0, node_opcua_basic_types_1.encodeUInt16)(this.writerGroupId, stream);
         (0, node_opcua_basic_types_1.encodeUInt16)(this.dataSetWriterId, stream);
@@ -8167,9 +8167,9 @@ class DataSetReaderDataType extends node_opcua_extension_object_1.ExtensionObjec
         encodeDataSetFieldContentMask(this.dataSetFieldContentMask, stream);
         (0, node_opcua_basic_types_1.encodeDouble)(this.messageReceiveTimeout, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.keyFrameCount, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.headerLayoutUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.headerLayoutUri, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityGroupId, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityGroupId, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.securityKeyServices, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.dataSetReaderProperties, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.transportSettings, stream);
@@ -8179,8 +8179,8 @@ class DataSetReaderDataType extends node_opcua_extension_object_1.ExtensionObjec
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
-        this.enabled = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.enabled);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
+        this.enabled = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.enabled);
         this.publisherId = (0, node_opcua_variant_1.decodeVariant)(stream, this.publisherId);
         this.writerGroupId = (0, node_opcua_basic_types_1.decodeUInt16)(stream, this.writerGroupId);
         this.dataSetWriterId = (0, node_opcua_basic_types_1.decodeUInt16)(stream, this.dataSetWriterId);
@@ -8188,9 +8188,9 @@ class DataSetReaderDataType extends node_opcua_extension_object_1.ExtensionObjec
         this.dataSetFieldContentMask = decodeDataSetFieldContentMask(stream, this.dataSetFieldContentMask);
         this.messageReceiveTimeout = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.messageReceiveTimeout);
         this.keyFrameCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.keyFrameCount);
-        this.headerLayoutUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.headerLayoutUri);
+        this.headerLayoutUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.headerLayoutUri);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityGroupId = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityGroupId);
+        this.securityGroupId = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityGroupId);
         this.securityKeyServices = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new EndpointDescription(null);
             obj.decode(stream1);
@@ -8302,11 +8302,11 @@ const schemaDataSetWriterDataType = (0, node_opcua_factory_1.buildStructuredType
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "enabled",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "dataSetWriterId",
@@ -8322,7 +8322,7 @@ const schemaDataSetWriterDataType = (0, node_opcua_factory_1.buildStructuredType
         },
         {
             name: "dataSetName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "dataSetWriterProperties",
@@ -8377,12 +8377,12 @@ class DataSetWriterDataType extends node_opcua_extension_object_1.ExtensionObjec
     static get schema() { return schemaDataSetWriterDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.enabled, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.enabled, stream);
         (0, node_opcua_basic_types_1.encodeUInt16)(this.dataSetWriterId, stream);
         encodeDataSetFieldContentMask(this.dataSetFieldContentMask, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.keyFrameCount, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.dataSetName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.dataSetName, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.dataSetWriterProperties, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.transportSettings, stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.messageSettings, stream);
@@ -8390,12 +8390,12 @@ class DataSetWriterDataType extends node_opcua_extension_object_1.ExtensionObjec
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
-        this.enabled = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.enabled);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
+        this.enabled = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.enabled);
         this.dataSetWriterId = (0, node_opcua_basic_types_1.decodeUInt16)(stream, this.dataSetWriterId);
         this.dataSetFieldContentMask = decodeDataSetFieldContentMask(stream, this.dataSetFieldContentMask);
         this.keyFrameCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.keyFrameCount);
-        this.dataSetName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.dataSetName);
+        this.dataSetName = (0, node_opcua_basic_types_1.decodeString)(stream, this.dataSetName);
         this.dataSetWriterProperties = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new KeyValuePair(null);
             obj.decode(stream1);
@@ -8571,7 +8571,7 @@ const schemaDataTypeAttributes = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "isAbstract",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -8593,12 +8593,12 @@ class DataTypeAttributes extends NodeAttributes {
     static get schema() { return schemaDataTypeAttributes; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isAbstract, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isAbstract, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isAbstract = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isAbstract);
+        this.isAbstract = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isAbstract);
     }
     get schema() { return schemaDataTypeAttributes; }
 }
@@ -8731,7 +8731,7 @@ const schemaReferenceNode = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "isInverse",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "targetId",
@@ -8762,14 +8762,14 @@ class ReferenceNode extends node_opcua_extension_object_1.ExtensionObject {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.referenceTypeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isInverse, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isInverse, stream);
         (0, node_opcua_basic_types_1.encodeExpandedNodeId)(this.targetId, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.referenceTypeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.referenceTypeId);
-        this.isInverse = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isInverse);
+        this.isInverse = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isInverse);
         this.targetId = (0, node_opcua_basic_types_1.decodeExpandedNodeId)(stream, this.targetId);
     }
     get schema() { return schemaReferenceNode; }
@@ -9029,7 +9029,7 @@ const schemaDataTypeNode = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "isAbstract",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "dataTypeDefinition",
@@ -9078,7 +9078,7 @@ class DataTypeNode extends TypeNode {
         (0, node_opcua_basic_types_1.encodeArray)(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isAbstract, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isAbstract, stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.dataTypeDefinition, stream);
     }
     decode(stream) {
@@ -9099,7 +9099,7 @@ class DataTypeNode extends TypeNode {
             obj.decode(stream1);
             return obj;
         });
-        this.isAbstract = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isAbstract);
+        this.isAbstract = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isAbstract);
         this.dataTypeDefinition = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.dataTypeDefinition);
     }
     get schema() { return schemaDataTypeNode; }
@@ -9187,7 +9187,7 @@ const schemaDatagramConnectionTransport2DataType = (0, node_opcua_factory_1.buil
         },
         {
             name: "qosCategory",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "datagramQos",
@@ -9222,7 +9222,7 @@ class DatagramConnectionTransport2DataType extends DatagramConnectionTransportDa
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.discoveryAnnounceRate, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.discoveryMaxMessageSize, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.qosCategory, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.qosCategory, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.datagramQos, stream, node_opcua_extension_object_1.encodeExtensionObject);
     }
     decode(stream) {
@@ -9230,7 +9230,7 @@ class DatagramConnectionTransport2DataType extends DatagramConnectionTransportDa
         /* NEEDED !!! */ super.decode(stream);
         this.discoveryAnnounceRate = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.discoveryAnnounceRate);
         this.discoveryMaxMessageSize = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.discoveryMaxMessageSize);
-        this.qosCategory = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.qosCategory);
+        this.qosCategory = (0, node_opcua_basic_types_1.decodeString)(stream, this.qosCategory);
         this.datagramQos = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_extension_object_1.decodeExtensionObject);
     }
     get schema() { return schemaDatagramConnectionTransport2DataType; }
@@ -9262,7 +9262,7 @@ const schemaDatagramDataSetReaderTransportDataType = (0, node_opcua_factory_1.bu
         },
         {
             name: "qosCategory",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "datagramQos",
@@ -9271,7 +9271,7 @@ const schemaDatagramDataSetReaderTransportDataType = (0, node_opcua_factory_1.bu
         },
         {
             name: "topic",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -9300,17 +9300,17 @@ class DatagramDataSetReaderTransportDataType extends DataSetReaderTransportDataT
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.address, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.qosCategory, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.qosCategory, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.datagramQos, stream, node_opcua_extension_object_1.encodeExtensionObject);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.topic, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.topic, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.address = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.address);
-        this.qosCategory = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.qosCategory);
+        this.qosCategory = (0, node_opcua_basic_types_1.decodeString)(stream, this.qosCategory);
         this.datagramQos = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_extension_object_1.decodeExtensionObject);
-        this.topic = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.topic);
+        this.topic = (0, node_opcua_basic_types_1.decodeString)(stream, this.topic);
     }
     get schema() { return schemaDatagramDataSetReaderTransportDataType; }
 }
@@ -9401,7 +9401,7 @@ const schemaDatagramWriterGroupTransport2DataType = (0, node_opcua_factory_1.bui
         },
         {
             name: "qosCategory",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "datagramQos",
@@ -9414,7 +9414,7 @@ const schemaDatagramWriterGroupTransport2DataType = (0, node_opcua_factory_1.bui
         },
         {
             name: "topic",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -9445,19 +9445,19 @@ class DatagramWriterGroupTransport2DataType extends DatagramWriterGroupTransport
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.address, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.qosCategory, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.qosCategory, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.datagramQos, stream, node_opcua_extension_object_1.encodeExtensionObject);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.discoveryAnnounceRate, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.topic, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.topic, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.address = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.address);
-        this.qosCategory = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.qosCategory);
+        this.qosCategory = (0, node_opcua_basic_types_1.decodeString)(stream, this.qosCategory);
         this.datagramQos = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_extension_object_1.decodeExtensionObject);
         this.discoveryAnnounceRate = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.discoveryAnnounceRate);
-        this.topic = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.topic);
+        this.topic = (0, node_opcua_basic_types_1.decodeString)(stream, this.topic);
     }
     get schema() { return schemaDatagramWriterGroupTransport2DataType; }
 }
@@ -9845,7 +9845,7 @@ const schemaDeleteNodesItem = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "deleteTargetReferences",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -9870,13 +9870,13 @@ class DeleteNodesItem extends node_opcua_extension_object_1.ExtensionObject {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.nodeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.deleteTargetReferences, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.deleteTargetReferences, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.nodeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.nodeId);
-        this.deleteTargetReferences = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.deleteTargetReferences);
+        this.deleteTargetReferences = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.deleteTargetReferences);
     }
     get schema() { return schemaDeleteNodesItem; }
 }
@@ -10041,7 +10041,7 @@ const schemaDeleteRawModifiedDetails = (0, node_opcua_factory_1.buildStructuredT
     fields: [
         {
             name: "isDeleteModified",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "startTime",
@@ -10075,14 +10075,14 @@ class DeleteRawModifiedDetails extends HistoryUpdateDetails {
     static get schema() { return schemaDeleteRawModifiedDetails; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isDeleteModified, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isDeleteModified, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.startTime, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.endTime, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isDeleteModified = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isDeleteModified);
+        this.isDeleteModified = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isDeleteModified);
         this.startTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.startTime);
         this.endTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.endTime);
     }
@@ -10118,7 +10118,7 @@ const schemaDeleteReferencesItem = (0, node_opcua_factory_1.buildStructuredType)
         },
         {
             name: "isForward",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "targetNodeId",
@@ -10126,7 +10126,7 @@ const schemaDeleteReferencesItem = (0, node_opcua_factory_1.buildStructuredType)
         },
         {
             name: "deleteBidirectional",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -10158,18 +10158,18 @@ class DeleteReferencesItem extends node_opcua_extension_object_1.ExtensionObject
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.sourceNodeId, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.referenceTypeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isForward, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isForward, stream);
         (0, node_opcua_basic_types_1.encodeExpandedNodeId)(this.targetNodeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.deleteBidirectional, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.deleteBidirectional, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.sourceNodeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.sourceNodeId);
         this.referenceTypeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.referenceTypeId);
-        this.isForward = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isForward);
+        this.isForward = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isForward);
         this.targetNodeId = (0, node_opcua_basic_types_1.decodeExpandedNodeId)(stream, this.targetNodeId);
-        this.deleteBidirectional = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.deleteBidirectional);
+        this.deleteBidirectional = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.deleteBidirectional);
     }
     get schema() { return schemaDeleteReferencesItem; }
 }
@@ -10624,7 +10624,7 @@ const schemaEndpointConfiguration = (0, node_opcua_factory_1.buildStructuredType
         },
         {
             name: "useBinaryEncoding",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "maxStringLength",
@@ -10691,7 +10691,7 @@ class EndpointConfiguration extends node_opcua_extension_object_1.ExtensionObjec
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.operationTimeout, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.useBinaryEncoding, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.useBinaryEncoding, stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.maxStringLength, stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.maxByteStringLength, stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.maxArrayLength, stream);
@@ -10704,7 +10704,7 @@ class EndpointConfiguration extends node_opcua_extension_object_1.ExtensionObjec
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.operationTimeout = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.operationTimeout);
-        this.useBinaryEncoding = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.useBinaryEncoding);
+        this.useBinaryEncoding = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.useBinaryEncoding);
         this.maxStringLength = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.maxStringLength);
         this.maxByteStringLength = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.maxByteStringLength);
         this.maxArrayLength = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.maxArrayLength);
@@ -10743,7 +10743,7 @@ const schemaEndpointType = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "endpointUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityMode",
@@ -10751,11 +10751,11 @@ const schemaEndpointType = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "securityPolicyUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "transportProfileUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -10783,18 +10783,18 @@ class EndpointType extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaEndpointType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.endpointUrl, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.endpointUrl, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityPolicyUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.transportProfileUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityPolicyUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.transportProfileUri, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.endpointUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.endpointUrl);
+        this.endpointUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.endpointUrl);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityPolicyUri);
-        this.transportProfileUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.transportProfileUri);
+        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityPolicyUri);
+        this.transportProfileUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.transportProfileUri);
     }
     // Define Enumeration setters
     setSecurityMode(value) {
@@ -10831,7 +10831,7 @@ const schemaEndpointUrlListDataType = (0, node_opcua_factory_1.buildStructuredTy
     fields: [
         {
             name: "endpointUrlList",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -10854,12 +10854,12 @@ class EndpointUrlListDataType extends node_opcua_extension_object_1.ExtensionObj
     static get schema() { return schemaEndpointUrlListDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.endpointUrlList, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.endpointUrlList, stream, node_opcua_basic_types_1.encodeString);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.endpointUrlList = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.endpointUrlList = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
     }
     get schema() { return schemaEndpointUrlListDataType; }
 }
@@ -11233,7 +11233,7 @@ const schemaFieldTargetDataType = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "receiverIndexRange",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "targetNodeId",
@@ -11245,7 +11245,7 @@ const schemaFieldTargetDataType = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "writeIndexRange",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "overrideValueHandling",
@@ -11288,10 +11288,10 @@ class FieldTargetDataType extends node_opcua_extension_object_1.ExtensionObject
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeGuid)(this.dataSetFieldId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.receiverIndexRange, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.receiverIndexRange, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.targetNodeId, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.attributeId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.writeIndexRange, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.writeIndexRange, stream);
         encodeOverrideValueHandling(this.overrideValueHandling, stream);
         (0, node_opcua_variant_1.encodeVariant)(this.overrideValue, stream);
     }
@@ -11299,10 +11299,10 @@ class FieldTargetDataType extends node_opcua_extension_object_1.ExtensionObject
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.dataSetFieldId = (0, node_opcua_basic_types_1.decodeGuid)(stream, this.dataSetFieldId);
-        this.receiverIndexRange = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.receiverIndexRange);
+        this.receiverIndexRange = (0, node_opcua_basic_types_1.decodeString)(stream, this.receiverIndexRange);
         this.targetNodeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.targetNodeId);
         this.attributeId = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.attributeId);
-        this.writeIndexRange = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.writeIndexRange);
+        this.writeIndexRange = (0, node_opcua_basic_types_1.decodeString)(stream, this.writeIndexRange);
         this.overrideValueHandling = decodeOverrideValueHandling(stream, this.overrideValueHandling);
         this.overrideValue = (0, node_opcua_variant_1.decodeVariant)(stream, this.overrideValue);
     }
@@ -11356,7 +11356,7 @@ const schemaFindServersOnNetworkRequest = (0, node_opcua_factory_1.buildStructur
         },
         {
             name: "serverCapabilityFilter",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -11388,7 +11388,7 @@ class FindServersOnNetworkRequest extends node_opcua_extension_object_1.Extensio
         this.requestHeader.encode(stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.startingRecordId, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxRecordsToReturn, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.serverCapabilityFilter, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.serverCapabilityFilter, stream, node_opcua_basic_types_1.encodeString);
     }
     decode(stream) {
         // call base class implementation first
@@ -11396,7 +11396,7 @@ class FindServersOnNetworkRequest extends node_opcua_extension_object_1.Extensio
         this.requestHeader.decode(stream);
         this.startingRecordId = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.startingRecordId);
         this.maxRecordsToReturn = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxRecordsToReturn);
-        this.serverCapabilityFilter = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.serverCapabilityFilter = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
     }
     get schema() { return schemaFindServersOnNetworkRequest; }
 }
@@ -11427,15 +11427,15 @@ const schemaServerOnNetwork = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "serverName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "discoveryUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "serverCapabilities",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -11465,17 +11465,17 @@ class ServerOnNetwork extends node_opcua_extension_object_1.ExtensionObject {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.recordId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.serverName, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.discoveryUrl, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.serverCapabilities, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.serverName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.discoveryUrl, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.serverCapabilities, stream, node_opcua_basic_types_1.encodeString);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.recordId = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.recordId);
-        this.serverName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.serverName);
-        this.discoveryUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.discoveryUrl);
-        this.serverCapabilities = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.serverName = (0, node_opcua_basic_types_1.decodeString)(stream, this.serverName);
+        this.discoveryUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.discoveryUrl);
+        this.serverCapabilities = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
     }
     get schema() { return schemaServerOnNetwork; }
 }
@@ -11584,16 +11584,16 @@ const schemaFindServersRequest = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "endpointUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "localeIds",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "serverUris",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -11623,17 +11623,17 @@ class FindServersRequest extends node_opcua_extension_object_1.ExtensionObject {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.endpointUrl, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeArray)(this.serverUris, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.endpointUrl, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.serverUris, stream, node_opcua_basic_types_1.encodeString);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.endpointUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.endpointUrl);
-        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.serverUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.endpointUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.endpointUrl);
+        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.serverUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
     }
     get schema() { return schemaFindServersRequest; }
 }
@@ -11893,16 +11893,16 @@ const schemaGetEndpointsRequest = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "endpointUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "localeIds",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "profileUris",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -11932,17 +11932,17 @@ class GetEndpointsRequest extends node_opcua_extension_object_1.ExtensionObject
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.endpointUrl, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeArray)(this.profileUris, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.endpointUrl, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.profileUris, stream, node_opcua_basic_types_1.encodeString);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.endpointUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.endpointUrl);
-        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.profileUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.endpointUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.endpointUrl);
+        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.profileUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
     }
     get schema() { return schemaGetEndpointsRequest; }
 }
@@ -12236,7 +12236,7 @@ const schemaModificationInfo = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "userName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -12264,14 +12264,14 @@ class ModificationInfo extends node_opcua_extension_object_1.ExtensionObject {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.modificationTime, stream);
         encodeHistoryUpdateType(this.updateType, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.userName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.userName, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.modificationTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.modificationTime);
         this.updateType = decodeHistoryUpdateType(stream, this.updateType);
-        this.userName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.userName);
+        this.userName = (0, node_opcua_basic_types_1.decodeString)(stream, this.userName);
     }
     // Define Enumeration setters
     setUpdateType(value) {
@@ -12497,7 +12497,7 @@ const schemaHistoryReadRequest = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "releaseContinuationPoints",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "nodesToRead",
@@ -12539,7 +12539,7 @@ class HistoryReadRequest extends node_opcua_extension_object_1.ExtensionObject {
         this.requestHeader.encode(stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.historyReadDetails, stream);
         (0, node_opcua_data_value_1.encodeTimestampsToReturn)(this.timestampsToReturn, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.releaseContinuationPoints, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.releaseContinuationPoints, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.nodesToRead, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     decode(stream) {
@@ -12548,7 +12548,7 @@ class HistoryReadRequest extends node_opcua_extension_object_1.ExtensionObject {
         this.requestHeader.decode(stream);
         this.historyReadDetails = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.historyReadDetails);
         this.timestampsToReturn = (0, node_opcua_data_value_1.decodeTimestampsToReturn)(stream, this.timestampsToReturn);
-        this.releaseContinuationPoints = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.releaseContinuationPoints);
+        this.releaseContinuationPoints = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.releaseContinuationPoints);
         this.nodesToRead = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new HistoryReadValueId(null);
             obj.decode(stream1);
@@ -12984,7 +12984,7 @@ const schemaIdentityMappingRuleType = (0, node_opcua_factory_1.buildStructuredTy
         },
         {
             name: "criteria",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -13009,13 +13009,13 @@ class IdentityMappingRuleType extends node_opcua_extension_object_1.ExtensionObj
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         encodeIdentityCriteriaType(this.criteriaType, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.criteria, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.criteria, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.criteriaType = decodeIdentityCriteriaType(stream, this.criteriaType);
-        this.criteria = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.criteria);
+        this.criteria = (0, node_opcua_basic_types_1.decodeString)(stream, this.criteria);
     }
     // Define Enumeration setters
     setCriteriaType(value) {
@@ -13094,7 +13094,7 @@ const schemaIssuedIdentityToken = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "encryptionAlgorithm",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -13119,13 +13119,13 @@ class IssuedIdentityToken extends UserIdentityToken {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeByteString)(this.tokenData, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.encryptionAlgorithm, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.encryptionAlgorithm, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.tokenData = (0, node_opcua_basic_types_1.decodeByteString)(stream, this.tokenData);
-        this.encryptionAlgorithm = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.encryptionAlgorithm);
+        this.encryptionAlgorithm = (0, node_opcua_basic_types_1.decodeString)(stream, this.encryptionAlgorithm);
     }
     get schema() { return schemaIssuedIdentityToken; }
 }
@@ -13492,11 +13492,11 @@ const schemaMdnsDiscoveryConfiguration = (0, node_opcua_factory_1.buildStructure
     fields: [
         {
             name: "mdnsServerName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "serverCapabilities",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -13521,14 +13521,14 @@ class MdnsDiscoveryConfiguration extends DiscoveryConfiguration {
     static get schema() { return schemaMdnsDiscoveryConfiguration; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.mdnsServerName, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.serverCapabilities, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.mdnsServerName, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.serverCapabilities, stream, node_opcua_basic_types_1.encodeString);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.mdnsServerName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.mdnsServerName);
-        this.serverCapabilities = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.mdnsServerName = (0, node_opcua_basic_types_1.decodeString)(stream, this.mdnsServerName);
+        this.serverCapabilities = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
     }
     get schema() { return schemaMdnsDiscoveryConfiguration; }
 }
@@ -13553,11 +13553,11 @@ const schemaMethodAttributes = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "executable",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "userExecutable",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -13581,14 +13581,14 @@ class MethodAttributes extends NodeAttributes {
     static get schema() { return schemaMethodAttributes; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.executable, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.userExecutable, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.executable, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.userExecutable, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.executable = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.executable);
-        this.userExecutable = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.userExecutable);
+        this.executable = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.executable);
+        this.userExecutable = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.userExecutable);
     }
     get schema() { return schemaMethodAttributes; }
 }
@@ -13628,11 +13628,11 @@ const schemaMethodNode = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "executable",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "userExecutable",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -13677,8 +13677,8 @@ class MethodNode extends InstanceNode {
         (0, node_opcua_basic_types_1.encodeArray)(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.executable, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.userExecutable, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.executable, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.userExecutable, stream);
     }
     decode(stream) {
         // call base class implementation first
@@ -13698,8 +13698,8 @@ class MethodNode extends InstanceNode {
             obj.decode(stream1);
             return obj;
         });
-        this.executable = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.executable);
-        this.userExecutable = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.userExecutable);
+        this.executable = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.executable);
+        this.userExecutable = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.userExecutable);
     }
     get schema() { return schemaMethodNode; }
 }
@@ -14293,7 +14293,7 @@ const schemaNetworkAddressDataType = (0, node_opcua_factory_1.buildStructuredTyp
     fields: [
         {
             name: "networkInterface",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -14315,12 +14315,12 @@ class NetworkAddressDataType extends node_opcua_extension_object_1.ExtensionObje
     static get schema() { return schemaNetworkAddressDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.networkInterface, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.networkInterface, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.networkInterface = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.networkInterface);
+        this.networkInterface = (0, node_opcua_basic_types_1.decodeString)(stream, this.networkInterface);
     }
     get schema() { return schemaNetworkAddressDataType; }
 }
@@ -14344,7 +14344,7 @@ const schemaNetworkAddressUrlDataType = (0, node_opcua_factory_1.buildStructured
     fields: [
         {
             name: "url",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -14366,12 +14366,12 @@ class NetworkAddressUrlDataType extends NetworkAddressDataType {
     static get schema() { return schemaNetworkAddressUrlDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.url, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.url, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.url = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.url);
+        this.url = (0, node_opcua_basic_types_1.decodeString)(stream, this.url);
     }
     get schema() { return schemaNetworkAddressUrlDataType; }
 }
@@ -14395,7 +14395,7 @@ const schemaNetworkGroupDataType = (0, node_opcua_factory_1.buildStructuredType)
     fields: [
         {
             name: "serverUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "networkPaths",
@@ -14428,13 +14428,13 @@ class NetworkGroupDataType extends node_opcua_extension_object_1.ExtensionObject
     static get schema() { return schemaNetworkGroupDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.serverUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.serverUri, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.networkPaths, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.serverUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.serverUri);
+        this.serverUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.serverUri);
         this.networkPaths = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new EndpointUrlListDataType(null);
             obj.decode(stream1);
@@ -14472,7 +14472,7 @@ const schemaNodeReference = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "isForward",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "referencedNodeIds",
@@ -14507,7 +14507,7 @@ class NodeReference extends node_opcua_extension_object_1.ExtensionObject {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.nodeId, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.referenceTypeId, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isForward, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isForward, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.referencedNodeIds, stream, node_opcua_basic_types_1.encodeNodeId);
     }
     decode(stream) {
@@ -14515,7 +14515,7 @@ class NodeReference extends node_opcua_extension_object_1.ExtensionObject {
         /* NEEDED !!! */ super.decode(stream);
         this.nodeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.nodeId);
         this.referenceTypeId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.referenceTypeId);
-        this.isForward = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isForward);
+        this.isForward = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isForward);
         this.referencedNodeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeNodeId);
     }
     get schema() { return schemaNodeReference; }
@@ -14616,7 +14616,7 @@ const schemaNodeTypeDescription = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "includeSubTypes",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "dataToReturn",
@@ -14652,14 +14652,14 @@ class NodeTypeDescription extends node_opcua_extension_object_1.ExtensionObject
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeExpandedNodeId)(this.typeDefinitionNode, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.includeSubTypes, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.includeSubTypes, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.dataToReturn, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.typeDefinitionNode = (0, node_opcua_basic_types_1.decodeExpandedNodeId)(stream, this.typeDefinitionNode);
-        this.includeSubTypes = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.includeSubTypes);
+        this.includeSubTypes = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.includeSubTypes);
         this.dataToReturn = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new QueryDataDescription(null);
             obj.decode(stream1);
@@ -14916,7 +14916,7 @@ const schemaObjectTypeAttributes = (0, node_opcua_factory_1.buildStructuredType)
     fields: [
         {
             name: "isAbstract",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -14938,12 +14938,12 @@ class ObjectTypeAttributes extends NodeAttributes {
     static get schema() { return schemaObjectTypeAttributes; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isAbstract, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isAbstract, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isAbstract = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isAbstract);
+        this.isAbstract = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isAbstract);
     }
     get schema() { return schemaObjectTypeAttributes; }
 }
@@ -14982,7 +14982,7 @@ const schemaObjectTypeNode = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "isAbstract",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -15025,7 +15025,7 @@ class ObjectTypeNode extends TypeNode {
         (0, node_opcua_basic_types_1.encodeArray)(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isAbstract, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isAbstract, stream);
     }
     decode(stream) {
         // call base class implementation first
@@ -15045,7 +15045,7 @@ class ObjectTypeNode extends TypeNode {
             obj.decode(stream1);
             return obj;
         });
-        this.isAbstract = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isAbstract);
+        this.isAbstract = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isAbstract);
     }
     get schema() { return schemaObjectTypeNode; }
 }
@@ -15460,7 +15460,7 @@ const schemaPortableNodeId = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "namespaceUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "identifier",
@@ -15488,13 +15488,13 @@ class PortableNodeId extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaPortableNodeId; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.namespaceUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.namespaceUri, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.identifier, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaceUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.namespaceUri);
+        this.namespaceUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.namespaceUri);
         this.identifier = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.identifier);
     }
     get schema() { return schemaPortableNodeId; }
@@ -15520,11 +15520,11 @@ const schemaPortableQualifiedName = (0, node_opcua_factory_1.buildStructuredType
     fields: [
         {
             name: "namespaceUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -15548,14 +15548,14 @@ class PortableQualifiedName extends node_opcua_extension_object_1.ExtensionObjec
     static get schema() { return schemaPortableQualifiedName; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.namespaceUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.namespaceUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaceUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.namespaceUri);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
+        this.namespaceUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.namespaceUri);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
     }
     get schema() { return schemaPortableQualifiedName; }
 }
@@ -15580,11 +15580,11 @@ const schemaPriorityMappingEntryType = (0, node_opcua_factory_1.buildStructuredT
     fields: [
         {
             name: "mappingUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "priorityLabel",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "priorityValue_PCP",
@@ -15620,16 +15620,16 @@ class PriorityMappingEntryType extends node_opcua_extension_object_1.ExtensionOb
     static get schema() { return schemaPriorityMappingEntryType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.mappingUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.priorityLabel, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.mappingUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.priorityLabel, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.priorityValue_PCP, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.priorityValue_DSCP, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.mappingUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.mappingUri);
-        this.priorityLabel = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.priorityLabel);
+        this.mappingUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.mappingUri);
+        this.priorityLabel = (0, node_opcua_basic_types_1.decodeString)(stream, this.priorityLabel);
         this.priorityValue_PCP = (0, node_opcua_basic_types_1.decodeByte)(stream, this.priorityValue_PCP);
         this.priorityValue_DSCP = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.priorityValue_DSCP);
     }
@@ -15662,7 +15662,7 @@ const schemaProgramDiagnostic2DataType = (0, node_opcua_factory_1.buildStructure
         },
         {
             name: "createClientName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "invocationCreationTime",
@@ -15674,7 +15674,7 @@ const schemaProgramDiagnostic2DataType = (0, node_opcua_factory_1.buildStructure
         },
         {
             name: "lastMethodCall",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "lastMethodSessionId",
@@ -15759,10 +15759,10 @@ class ProgramDiagnostic2DataType extends node_opcua_extension_object_1.Extension
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.createSessionId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.createClientName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.createClientName, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.invocationCreationTime, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.lastTransitionTime, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.lastMethodCall, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.lastMethodCall, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.lastMethodSessionId, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.lastMethodInputArguments, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.lastMethodOutputArguments, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -15775,10 +15775,10 @@ class ProgramDiagnostic2DataType extends node_opcua_extension_object_1.Extension
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.createSessionId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.createSessionId);
-        this.createClientName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.createClientName);
+        this.createClientName = (0, node_opcua_basic_types_1.decodeString)(stream, this.createClientName);
         this.invocationCreationTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.invocationCreationTime);
         this.lastTransitionTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.lastTransitionTime);
-        this.lastMethodCall = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.lastMethodCall);
+        this.lastMethodCall = (0, node_opcua_basic_types_1.decodeString)(stream, this.lastMethodCall);
         this.lastMethodSessionId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.lastMethodSessionId);
         this.lastMethodInputArguments = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new Argument(null);
@@ -15892,7 +15892,7 @@ const schemaProgramDiagnosticDataType = (0, node_opcua_factory_1.buildStructured
         },
         {
             name: "createClientName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "invocationCreationTime",
@@ -15904,7 +15904,7 @@ const schemaProgramDiagnosticDataType = (0, node_opcua_factory_1.buildStructured
         },
         {
             name: "lastMethodCall",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "lastMethodSessionId",
@@ -15975,10 +15975,10 @@ class ProgramDiagnosticDataType extends node_opcua_extension_object_1.ExtensionO
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.createSessionId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.createClientName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.createClientName, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.invocationCreationTime, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.lastTransitionTime, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.lastMethodCall, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.lastMethodCall, stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.lastMethodSessionId, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.lastMethodInputArguments, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.lastMethodOutputArguments, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -15989,10 +15989,10 @@ class ProgramDiagnosticDataType extends node_opcua_extension_object_1.ExtensionO
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.createSessionId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.createSessionId);
-        this.createClientName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.createClientName);
+        this.createClientName = (0, node_opcua_basic_types_1.decodeString)(stream, this.createClientName);
         this.invocationCreationTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.invocationCreationTime);
         this.lastTransitionTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.lastTransitionTime);
-        this.lastMethodCall = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.lastMethodCall);
+        this.lastMethodCall = (0, node_opcua_basic_types_1.decodeString)(stream, this.lastMethodCall);
         this.lastMethodSessionId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.lastMethodSessionId);
         this.lastMethodInputArguments = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new Argument(null);
@@ -16038,11 +16038,11 @@ const schemaPublishedDataSetDataType = (0, node_opcua_factory_1.buildStructuredT
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "dataSetFolder",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -16090,8 +16090,8 @@ class PublishedDataSetDataType extends node_opcua_extension_object_1.ExtensionOb
     static get schema() { return schemaPublishedDataSetDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.dataSetFolder, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.dataSetFolder, stream, node_opcua_basic_types_1.encodeString);
         this.dataSetMetaData.encode(stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.extensionFields, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.dataSetSource, stream);
@@ -16099,8 +16099,8 @@ class PublishedDataSetDataType extends node_opcua_extension_object_1.ExtensionOb
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
-        this.dataSetFolder = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
+        this.dataSetFolder = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.dataSetMetaData.decode(stream);
         this.extensionFields = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new KeyValuePair(null);
@@ -16135,11 +16135,11 @@ const schemaPubSubGroupDataType = (0, node_opcua_factory_1.buildStructuredType)(
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "enabled",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "securityMode",
@@ -16147,7 +16147,7 @@ const schemaPubSubGroupDataType = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "securityGroupId",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityKeyServices",
@@ -16203,10 +16203,10 @@ class PubSubGroupDataType extends node_opcua_extension_object_1.ExtensionObject
     static get schema() { return schemaPubSubGroupDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.enabled, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.enabled, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityGroupId, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityGroupId, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.securityKeyServices, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxNetworkMessageSize, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.groupProperties, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -16214,10 +16214,10 @@ class PubSubGroupDataType extends node_opcua_extension_object_1.ExtensionObject
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
-        this.enabled = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.enabled);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
+        this.enabled = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.enabled);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityGroupId = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityGroupId);
+        this.securityGroupId = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityGroupId);
         this.securityKeyServices = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new EndpointDescription(null);
             obj.decode(stream1);
@@ -16284,12 +16284,12 @@ const schemaWriterGroupDataType = (0, node_opcua_factory_1.buildStructuredType)(
         },
         {
             name: "localeIds",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "headerLayoutUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "transportSettings",
@@ -16348,8 +16348,8 @@ class WriterGroupDataType extends PubSubGroupDataType {
         (0, node_opcua_basic_types_1.encodeDouble)(this.publishingInterval, stream);
         (0, node_opcua_basic_types_1.encodeDouble)(this.keepAliveTime, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.priority, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.headerLayoutUri, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeString)(this.headerLayoutUri, stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.transportSettings, stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.messageSettings, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.dataSetWriters, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -16361,8 +16361,8 @@ class WriterGroupDataType extends PubSubGroupDataType {
         this.publishingInterval = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.publishingInterval);
         this.keepAliveTime = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.keepAliveTime);
         this.priority = (0, node_opcua_basic_types_1.decodeByte)(stream, this.priority);
-        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.headerLayoutUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.headerLayoutUri);
+        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.headerLayoutUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.headerLayoutUri);
         this.transportSettings = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.transportSettings);
         this.messageSettings = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.messageSettings);
         this.dataSetWriters = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
@@ -16479,11 +16479,11 @@ const schemaPubSubConnectionDataType = (0, node_opcua_factory_1.buildStructuredT
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "enabled",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "publisherId",
@@ -16491,7 +16491,7 @@ const schemaPubSubConnectionDataType = (0, node_opcua_factory_1.buildStructuredT
         },
         {
             name: "transportProfileUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "address",
@@ -16564,10 +16564,10 @@ class PubSubConnectionDataType extends node_opcua_extension_object_1.ExtensionOb
     static get schema() { return schemaPubSubConnectionDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.enabled, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.enabled, stream);
         (0, node_opcua_variant_1.encodeVariant)(this.publisherId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.transportProfileUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.transportProfileUri, stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.address, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.connectionProperties, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.transportSettings, stream);
@@ -16577,10 +16577,10 @@ class PubSubConnectionDataType extends node_opcua_extension_object_1.ExtensionOb
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
-        this.enabled = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.enabled);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
+        this.enabled = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.enabled);
         this.publisherId = (0, node_opcua_variant_1.decodeVariant)(stream, this.publisherId);
-        this.transportProfileUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.transportProfileUri);
+        this.transportProfileUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.transportProfileUri);
         this.address = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.address);
         this.connectionProperties = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new KeyValuePair(null);
@@ -16639,7 +16639,7 @@ const schemaPubSubConfigurationDataType = (0, node_opcua_factory_1.buildStructur
         },
         {
             name: "enabled",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -16675,7 +16675,7 @@ class PubSubConfigurationDataType extends node_opcua_extension_object_1.Extensio
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.publishedDataSets, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.connections, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.enabled, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.enabled, stream);
     }
     decode(stream) {
         // call base class implementation first
@@ -16690,7 +16690,7 @@ class PubSubConfigurationDataType extends node_opcua_extension_object_1.Extensio
             obj.decode(stream1);
             return obj;
         });
-        this.enabled = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.enabled);
+        this.enabled = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.enabled);
     }
     get schema() { return schemaPubSubConfigurationDataType; }
 }
@@ -16756,11 +16756,11 @@ const schemaStandaloneSubscribedDataSetDataType = (0, node_opcua_factory_1.build
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "dataSetFolder",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -16797,16 +16797,16 @@ class StandaloneSubscribedDataSetDataType extends SubscribedDataSetDataType {
     static get schema() { return schemaStandaloneSubscribedDataSetDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.dataSetFolder, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.dataSetFolder, stream, node_opcua_basic_types_1.encodeString);
         this.dataSetMetaData.encode(stream);
         (0, node_opcua_extension_object_1.encodeExtensionObject)(this.subscribedDataSet, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
-        this.dataSetFolder = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
+        this.dataSetFolder = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.dataSetMetaData.decode(stream);
         this.subscribedDataSet = (0, node_opcua_extension_object_1.decodeExtensionObject)(stream, this.subscribedDataSet);
     }
@@ -16835,11 +16835,11 @@ const schemaSecurityGroupDataType = (0, node_opcua_factory_1.buildStructuredType
     fields: [
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityGroupFolder",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -16848,7 +16848,7 @@ const schemaSecurityGroupDataType = (0, node_opcua_factory_1.buildStructuredType
         },
         {
             name: "securityPolicyUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "maxFutureKeyCount",
@@ -16860,7 +16860,7 @@ const schemaSecurityGroupDataType = (0, node_opcua_factory_1.buildStructuredType
         },
         {
             name: "securityGroupId",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "rolePermissions",
@@ -16916,26 +16916,26 @@ class SecurityGroupDataType extends node_opcua_extension_object_1.ExtensionObjec
     static get schema() { return schemaSecurityGroupDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.securityGroupFolder, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.securityGroupFolder, stream, node_opcua_basic_types_1.encodeString);
         (0, node_opcua_basic_types_1.encodeDouble)(this.keyLifetime, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityPolicyUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityPolicyUri, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxFutureKeyCount, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxPastKeyCount, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityGroupId, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityGroupId, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.groupProperties, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
-        this.securityGroupFolder = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
+        this.securityGroupFolder = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.keyLifetime = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.keyLifetime);
-        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityPolicyUri);
+        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityPolicyUri);
         this.maxFutureKeyCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxFutureKeyCount);
         this.maxPastKeyCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxPastKeyCount);
-        this.securityGroupId = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityGroupId);
+        this.securityGroupId = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityGroupId);
         this.rolePermissions = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new RolePermissionType(null);
             obj.decode(stream1);
@@ -16977,20 +16977,20 @@ const schemaPubSubKeyPushTargetDataType = (0, node_opcua_factory_1.buildStructur
     fields: [
         {
             name: "applicationUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "pushTargetFolder",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "endpointUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityPolicyUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "userTokenType",
@@ -17011,7 +17011,7 @@ const schemaPubSubKeyPushTargetDataType = (0, node_opcua_factory_1.buildStructur
         },
         {
             name: "securityGroups",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -17054,23 +17054,23 @@ class PubSubKeyPushTargetDataType extends node_opcua_extension_object_1.Extensio
     static get schema() { return schemaPubSubKeyPushTargetDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.applicationUri, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.pushTargetFolder, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.endpointUrl, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityPolicyUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.applicationUri, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.pushTargetFolder, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeString)(this.endpointUrl, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityPolicyUri, stream);
         this.userTokenType.encode(stream);
         (0, node_opcua_basic_types_1.encodeUInt16)(this.requestedKeyCount, stream);
         (0, node_opcua_basic_types_1.encodeDouble)(this.retryInterval, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.pushTargetProperties, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeArray)(this.securityGroups, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.securityGroups, stream, node_opcua_basic_types_1.encodeString);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.applicationUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.applicationUri);
-        this.pushTargetFolder = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.endpointUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.endpointUrl);
-        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityPolicyUri);
+        this.applicationUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.applicationUri);
+        this.pushTargetFolder = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.endpointUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.endpointUrl);
+        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityPolicyUri);
         this.userTokenType.decode(stream);
         this.requestedKeyCount = (0, node_opcua_basic_types_1.decodeUInt16)(stream, this.requestedKeyCount);
         this.retryInterval = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.retryInterval);
@@ -17079,7 +17079,7 @@ class PubSubKeyPushTargetDataType extends node_opcua_extension_object_1.Extensio
             obj.decode(stream1);
             return obj;
         });
-        this.securityGroups = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.securityGroups = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
     }
     get schema() { return schemaPubSubKeyPushTargetDataType; }
 }
@@ -17393,7 +17393,7 @@ const schemaPubSubConfigurationValueDataType = (0, node_opcua_factory_1.buildStr
         },
         {
             name: "name",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "identifier",
@@ -17424,14 +17424,14 @@ class PubSubConfigurationValueDataType extends node_opcua_extension_object_1.Ext
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         this.configurationElement.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.name, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.name, stream);
         (0, node_opcua_variant_1.encodeVariant)(this.identifier, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.configurationElement.decode(stream);
-        this.name = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.name);
+        this.name = (0, node_opcua_basic_types_1.decodeString)(stream, this.name);
         this.identifier = (0, node_opcua_variant_1.decodeVariant)(stream, this.identifier);
     }
     get schema() { return schemaPubSubConfigurationValueDataType; }
@@ -17600,7 +17600,7 @@ const schemaPublishResponse = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "moreNotifications",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "notificationMessage",
@@ -17651,7 +17651,7 @@ class PublishResponse extends node_opcua_extension_object_1.ExtensionObject {
         this.responseHeader.encode(stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.subscriptionId, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.availableSequenceNumbers, stream, node_opcua_basic_types_1.encodeUInt32);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.moreNotifications, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.moreNotifications, stream);
         this.notificationMessage.encode(stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.results, stream, node_opcua_status_code_1.encodeStatusCode);
         (0, node_opcua_basic_types_1.encodeArray)(this.diagnosticInfos, stream, node_opcua_data_model_1.encodeDiagnosticInfo);
@@ -17662,7 +17662,7 @@ class PublishResponse extends node_opcua_extension_object_1.ExtensionObject {
         this.responseHeader.decode(stream);
         this.subscriptionId = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.subscriptionId);
         this.availableSequenceNumbers = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUInt32);
-        this.moreNotifications = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.moreNotifications);
+        this.moreNotifications = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.moreNotifications);
         this.notificationMessage.decode(stream);
         this.results = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_status_code_1.decodeStatusCode);
         this.diagnosticInfos = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_data_model_1.decodeDiagnosticInfo);
@@ -17910,7 +17910,7 @@ const schemaPublishedDataSetCustomSourceDataType = (0, node_opcua_factory_1.buil
     fields: [
         {
             name: "cyclicDataSet",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -17932,12 +17932,12 @@ class PublishedDataSetCustomSourceDataType extends PublishedDataSetSourceDataTyp
     static get schema() { return schemaPublishedDataSetCustomSourceDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.cyclicDataSet, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.cyclicDataSet, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.cyclicDataSet = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.cyclicDataSet);
+        this.cyclicDataSet = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.cyclicDataSet);
     }
     get schema() { return schemaPublishedDataSetCustomSourceDataType; }
 }
@@ -18373,7 +18373,7 @@ const schemaQueryNextRequest = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "releaseContinuationPoint",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "continuationPoint",
@@ -18404,14 +18404,14 @@ class QueryNextRequest extends node_opcua_extension_object_1.ExtensionObject {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.releaseContinuationPoint, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.releaseContinuationPoint, stream);
         (0, node_opcua_basic_types_1.encodeByteString)(this.continuationPoint, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.releaseContinuationPoint = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.releaseContinuationPoint);
+        this.releaseContinuationPoint = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.releaseContinuationPoint);
         this.continuationPoint = (0, node_opcua_basic_types_1.decodeByteString)(stream, this.continuationPoint);
     }
     get schema() { return schemaQueryNextRequest; }
@@ -18633,7 +18633,7 @@ const schemaReadAtTimeDetails = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "useSimpleBounds",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -18658,13 +18658,13 @@ class ReadAtTimeDetails extends HistoryReadDetails {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.reqTimes, stream, node_opcua_basic_types_1.encodeDateTime);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.useSimpleBounds, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.useSimpleBounds, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.reqTimes = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeDateTime);
-        this.useSimpleBounds = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.useSimpleBounds);
+        this.useSimpleBounds = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.useSimpleBounds);
     }
     get schema() { return schemaReadAtTimeDetails; }
 }
@@ -18855,7 +18855,7 @@ const schemaReadRawModifiedDetails = (0, node_opcua_factory_1.buildStructuredTyp
     fields: [
         {
             name: "isReadModified",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "startTime",
@@ -18871,7 +18871,7 @@ const schemaReadRawModifiedDetails = (0, node_opcua_factory_1.buildStructuredTyp
         },
         {
             name: "returnBounds",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -18901,20 +18901,20 @@ class ReadRawModifiedDetails extends HistoryReadDetails {
     static get schema() { return schemaReadRawModifiedDetails; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isReadModified, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isReadModified, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.startTime, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.endTime, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.numValuesPerNode, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.returnBounds, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.returnBounds, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isReadModified = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isReadModified);
+        this.isReadModified = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isReadModified);
         this.startTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.startTime);
         this.endTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.endTime);
         this.numValuesPerNode = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.numValuesPerNode);
-        this.returnBounds = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.returnBounds);
+        this.returnBounds = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.returnBounds);
     }
     get schema() { return schemaReadRawModifiedDetails; }
 }
@@ -19230,7 +19230,7 @@ const schemaReceiveQosPriorityDataType = (0, node_opcua_factory_1.buildStructure
     fields: [
         {
             name: "priorityLabel",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -19252,12 +19252,12 @@ class ReceiveQosPriorityDataType extends ReceiveQosDataType {
     static get schema() { return schemaReceiveQosPriorityDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.priorityLabel, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.priorityLabel, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.priorityLabel = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.priorityLabel);
+        this.priorityLabel = (0, node_opcua_basic_types_1.decodeString)(stream, this.priorityLabel);
     }
     get schema() { return schemaReceiveQosPriorityDataType; }
 }
@@ -19311,7 +19311,7 @@ const schemaRedundantServerDataType = (0, node_opcua_factory_1.buildStructuredTy
     fields: [
         {
             name: "serverId",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "serviceLevel",
@@ -19345,14 +19345,14 @@ class RedundantServerDataType extends node_opcua_extension_object_1.ExtensionObj
     static get schema() { return schemaRedundantServerDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.serverId, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.serverId, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.serviceLevel, stream);
         encodeServerState(this.serverState, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.serverId = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.serverId);
+        this.serverId = (0, node_opcua_basic_types_1.decodeString)(stream, this.serverId);
         this.serviceLevel = (0, node_opcua_basic_types_1.decodeByte)(stream, this.serviceLevel);
         this.serverState = decodeServerState(stream, this.serverState);
     }
@@ -19390,11 +19390,11 @@ const schemaReferenceTypeAttributes = (0, node_opcua_factory_1.buildStructuredTy
     fields: [
         {
             name: "isAbstract",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "symmetric",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "inverseName",
@@ -19424,15 +19424,15 @@ class ReferenceTypeAttributes extends NodeAttributes {
     static get schema() { return schemaReferenceTypeAttributes; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isAbstract, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.symmetric, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isAbstract, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.symmetric, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.inverseName, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isAbstract = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isAbstract);
-        this.symmetric = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.symmetric);
+        this.isAbstract = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isAbstract);
+        this.symmetric = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.symmetric);
         this.inverseName = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.inverseName);
     }
     get schema() { return schemaReferenceTypeAttributes; }
@@ -19474,11 +19474,11 @@ const schemaReferenceTypeNode = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "isAbstract",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "symmetric",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "inverseName",
@@ -19529,8 +19529,8 @@ class ReferenceTypeNode extends TypeNode {
         (0, node_opcua_basic_types_1.encodeArray)(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isAbstract, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.symmetric, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isAbstract, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.symmetric, stream);
         (0, node_opcua_data_model_1.encodeLocalizedText)(this.inverseName, stream);
     }
     decode(stream) {
@@ -19551,8 +19551,8 @@ class ReferenceTypeNode extends TypeNode {
             obj.decode(stream1);
             return obj;
         });
-        this.isAbstract = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isAbstract);
-        this.symmetric = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.symmetric);
+        this.isAbstract = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isAbstract);
+        this.symmetric = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.symmetric);
         this.inverseName = (0, node_opcua_data_model_1.decodeLocalizedText)(stream, this.inverseName);
     }
     get schema() { return schemaReferenceTypeNode; }
@@ -19704,11 +19704,11 @@ const schemaRegisteredServer = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "serverUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "productUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "serverNames",
@@ -19721,20 +19721,20 @@ const schemaRegisteredServer = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "gatewayServerUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "discoveryUrls",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "semaphoreFilePath",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "isOnline",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -19770,26 +19770,26 @@ class RegisteredServer extends node_opcua_extension_object_1.ExtensionObject {
     static get schema() { return schemaRegisteredServer; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.serverUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.productUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.serverUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.productUri, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.serverNames, stream, node_opcua_data_model_1.encodeLocalizedText);
         encodeApplicationType(this.serverType, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.gatewayServerUri, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.discoveryUrls, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.semaphoreFilePath, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isOnline, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.gatewayServerUri, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.discoveryUrls, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeString)(this.semaphoreFilePath, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isOnline, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.serverUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.serverUri);
-        this.productUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.productUri);
+        this.serverUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.serverUri);
+        this.productUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.productUri);
         this.serverNames = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_data_model_1.decodeLocalizedText);
         this.serverType = decodeApplicationType(stream, this.serverType);
-        this.gatewayServerUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.gatewayServerUri);
-        this.discoveryUrls = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.semaphoreFilePath = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.semaphoreFilePath);
-        this.isOnline = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isOnline);
+        this.gatewayServerUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.gatewayServerUri);
+        this.discoveryUrls = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.semaphoreFilePath = (0, node_opcua_basic_types_1.decodeString)(stream, this.semaphoreFilePath);
+        this.isOnline = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isOnline);
     }
     // Define Enumeration setters
     setServerType(value) {
@@ -20720,7 +20720,7 @@ const schemaSessionDiagnosticsDataType = (0, node_opcua_factory_1.buildStructure
         },
         {
             name: "sessionName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "clientDescription",
@@ -20728,15 +20728,15 @@ const schemaSessionDiagnosticsDataType = (0, node_opcua_factory_1.buildStructure
         },
         {
             name: "serverUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "endpointUrl",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "localeIds",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -20992,11 +20992,11 @@ class SessionDiagnosticsDataType extends node_opcua_extension_object_1.Extension
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.sessionId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.sessionName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.sessionName, stream);
         this.clientDescription.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.serverUri, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.endpointUrl, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeString)(this.serverUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.endpointUrl, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeString);
         (0, node_opcua_basic_types_1.encodeDouble)(this.actualSessionTimeout, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxResponseMessageSize, stream);
         (0, node_opcua_basic_types_1.encodeDateTime)(this.clientConnectionTime, stream);
@@ -21039,11 +21039,11 @@ class SessionDiagnosticsDataType extends node_opcua_extension_object_1.Extension
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.sessionId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.sessionId);
-        this.sessionName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.sessionName);
+        this.sessionName = (0, node_opcua_basic_types_1.decodeString)(stream, this.sessionName);
         this.clientDescription.decode(stream);
-        this.serverUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.serverUri);
-        this.endpointUrl = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.endpointUrl);
-        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.serverUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.serverUri);
+        this.endpointUrl = (0, node_opcua_basic_types_1.decodeString)(stream, this.endpointUrl);
+        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.actualSessionTimeout = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.actualSessionTimeout);
         this.maxResponseMessageSize = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxResponseMessageSize);
         this.clientConnectionTime = (0, node_opcua_basic_types_1.decodeDateTime)(stream, this.clientConnectionTime);
@@ -21150,24 +21150,24 @@ const schemaSessionSecurityDiagnosticsDataType = (0, node_opcua_factory_1.buildS
         },
         {
             name: "clientUserIdOfSession",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "clientUserIdHistory",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "authenticationMechanism",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "encoding",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "transportProtocol",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityMode",
@@ -21175,7 +21175,7 @@ const schemaSessionSecurityDiagnosticsDataType = (0, node_opcua_factory_1.buildS
         },
         {
             name: "securityPolicyUri",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "clientCertificate",
@@ -21218,26 +21218,26 @@ class SessionSecurityDiagnosticsDataType extends node_opcua_extension_object_1.E
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeNodeId)(this.sessionId, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.clientUserIdOfSession, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.clientUserIdHistory, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.authenticationMechanism, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.encoding, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.transportProtocol, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.clientUserIdOfSession, stream);
+        (0, node_opcua_basic_types_1.encodeArray)(this.clientUserIdHistory, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeString)(this.authenticationMechanism, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.encoding, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.transportProtocol, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.securityPolicyUri, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.securityPolicyUri, stream);
         (0, node_opcua_basic_types_1.encodeByteString)(this.clientCertificate, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.sessionId = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.sessionId);
-        this.clientUserIdOfSession = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.clientUserIdOfSession);
-        this.clientUserIdHistory = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.authenticationMechanism = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.authenticationMechanism);
-        this.encoding = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.encoding);
-        this.transportProtocol = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.transportProtocol);
+        this.clientUserIdOfSession = (0, node_opcua_basic_types_1.decodeString)(stream, this.clientUserIdOfSession);
+        this.clientUserIdHistory = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.authenticationMechanism = (0, node_opcua_basic_types_1.decodeString)(stream, this.authenticationMechanism);
+        this.encoding = (0, node_opcua_basic_types_1.decodeString)(stream, this.encoding);
+        this.transportProtocol = (0, node_opcua_basic_types_1.decodeString)(stream, this.transportProtocol);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.securityPolicyUri);
+        this.securityPolicyUri = (0, node_opcua_basic_types_1.decodeString)(stream, this.securityPolicyUri);
         this.clientCertificate = (0, node_opcua_basic_types_1.decodeByteString)(stream, this.clientCertificate);
     }
     // Define Enumeration setters
@@ -21284,17 +21284,17 @@ const schemaSessionlessInvokeRequestType = (0, node_opcua_factory_1.buildStructu
         },
         {
             name: "namespaceUris",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "serverUris",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "localeIds",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -21330,18 +21330,18 @@ class SessionlessInvokeRequestType extends node_opcua_extension_object_1.Extensi
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.urisVersion, stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.namespaceUris, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeArray)(this.serverUris, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.namespaceUris, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.serverUris, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.localeIds, stream, node_opcua_basic_types_1.encodeString);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.serviceId, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.urisVersion = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.urisVersion);
-        this.namespaceUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.serverUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.namespaceUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.serverUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.localeIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.serviceId = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.serviceId);
     }
     get schema() { return schemaSessionlessInvokeRequestType; }
@@ -21370,12 +21370,12 @@ const schemaSessionlessInvokeResponseType = (0, node_opcua_factory_1.buildStruct
     fields: [
         {
             name: "namespaceUris",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "serverUris",
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -21406,15 +21406,15 @@ class SessionlessInvokeResponseType extends node_opcua_extension_object_1.Extens
     static get schema() { return schemaSessionlessInvokeResponseType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeArray)(this.namespaceUris, stream, node_opcua_basic_types_1.encodeUAString);
-        (0, node_opcua_basic_types_1.encodeArray)(this.serverUris, stream, node_opcua_basic_types_1.encodeUAString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.namespaceUris, stream, node_opcua_basic_types_1.encodeString);
+        (0, node_opcua_basic_types_1.encodeArray)(this.serverUris, stream, node_opcua_basic_types_1.encodeString);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.serviceId, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaceUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
-        this.serverUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUAString);
+        this.namespaceUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
+        this.serverUris = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeString);
         this.serviceId = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.serviceId);
     }
     get schema() { return schemaSessionlessInvokeResponseType; }
@@ -21605,7 +21605,7 @@ const schemaSetPublishingModeRequest = (0, node_opcua_factory_1.buildStructuredT
         },
         {
             name: "publishingEnabled",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "subscriptionIds",
@@ -21637,14 +21637,14 @@ class SetPublishingModeRequest extends node_opcua_extension_object_1.ExtensionOb
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.publishingEnabled, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.publishingEnabled, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.subscriptionIds, stream, node_opcua_basic_types_1.encodeUInt32);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.publishingEnabled = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.publishingEnabled);
+        this.publishingEnabled = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.publishingEnabled);
         this.subscriptionIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUInt32);
     }
     get schema() { return schemaSetPublishingModeRequest; }
@@ -21922,7 +21922,7 @@ const schemaStandaloneSubscribedDataSetRefDataType = (0, node_opcua_factory_1.bu
     fields: [
         {
             name: "dataSetName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -21944,12 +21944,12 @@ class StandaloneSubscribedDataSetRefDataType extends SubscribedDataSetDataType {
     static get schema() { return schemaStandaloneSubscribedDataSetRefDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.dataSetName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.dataSetName, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.dataSetName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.dataSetName);
+        this.dataSetName = (0, node_opcua_basic_types_1.decodeString)(stream, this.dataSetName);
     }
     get schema() { return schemaStandaloneSubscribedDataSetRefDataType; }
 }
@@ -22033,7 +22033,7 @@ const schemaSubscribedDataSetMirrorDataType = (0, node_opcua_factory_1.buildStru
     fields: [
         {
             name: "parentNodeName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "rolePermissions",
@@ -22066,13 +22066,13 @@ class SubscribedDataSetMirrorDataType extends SubscribedDataSetDataType {
     static get schema() { return schemaSubscribedDataSetMirrorDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.parentNodeName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.parentNodeName, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.parentNodeName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.parentNodeName);
+        this.parentNodeName = (0, node_opcua_basic_types_1.decodeString)(stream, this.parentNodeName);
         this.rolePermissions = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new RolePermissionType(null);
             obj.decode(stream1);
@@ -22130,7 +22130,7 @@ const schemaSubscriptionDiagnosticsDataType = (0, node_opcua_factory_1.buildStru
         },
         {
             name: "publishingEnabled",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "modifyCount",
@@ -22311,7 +22311,7 @@ class SubscriptionDiagnosticsDataType extends node_opcua_extension_object_1.Exte
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxKeepAliveCount, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxLifetimeCount, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.maxNotificationsPerPublish, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.publishingEnabled, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.publishingEnabled, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.modifyCount, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.enableCount, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.disableCount, stream);
@@ -22346,7 +22346,7 @@ class SubscriptionDiagnosticsDataType extends node_opcua_extension_object_1.Exte
         this.maxKeepAliveCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxKeepAliveCount);
         this.maxLifetimeCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxLifetimeCount);
         this.maxNotificationsPerPublish = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.maxNotificationsPerPublish);
-        this.publishingEnabled = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.publishingEnabled);
+        this.publishingEnabled = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.publishingEnabled);
         this.modifyCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.modifyCount);
         this.enableCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.enableCount);
         this.disableCount = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.disableCount);
@@ -22794,7 +22794,7 @@ const schemaTimeZoneDataType = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "daylightSavingInOffset",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -22819,13 +22819,13 @@ class TimeZoneDataType extends node_opcua_extension_object_1.ExtensionObject {
     encode(stream) {
         /* NEEDED */ super.encode(stream);
         (0, node_opcua_basic_types_1.encodeInt16)(this.offset, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.daylightSavingInOffset, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.daylightSavingInOffset, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.offset = (0, node_opcua_basic_types_1.decodeInt16)(stream, this.offset);
-        this.daylightSavingInOffset = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.daylightSavingInOffset);
+        this.daylightSavingInOffset = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.daylightSavingInOffset);
     }
     get schema() { return schemaTimeZoneDataType; }
 }
@@ -22920,7 +22920,7 @@ const schemaTransferSubscriptionsRequest = (0, node_opcua_factory_1.buildStructu
         },
         {
             name: "sendInitialValues",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -22948,14 +22948,14 @@ class TransferSubscriptionsRequest extends node_opcua_extension_object_1.Extensi
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.subscriptionIds, stream, node_opcua_basic_types_1.encodeUInt32);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.sendInitialValues, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.sendInitialValues, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
         this.subscriptionIds = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUInt32);
-        this.sendInitialValues = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.sendInitialValues);
+        this.sendInitialValues = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.sendInitialValues);
     }
     get schema() { return schemaTransferSubscriptionsRequest; }
 }
@@ -23248,7 +23248,7 @@ const schemaTransmitQosPriorityDataType = (0, node_opcua_factory_1.buildStructur
     fields: [
         {
             name: "priorityLabel",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -23270,12 +23270,12 @@ class TransmitQosPriorityDataType extends TransmitQosDataType {
     static get schema() { return schemaTransmitQosPriorityDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.priorityLabel, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.priorityLabel, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.priorityLabel = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.priorityLabel);
+        this.priorityLabel = (0, node_opcua_basic_types_1.decodeString)(stream, this.priorityLabel);
     }
     get schema() { return schemaTransmitQosPriorityDataType; }
 }
@@ -23390,7 +23390,7 @@ const schemaUABinaryFileDataType = (0, node_opcua_factory_1.buildStructuredType)
     fields: [
         {
             name: "schemaLocation",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "fileHeader",
@@ -23429,14 +23429,14 @@ class UABinaryFileDataType extends DataTypeSchemaHeader {
     static get schema() { return schemaUABinaryFileDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.schemaLocation, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.schemaLocation, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.fileHeader, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_variant_1.encodeVariant)(this.body, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.schemaLocation = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.schemaLocation);
+        this.schemaLocation = (0, node_opcua_basic_types_1.decodeString)(stream, this.schemaLocation);
         this.fileHeader = (0, node_opcua_basic_types_1.decodeArray)(stream, (stream1) => {
             const obj = new KeyValuePair(null);
             obj.decode(stream1);
@@ -24373,7 +24373,7 @@ const schemaUserManagementDataType = (0, node_opcua_factory_1.buildStructuredTyp
     fields: [
         {
             name: "userName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "userConfiguration",
@@ -24381,7 +24381,7 @@ const schemaUserManagementDataType = (0, node_opcua_factory_1.buildStructuredTyp
         },
         {
             name: "description",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -24407,16 +24407,16 @@ class UserManagementDataType extends node_opcua_extension_object_1.ExtensionObje
     static get schema() { return schemaUserManagementDataType; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.userName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.userName, stream);
         encodeUserConfigurationMask(this.userConfiguration, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.description, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.description, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.userName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.userName);
+        this.userName = (0, node_opcua_basic_types_1.decodeString)(stream, this.userName);
         this.userConfiguration = decodeUserConfigurationMask(stream, this.userConfiguration);
-        this.description = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.description);
+        this.description = (0, node_opcua_basic_types_1.decodeString)(stream, this.description);
     }
     // Define Enumeration setters
     setUserConfiguration(value) {
@@ -24452,7 +24452,7 @@ const schemaUserNameIdentityToken = (0, node_opcua_factory_1.buildStructuredType
     fields: [
         {
             name: "userName",
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "password",
@@ -24460,7 +24460,7 @@ const schemaUserNameIdentityToken = (0, node_opcua_factory_1.buildStructuredType
         },
         {
             name: "encryptionAlgorithm",
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -24486,16 +24486,16 @@ class UserNameIdentityToken extends UserIdentityToken {
     static get schema() { return schemaUserNameIdentityToken; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.userName, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.userName, stream);
         (0, node_opcua_basic_types_1.encodeByteString)(this.password, stream);
-        (0, node_opcua_basic_types_1.encodeUAString)(this.encryptionAlgorithm, stream);
+        (0, node_opcua_basic_types_1.encodeString)(this.encryptionAlgorithm, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.userName = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.userName);
+        this.userName = (0, node_opcua_basic_types_1.decodeString)(stream, this.userName);
         this.password = (0, node_opcua_basic_types_1.decodeByteString)(stream, this.password);
-        this.encryptionAlgorithm = (0, node_opcua_basic_types_1.decodeUAString)(stream, this.encryptionAlgorithm);
+        this.encryptionAlgorithm = (0, node_opcua_basic_types_1.decodeString)(stream, this.encryptionAlgorithm);
     }
     get schema() { return schemaUserNameIdentityToken; }
 }
@@ -24550,7 +24550,7 @@ const schemaVariableAttributes = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "historizing",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -24593,7 +24593,7 @@ class VariableAttributes extends NodeAttributes {
         (0, node_opcua_basic_types_1.encodeByte)(this.accessLevel, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.userAccessLevel, stream);
         (0, node_opcua_basic_types_1.encodeDouble)(this.minimumSamplingInterval, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.historizing, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.historizing, stream);
     }
     decode(stream) {
         // call base class implementation first
@@ -24605,7 +24605,7 @@ class VariableAttributes extends NodeAttributes {
         this.accessLevel = (0, node_opcua_basic_types_1.decodeByte)(stream, this.accessLevel);
         this.userAccessLevel = (0, node_opcua_basic_types_1.decodeByte)(stream, this.userAccessLevel);
         this.minimumSamplingInterval = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.minimumSamplingInterval);
-        this.historizing = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.historizing);
+        this.historizing = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.historizing);
     }
     get schema() { return schemaVariableAttributes; }
 }
@@ -24680,7 +24680,7 @@ const schemaVariableNode = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "historizing",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "accessLevelEx",
@@ -24750,7 +24750,7 @@ class VariableNode extends InstanceNode {
         (0, node_opcua_basic_types_1.encodeByte)(this.accessLevel, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.userAccessLevel, stream);
         (0, node_opcua_basic_types_1.encodeDouble)(this.minimumSamplingInterval, stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.historizing, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.historizing, stream);
         (0, node_opcua_basic_types_1.encodeUInt32)(this.accessLevelEx, stream);
     }
     decode(stream) {
@@ -24778,7 +24778,7 @@ class VariableNode extends InstanceNode {
         this.accessLevel = (0, node_opcua_basic_types_1.decodeByte)(stream, this.accessLevel);
         this.userAccessLevel = (0, node_opcua_basic_types_1.decodeByte)(stream, this.userAccessLevel);
         this.minimumSamplingInterval = (0, node_opcua_basic_types_1.decodeDouble)(stream, this.minimumSamplingInterval);
-        this.historizing = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.historizing);
+        this.historizing = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.historizing);
         this.accessLevelEx = (0, node_opcua_basic_types_1.decodeUInt32)(stream, this.accessLevelEx);
     }
     get schema() { return schemaVariableNode; }
@@ -24831,7 +24831,7 @@ const schemaVariableTypeAttributes = (0, node_opcua_factory_1.buildStructuredTyp
         },
         {
             name: "isAbstract",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -24865,7 +24865,7 @@ class VariableTypeAttributes extends NodeAttributes {
         (0, node_opcua_basic_types_1.encodeNodeId)(this.dataType, stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.valueRank, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.arrayDimensions, stream, node_opcua_basic_types_1.encodeUInt32);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isAbstract, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isAbstract, stream);
     }
     decode(stream) {
         // call base class implementation first
@@ -24874,7 +24874,7 @@ class VariableTypeAttributes extends NodeAttributes {
         this.dataType = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.dataType);
         this.valueRank = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.valueRank);
         this.arrayDimensions = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUInt32);
-        this.isAbstract = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isAbstract);
+        this.isAbstract = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isAbstract);
     }
     get schema() { return schemaVariableTypeAttributes; }
 }
@@ -24934,7 +24934,7 @@ const schemaVariableTypeNode = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "isAbstract",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -24989,7 +24989,7 @@ class VariableTypeNode extends TypeNode {
         (0, node_opcua_basic_types_1.encodeNodeId)(this.dataType, stream);
         (0, node_opcua_basic_types_1.encodeInt32)(this.valueRank, stream);
         (0, node_opcua_basic_types_1.encodeArray)(this.arrayDimensions, stream, node_opcua_basic_types_1.encodeUInt32);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.isAbstract, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.isAbstract, stream);
     }
     decode(stream) {
         // call base class implementation first
@@ -25013,7 +25013,7 @@ class VariableTypeNode extends TypeNode {
         this.dataType = (0, node_opcua_basic_types_1.decodeNodeId)(stream, this.dataType);
         this.valueRank = (0, node_opcua_basic_types_1.decodeInt32)(stream, this.valueRank);
         this.arrayDimensions = (0, node_opcua_basic_types_1.decodeArray)(stream, node_opcua_basic_types_1.decodeUInt32);
-        this.isAbstract = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.isAbstract);
+        this.isAbstract = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.isAbstract);
     }
     get schema() { return schemaVariableTypeNode; }
 }
@@ -25044,7 +25044,7 @@ const schemaViewAttributes = (0, node_opcua_factory_1.buildStructuredType)({
     fields: [
         {
             name: "containsNoLoops",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "eventNotifier",
@@ -25072,13 +25072,13 @@ class ViewAttributes extends NodeAttributes {
     static get schema() { return schemaViewAttributes; }
     encode(stream) {
         /* NEEDED */ super.encode(stream);
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.containsNoLoops, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.containsNoLoops, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.eventNotifier, stream);
     }
     decode(stream) {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.containsNoLoops = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.containsNoLoops);
+        this.containsNoLoops = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.containsNoLoops);
         this.eventNotifier = (0, node_opcua_basic_types_1.decodeByte)(stream, this.eventNotifier);
     }
     get schema() { return schemaViewAttributes; }
@@ -25119,7 +25119,7 @@ const schemaViewNode = (0, node_opcua_factory_1.buildStructuredType)({
         },
         {
             name: "containsNoLoops",
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "eventNotifier",
@@ -25168,7 +25168,7 @@ class ViewNode extends InstanceNode {
         (0, node_opcua_basic_types_1.encodeArray)(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         (0, node_opcua_basic_types_1.encodeArray)(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        (0, node_opcua_basic_types_1.encodeUABoolean)(this.containsNoLoops, stream);
+        (0, node_opcua_basic_types_1.encodeBoolean)(this.containsNoLoops, stream);
         (0, node_opcua_basic_types_1.encodeByte)(this.eventNotifier, stream);
     }
     decode(stream) {
@@ -25189,7 +25189,7 @@ class ViewNode extends InstanceNode {
             obj.decode(stream1);
             return obj;
         });
-        this.containsNoLoops = (0, node_opcua_basic_types_1.decodeUABoolean)(stream, this.containsNoLoops);
+        this.containsNoLoops = (0, node_opcua_basic_types_1.decodeBoolean)(stream, this.containsNoLoops);
         this.eventNotifier = (0, node_opcua_basic_types_1.decodeByte)(stream, this.eventNotifier);
     }
     get schema() { return schemaViewNode; }