node-opcua-types 2.72.2 → 2.73.0

package/source/_generated_opcua_types.ts

@@ -1,4 +1,4 @@
-// --------- 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
  */
@@ -92,7 +92,7 @@ const schemaEUInformation = buildStructuredType({
         {
             name: "namespaceUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "unitId",
@@ -158,7 +158,7 @@ export class EUInformation extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.namespaceUri, stream);
+        encodeString(this.namespaceUri, stream);
         encodeInt32(this.unitId, stream);
         encodeLocalizedText(this.displayName, stream);
         encodeLocalizedText(this.description, stream);
@@ -166,7 +166,7 @@ export class EUInformation extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaceUri = decodeUAString(stream, this.namespaceUri);
+        this.namespaceUri = decodeString(stream, this.namespaceUri);
         this.unitId = decodeInt32(stream, this.unitId);
         this.displayName = decodeLocalizedText(stream, this.displayName);
         this.description = decodeLocalizedText(stream, this.description);
@@ -566,7 +566,7 @@ const schemaRequestHeader = buildStructuredType({
         {
             name: "auditEntryId",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "timeoutHint",
@@ -646,7 +646,7 @@ export class RequestHeader extends ExtensionObject {
         encodeDateTime(this.timestamp, stream);
         encodeUInt32(this.requestHandle, stream);
         encodeUInt32(this.returnDiagnostics, stream);
-        encodeUAString(this.auditEntryId, stream);
+        encodeString(this.auditEntryId, stream);
         encodeUInt32(this.timeoutHint, stream);
         encodeExtensionObject(this.additionalHeader, stream);
     }
@@ -657,7 +657,7 @@ export class RequestHeader extends ExtensionObject {
         this.timestamp = decodeDateTime(stream, this.timestamp);
         this.requestHandle = decodeUInt32(stream, this.requestHandle);
         this.returnDiagnostics = decodeUInt32(stream, this.returnDiagnostics);
-        this.auditEntryId = decodeUAString(stream, this.auditEntryId);
+        this.auditEntryId = decodeString(stream, this.auditEntryId);
         this.timeoutHint = decodeUInt32(stream, this.timeoutHint);
         this.additionalHeader = decodeExtensionObject(stream, this.additionalHeader);
     }
@@ -677,7 +677,7 @@ const schemaSignatureData = buildStructuredType({
         {
             name: "algorithm",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "signature",
@@ -723,13 +723,13 @@ export class SignatureData extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.algorithm, stream);
+        encodeString(this.algorithm, stream);
         encodeByteString(this.signature, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.algorithm = decodeUAString(stream, this.algorithm);
+        this.algorithm = decodeString(stream, this.algorithm);
         this.signature = decodeByteString(stream, this.signature);
     }
     public get schema(): StructuredTypeSchema { return schemaSignatureData; }
@@ -835,7 +835,7 @@ const schemaActivateSessionRequest = buildStructuredType({
         {
             name: "localeIds",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -914,7 +914,7 @@ export class ActivateSessionRequest extends ExtensionObject {
         this.requestHeader.encode(stream);
         this.clientSignature.encode(stream);
         encodeArray(this.clientSoftwareCertificates, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeArray(this.localeIds, stream, encodeUAString);
+        encodeArray(this.localeIds, stream, encodeString);
         encodeExtensionObject(this.userIdentityToken, stream);
         this.userTokenSignature.encode(stream);
     }
@@ -928,7 +928,7 @@ export class ActivateSessionRequest extends ExtensionObject {
             obj.decode(stream1);
             return obj;
         });
-        this.localeIds = decodeArray(stream, decodeUAString);
+        this.localeIds = decodeArray(stream, decodeString);
         this.userIdentityToken = decodeExtensionObject(stream, this.userIdentityToken);
         this.userTokenSignature.decode(stream);
     }
@@ -968,7 +968,7 @@ const schemaResponseHeader = buildStructuredType({
         {
             name: "stringTable",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -1039,7 +1039,7 @@ export class ResponseHeader extends ExtensionObject {
         encodeUInt32(this.requestHandle, stream);
         encodeStatusCode(this.serviceResult, stream);
         encodeDiagnosticInfo(this.serviceDiagnostics, stream);
-        encodeArray(this.stringTable, stream, encodeUAString);
+        encodeArray(this.stringTable, stream, encodeString);
         encodeExtensionObject(this.additionalHeader, stream);
     }
     public decode(stream: BinaryStream): void {
@@ -1049,7 +1049,7 @@ export class ResponseHeader extends ExtensionObject {
         this.requestHandle = decodeUInt32(stream, this.requestHandle);
         this.serviceResult = decodeStatusCode(stream, this.serviceResult);
         this.serviceDiagnostics = decodeDiagnosticInfo(stream, this.serviceDiagnostics);
-        this.stringTable = decodeArray(stream, decodeUAString);
+        this.stringTable = decodeArray(stream, decodeString);
         this.additionalHeader = decodeExtensionObject(stream, this.additionalHeader);
     }
     public get schema(): StructuredTypeSchema { return schemaResponseHeader; }
@@ -1587,12 +1587,12 @@ const schemaAddReferencesItem = buildStructuredType({
         {
             name: "isForward",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "targetServerUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "targetNodeId",
@@ -1665,8 +1665,8 @@ export class AddReferencesItem extends ExtensionObject {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.sourceNodeId, stream);
         encodeNodeId(this.referenceTypeId, stream);
-        encodeUABoolean(this.isForward, stream);
-        encodeUAString(this.targetServerUri, stream);
+        encodeBoolean(this.isForward, stream);
+        encodeString(this.targetServerUri, stream);
         encodeExpandedNodeId(this.targetNodeId, stream);
         encodeNodeClass(this.targetNodeClass, stream);
     }
@@ -1675,8 +1675,8 @@ export class AddReferencesItem extends ExtensionObject {
         /* NEEDED !!! */ super.decode(stream);
         this.sourceNodeId = decodeNodeId(stream, this.sourceNodeId);
         this.referenceTypeId = decodeNodeId(stream, this.referenceTypeId);
-        this.isForward = decodeUABoolean(stream, this.isForward);
-        this.targetServerUri = decodeUAString(stream, this.targetServerUri);
+        this.isForward = decodeBoolean(stream, this.isForward);
+        this.targetServerUri = decodeString(stream, this.targetServerUri);
         this.targetNodeId = decodeExpandedNodeId(stream, this.targetNodeId);
         this.targetNodeClass = decodeNodeClass(stream, this.targetNodeClass);
     }
@@ -2011,12 +2011,12 @@ const schemaAggregateConfiguration = buildStructuredType({
         {
             name: "useServerCapabilitiesDefaults",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "treatUncertainAsBad",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "percentDataBad",
@@ -2031,7 +2031,7 @@ const schemaAggregateConfiguration = buildStructuredType({
         {
             name: "useSlopedExtrapolation",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -2087,20 +2087,20 @@ export class AggregateConfiguration extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.useServerCapabilitiesDefaults, stream);
-        encodeUABoolean(this.treatUncertainAsBad, stream);
+        encodeBoolean(this.useServerCapabilitiesDefaults, stream);
+        encodeBoolean(this.treatUncertainAsBad, stream);
         encodeByte(this.percentDataBad, stream);
         encodeByte(this.percentDataGood, stream);
-        encodeUABoolean(this.useSlopedExtrapolation, stream);
+        encodeBoolean(this.useSlopedExtrapolation, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.useServerCapabilitiesDefaults = decodeUABoolean(stream, this.useServerCapabilitiesDefaults);
-        this.treatUncertainAsBad = decodeUABoolean(stream, this.treatUncertainAsBad);
+        this.useServerCapabilitiesDefaults = decodeBoolean(stream, this.useServerCapabilitiesDefaults);
+        this.treatUncertainAsBad = decodeBoolean(stream, this.treatUncertainAsBad);
         this.percentDataBad = decodeByte(stream, this.percentDataBad);
         this.percentDataGood = decodeByte(stream, this.percentDataGood);
-        this.useSlopedExtrapolation = decodeUABoolean(stream, this.useSlopedExtrapolation);
+        this.useSlopedExtrapolation = decodeBoolean(stream, this.useSlopedExtrapolation);
     }
     public get schema(): StructuredTypeSchema { return schemaAggregateConfiguration; }
 }
@@ -2464,12 +2464,12 @@ const schemaAnnotation = buildStructuredType({
         {
             name: "message",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "userName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "annotationTime",
@@ -2520,15 +2520,15 @@ export class Annotation extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.message, stream);
-        encodeUAString(this.userName, stream);
+        encodeString(this.message, stream);
+        encodeString(this.userName, stream);
         encodeDateTime(this.annotationTime, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.message = decodeUAString(stream, this.message);
-        this.userName = decodeUAString(stream, this.userName);
+        this.message = decodeString(stream, this.message);
+        this.userName = decodeString(stream, this.userName);
         this.annotationTime = decodeDateTime(stream, this.annotationTime);
     }
     public get schema(): StructuredTypeSchema { return schemaAnnotation; }
@@ -2547,7 +2547,7 @@ const schemaUserIdentityToken = buildStructuredType({
         {
             name: "policyId",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -2583,12 +2583,12 @@ export class UserIdentityToken extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.policyId, stream);
+        encodeString(this.policyId, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.policyId = decodeUAString(stream, this.policyId);
+        this.policyId = decodeString(stream, this.policyId);
     }
     public get schema(): StructuredTypeSchema { return schemaUserIdentityToken; }
 }
@@ -2680,12 +2680,12 @@ const schemaApplicationDescription = buildStructuredType({
         {
             name: "applicationUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "productUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "applicationName",
@@ -2700,17 +2700,17 @@ const schemaApplicationDescription = buildStructuredType({
         {
             name: "gatewayServerUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "discoveryProfileUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "discoveryUrls",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -2777,24 +2777,24 @@ export class ApplicationDescription extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.applicationUri, stream);
-        encodeUAString(this.productUri, stream);
+        encodeString(this.applicationUri, stream);
+        encodeString(this.productUri, stream);
         encodeLocalizedText(this.applicationName, stream);
         encodeApplicationType(this.applicationType, stream);
-        encodeUAString(this.gatewayServerUri, stream);
-        encodeUAString(this.discoveryProfileUri, stream);
-        encodeArray(this.discoveryUrls, stream, encodeUAString);
+        encodeString(this.gatewayServerUri, stream);
+        encodeString(this.discoveryProfileUri, stream);
+        encodeArray(this.discoveryUrls, stream, encodeString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.applicationUri = decodeUAString(stream, this.applicationUri);
-        this.productUri = decodeUAString(stream, this.productUri);
+        this.applicationUri = decodeString(stream, this.applicationUri);
+        this.productUri = decodeString(stream, this.productUri);
         this.applicationName = decodeLocalizedText(stream, this.applicationName);
         this.applicationType = decodeApplicationType(stream, this.applicationType);
-        this.gatewayServerUri = decodeUAString(stream, this.gatewayServerUri);
-        this.discoveryProfileUri = decodeUAString(stream, this.discoveryProfileUri);
-        this.discoveryUrls = decodeArray(stream, decodeUAString);
+        this.gatewayServerUri = decodeString(stream, this.gatewayServerUri);
+        this.discoveryProfileUri = decodeString(stream, this.discoveryProfileUri);
+        this.discoveryUrls = decodeArray(stream, decodeString);
     }
 
     // Define Enumeration setters
@@ -2823,7 +2823,7 @@ const schemaArgument = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "dataType",
@@ -2900,7 +2900,7 @@ export class Argument extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
+        encodeString(this.name, stream);
         encodeNodeId(this.dataType, stream);
         encodeInt32(this.valueRank, stream);
         encodeArray(this.arrayDimensions, stream, encodeUInt32);
@@ -2909,7 +2909,7 @@ export class Argument extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
+        this.name = decodeString(stream, this.name);
         this.dataType = decodeNodeId(stream, this.dataType);
         this.valueRank = decodeInt32(stream, this.valueRank);
         this.arrayDimensions = decodeArray(stream, decodeUInt32);
@@ -2936,12 +2936,12 @@ const schemaRelativePathElement = buildStructuredType({
         {
             name: "isInverse",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "includeSubtypes",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "targetName",
@@ -2998,16 +2998,16 @@ export class RelativePathElement extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.referenceTypeId, stream);
-        encodeUABoolean(this.isInverse, stream);
-        encodeUABoolean(this.includeSubtypes, stream);
+        encodeBoolean(this.isInverse, stream);
+        encodeBoolean(this.includeSubtypes, stream);
         encodeQualifiedName(this.targetName, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.referenceTypeId = decodeNodeId(stream, this.referenceTypeId);
-        this.isInverse = decodeUABoolean(stream, this.isInverse);
-        this.includeSubtypes = decodeUABoolean(stream, this.includeSubtypes);
+        this.isInverse = decodeBoolean(stream, this.isInverse);
+        this.includeSubtypes = decodeBoolean(stream, this.includeSubtypes);
         this.targetName = decodeQualifiedName(stream, this.targetName);
     }
     public get schema(): StructuredTypeSchema { return schemaRelativePathElement; }
@@ -3099,7 +3099,7 @@ const schemaAttributeOperand = buildStructuredType({
         {
             name: "alias",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "browsePath",
@@ -3171,7 +3171,7 @@ export class AttributeOperand extends FilterOperand {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.nodeId, stream);
-        encodeUAString(this.alias, stream);
+        encodeString(this.alias, stream);
         this.browsePath.encode(stream);
         encodeUInt32(this.attributeId, stream);
         encodeNumericRange(this.indexRange, stream);
@@ -3180,7 +3180,7 @@ export class AttributeOperand extends FilterOperand {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.nodeId = decodeNodeId(stream, this.nodeId);
-        this.alias = decodeUAString(stream, this.alias);
+        this.alias = decodeString(stream, this.alias);
         this.browsePath.decode(stream);
         this.attributeId = decodeUInt32(stream, this.attributeId);
         this.indexRange = decodeNumericRange(stream, this.indexRange);
@@ -3249,12 +3249,12 @@ const schemaBrokerConnectionTransportDataType = buildStructuredType({
         {
             name: "resourceUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "authenticationProfileUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -3295,14 +3295,14 @@ export class BrokerConnectionTransportDataType extends ConnectionTransportDataTy
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.resourceUri, stream);
-        encodeUAString(this.authenticationProfileUri, stream);
+        encodeString(this.resourceUri, stream);
+        encodeString(this.authenticationProfileUri, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.resourceUri = decodeUAString(stream, this.resourceUri);
-        this.authenticationProfileUri = decodeUAString(stream, this.authenticationProfileUri);
+        this.resourceUri = decodeString(stream, this.resourceUri);
+        this.authenticationProfileUri = decodeString(stream, this.authenticationProfileUri);
     }
     public get schema(): StructuredTypeSchema { return schemaBrokerConnectionTransportDataType; }
 }
@@ -3395,17 +3395,17 @@ const schemaBrokerDataSetReaderTransportDataType = buildStructuredType({
         {
             name: "queueName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "resourceUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "authenticationProfileUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "requestedDeliveryGuarantee",
@@ -3415,7 +3415,7 @@ const schemaBrokerDataSetReaderTransportDataType = buildStructuredType({
         {
             name: "metaDataQueueName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -3471,20 +3471,20 @@ export class BrokerDataSetReaderTransportDataType extends DataSetReaderTransport
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.queueName, stream);
-        encodeUAString(this.resourceUri, stream);
-        encodeUAString(this.authenticationProfileUri, stream);
+        encodeString(this.queueName, stream);
+        encodeString(this.resourceUri, stream);
+        encodeString(this.authenticationProfileUri, stream);
         encodeBrokerTransportQualityOfService(this.requestedDeliveryGuarantee, stream);
-        encodeUAString(this.metaDataQueueName, stream);
+        encodeString(this.metaDataQueueName, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.queueName = decodeUAString(stream, this.queueName);
-        this.resourceUri = decodeUAString(stream, this.resourceUri);
-        this.authenticationProfileUri = decodeUAString(stream, this.authenticationProfileUri);
+        this.queueName = decodeString(stream, this.queueName);
+        this.resourceUri = decodeString(stream, this.resourceUri);
+        this.authenticationProfileUri = decodeString(stream, this.authenticationProfileUri);
         this.requestedDeliveryGuarantee = decodeBrokerTransportQualityOfService(stream, this.requestedDeliveryGuarantee);
-        this.metaDataQueueName = decodeUAString(stream, this.metaDataQueueName);
+        this.metaDataQueueName = decodeString(stream, this.metaDataQueueName);
     }
 
     // Define Enumeration setters
@@ -3561,17 +3561,17 @@ const schemaBrokerDataSetWriterTransportDataType = buildStructuredType({
         {
             name: "queueName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "resourceUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "authenticationProfileUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "requestedDeliveryGuarantee",
@@ -3581,7 +3581,7 @@ const schemaBrokerDataSetWriterTransportDataType = buildStructuredType({
         {
             name: "metaDataQueueName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "metaDataUpdateTime",
@@ -3647,21 +3647,21 @@ export class BrokerDataSetWriterTransportDataType extends DataSetWriterTransport
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.queueName, stream);
-        encodeUAString(this.resourceUri, stream);
-        encodeUAString(this.authenticationProfileUri, stream);
+        encodeString(this.queueName, stream);
+        encodeString(this.resourceUri, stream);
+        encodeString(this.authenticationProfileUri, stream);
         encodeBrokerTransportQualityOfService(this.requestedDeliveryGuarantee, stream);
-        encodeUAString(this.metaDataQueueName, stream);
+        encodeString(this.metaDataQueueName, stream);
         encodeDouble(this.metaDataUpdateTime, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.queueName = decodeUAString(stream, this.queueName);
-        this.resourceUri = decodeUAString(stream, this.resourceUri);
-        this.authenticationProfileUri = decodeUAString(stream, this.authenticationProfileUri);
+        this.queueName = decodeString(stream, this.queueName);
+        this.resourceUri = decodeString(stream, this.resourceUri);
+        this.authenticationProfileUri = decodeString(stream, this.authenticationProfileUri);
         this.requestedDeliveryGuarantee = decodeBrokerTransportQualityOfService(stream, this.requestedDeliveryGuarantee);
-        this.metaDataQueueName = decodeUAString(stream, this.metaDataQueueName);
+        this.metaDataQueueName = decodeString(stream, this.metaDataQueueName);
         this.metaDataUpdateTime = decodeDouble(stream, this.metaDataUpdateTime);
     }
 
@@ -3739,17 +3739,17 @@ const schemaBrokerWriterGroupTransportDataType = buildStructuredType({
         {
             name: "queueName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "resourceUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "authenticationProfileUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "requestedDeliveryGuarantee",
@@ -3805,17 +3805,17 @@ export class BrokerWriterGroupTransportDataType extends WriterGroupTransportData
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.queueName, stream);
-        encodeUAString(this.resourceUri, stream);
-        encodeUAString(this.authenticationProfileUri, stream);
+        encodeString(this.queueName, stream);
+        encodeString(this.resourceUri, stream);
+        encodeString(this.authenticationProfileUri, stream);
         encodeBrokerTransportQualityOfService(this.requestedDeliveryGuarantee, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.queueName = decodeUAString(stream, this.queueName);
-        this.resourceUri = decodeUAString(stream, this.resourceUri);
-        this.authenticationProfileUri = decodeUAString(stream, this.authenticationProfileUri);
+        this.queueName = decodeString(stream, this.queueName);
+        this.resourceUri = decodeString(stream, this.resourceUri);
+        this.authenticationProfileUri = decodeString(stream, this.authenticationProfileUri);
         this.requestedDeliveryGuarantee = decodeBrokerTransportQualityOfService(stream, this.requestedDeliveryGuarantee);
     }
 
@@ -3860,7 +3860,7 @@ const schemaBrowseDescription = buildStructuredType({
         {
             name: "includeSubtypes",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "nodeClassMask",
@@ -3934,7 +3934,7 @@ export class BrowseDescription extends ExtensionObject {
         encodeNodeId(this.nodeId, stream);
         encodeBrowseDirection(this.browseDirection, stream);
         encodeNodeId(this.referenceTypeId, stream);
-        encodeUABoolean(this.includeSubtypes, stream);
+        encodeBoolean(this.includeSubtypes, stream);
         encodeUInt32(this.nodeClassMask, stream);
         encodeUInt32(this.resultMask, stream);
     }
@@ -3944,7 +3944,7 @@ export class BrowseDescription extends ExtensionObject {
         this.nodeId = decodeNodeId(stream, this.nodeId);
         this.browseDirection = decodeBrowseDirection(stream, this.browseDirection);
         this.referenceTypeId = decodeNodeId(stream, this.referenceTypeId);
-        this.includeSubtypes = decodeUABoolean(stream, this.includeSubtypes);
+        this.includeSubtypes = decodeBoolean(stream, this.includeSubtypes);
         this.nodeClassMask = decodeUInt32(stream, this.nodeClassMask);
         this.resultMask = decodeUInt32(stream, this.resultMask);
     }
@@ -3980,7 +3980,7 @@ const schemaBrowseNextRequest = buildStructuredType({
         {
             name: "releaseContinuationPoints",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "continuationPoints",
@@ -4033,14 +4033,14 @@ export class BrowseNextRequest extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        encodeUABoolean(this.releaseContinuationPoints, stream);
+        encodeBoolean(this.releaseContinuationPoints, stream);
         encodeArray(this.continuationPoints, stream, encodeByteString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.releaseContinuationPoints = decodeUABoolean(stream, this.releaseContinuationPoints);
+        this.releaseContinuationPoints = decodeBoolean(stream, this.releaseContinuationPoints);
         this.continuationPoints = decodeArray(stream, decodeByteString);
     }
     public get schema(): StructuredTypeSchema { return schemaBrowseNextRequest; }
@@ -4064,7 +4064,7 @@ const schemaReferenceDescription = buildStructuredType({
         {
             name: "isForward",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "nodeId",
@@ -4156,7 +4156,7 @@ export class ReferenceDescription extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.referenceTypeId, stream);
-        encodeUABoolean(this.isForward, stream);
+        encodeBoolean(this.isForward, stream);
         encodeExpandedNodeId(this.nodeId, stream);
         encodeQualifiedName(this.browseName, stream);
         encodeLocalizedText(this.displayName, stream);
@@ -4167,7 +4167,7 @@ export class ReferenceDescription extends ExtensionObject {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.referenceTypeId = decodeNodeId(stream, this.referenceTypeId);
-        this.isForward = decodeUABoolean(stream, this.isForward);
+        this.isForward = decodeBoolean(stream, this.isForward);
         this.nodeId = decodeExpandedNodeId(stream, this.nodeId);
         this.browseName = decodeQualifiedName(stream, this.browseName);
         this.displayName = decodeLocalizedText(stream, this.displayName);
@@ -4888,27 +4888,27 @@ const schemaBuildInfo = buildStructuredType({
         {
             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",
@@ -4974,21 +4974,21 @@ export class BuildInfo extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.productUri, stream);
-        encodeUAString(this.manufacturerName, stream);
-        encodeUAString(this.productName, stream);
-        encodeUAString(this.softwareVersion, stream);
-        encodeUAString(this.buildNumber, stream);
+        encodeString(this.productUri, stream);
+        encodeString(this.manufacturerName, stream);
+        encodeString(this.productName, stream);
+        encodeString(this.softwareVersion, stream);
+        encodeString(this.buildNumber, stream);
         encodeDateTime(this.buildDate, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.productUri = decodeUAString(stream, this.productUri);
-        this.manufacturerName = decodeUAString(stream, this.manufacturerName);
-        this.productName = decodeUAString(stream, this.productName);
-        this.softwareVersion = decodeUAString(stream, this.softwareVersion);
-        this.buildNumber = decodeUAString(stream, this.buildNumber);
+        this.productUri = decodeString(stream, this.productUri);
+        this.manufacturerName = decodeString(stream, this.manufacturerName);
+        this.productName = decodeString(stream, this.productName);
+        this.softwareVersion = decodeString(stream, this.softwareVersion);
+        this.buildNumber = decodeString(stream, this.buildNumber);
         this.buildDate = decodeDateTime(stream, this.buildDate);
     }
     public get schema(): StructuredTypeSchema { return schemaBuildInfo; }
@@ -5770,7 +5770,7 @@ const schemaCloseSessionRequest = buildStructuredType({
         {
             name: "deleteSubscriptions",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -5812,13 +5812,13 @@ export class CloseSessionRequest extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        encodeUABoolean(this.deleteSubscriptions, stream);
+        encodeBoolean(this.deleteSubscriptions, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.deleteSubscriptions = decodeUABoolean(stream, this.deleteSubscriptions);
+        this.deleteSubscriptions = decodeBoolean(stream, this.deleteSubscriptions);
     }
     public get schema(): StructuredTypeSchema { return schemaCloseSessionRequest; }
 }
@@ -6534,7 +6534,7 @@ const schemaMonitoringParameters = buildStructuredType({
         {
             name: "discardOldest",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -6594,7 +6594,7 @@ export class MonitoringParameters extends ExtensionObject {
         encodeDouble(this.samplingInterval, stream);
         encodeExtensionObject(this.filter, stream);
         encodeUInt32(this.queueSize, stream);
-        encodeUABoolean(this.discardOldest, stream);
+        encodeBoolean(this.discardOldest, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
@@ -6603,7 +6603,7 @@ export class MonitoringParameters extends ExtensionObject {
         this.samplingInterval = decodeDouble(stream, this.samplingInterval);
         this.filter = decodeExtensionObject(stream, this.filter);
         this.queueSize = decodeUInt32(stream, this.queueSize);
-        this.discardOldest = decodeUABoolean(stream, this.discardOldest);
+        this.discardOldest = decodeBoolean(stream, this.discardOldest);
     }
     public get schema(): StructuredTypeSchema { return schemaMonitoringParameters; }
 }
@@ -7040,17 +7040,17 @@ const schemaCreateSessionRequest = buildStructuredType({
         {
             name: "serverUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "endpointUrl",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "sessionName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "clientNonce",
@@ -7148,9 +7148,9 @@ export class CreateSessionRequest extends ExtensionObject {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
         this.clientDescription.encode(stream);
-        encodeUAString(this.serverUri, stream);
-        encodeUAString(this.endpointUrl, stream);
-        encodeUAString(this.sessionName, stream);
+        encodeString(this.serverUri, stream);
+        encodeString(this.endpointUrl, stream);
+        encodeString(this.sessionName, stream);
         encodeByteString(this.clientNonce, stream);
         encodeByteString(this.clientCertificate, stream);
         encodeDouble(this.requestedSessionTimeout, stream);
@@ -7161,9 +7161,9 @@ export class CreateSessionRequest extends ExtensionObject {
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
         this.clientDescription.decode(stream);
-        this.serverUri = decodeUAString(stream, this.serverUri);
-        this.endpointUrl = decodeUAString(stream, this.endpointUrl);
-        this.sessionName = decodeUAString(stream, this.sessionName);
+        this.serverUri = decodeString(stream, this.serverUri);
+        this.endpointUrl = decodeString(stream, this.endpointUrl);
+        this.sessionName = decodeString(stream, this.sessionName);
         this.clientNonce = decodeByteString(stream, this.clientNonce);
         this.clientCertificate = decodeByteString(stream, this.clientCertificate);
         this.requestedSessionTimeout = decodeDouble(stream, this.requestedSessionTimeout);
@@ -7236,7 +7236,7 @@ const schemaUserTokenPolicy = buildStructuredType({
         {
             name: "policyId",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "tokenType",
@@ -7246,17 +7246,17 @@ const schemaUserTokenPolicy = buildStructuredType({
         {
             name: "issuedTokenType",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "issuerEndpointUrl",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityPolicyUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -7312,20 +7312,20 @@ export class UserTokenPolicy extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.policyId, stream);
+        encodeString(this.policyId, stream);
         encodeUserTokenType(this.tokenType, stream);
-        encodeUAString(this.issuedTokenType, stream);
-        encodeUAString(this.issuerEndpointUrl, stream);
-        encodeUAString(this.securityPolicyUri, stream);
+        encodeString(this.issuedTokenType, stream);
+        encodeString(this.issuerEndpointUrl, stream);
+        encodeString(this.securityPolicyUri, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.policyId = decodeUAString(stream, this.policyId);
+        this.policyId = decodeString(stream, this.policyId);
         this.tokenType = decodeUserTokenType(stream, this.tokenType);
-        this.issuedTokenType = decodeUAString(stream, this.issuedTokenType);
-        this.issuerEndpointUrl = decodeUAString(stream, this.issuerEndpointUrl);
-        this.securityPolicyUri = decodeUAString(stream, this.securityPolicyUri);
+        this.issuedTokenType = decodeString(stream, this.issuedTokenType);
+        this.issuerEndpointUrl = decodeString(stream, this.issuerEndpointUrl);
+        this.securityPolicyUri = decodeString(stream, this.securityPolicyUri);
     }
 
     // Define Enumeration setters
@@ -7354,7 +7354,7 @@ const schemaEndpointDescription = buildStructuredType({
         {
             name: "endpointUrl",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "server",
@@ -7374,7 +7374,7 @@ const schemaEndpointDescription = buildStructuredType({
         {
             name: "securityPolicyUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "userIdentityTokens",
@@ -7385,7 +7385,7 @@ const schemaEndpointDescription = buildStructuredType({
         {
             name: "transportProfileUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityLevel",
@@ -7465,29 +7465,29 @@ export class EndpointDescription extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.endpointUrl, stream);
+        encodeString(this.endpointUrl, stream);
         this.server.encode(stream);
         encodeByteString(this.serverCertificate, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        encodeUAString(this.securityPolicyUri, stream);
+        encodeString(this.securityPolicyUri, stream);
         encodeArray(this.userIdentityTokens, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeUAString(this.transportProfileUri, stream);
+        encodeString(this.transportProfileUri, stream);
         encodeByte(this.securityLevel, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.endpointUrl = decodeUAString(stream, this.endpointUrl);
+        this.endpointUrl = decodeString(stream, this.endpointUrl);
         this.server.decode(stream);
         this.serverCertificate = decodeByteString(stream, this.serverCertificate);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityPolicyUri = decodeUAString(stream, this.securityPolicyUri);
+        this.securityPolicyUri = decodeString(stream, this.securityPolicyUri);
         this.userIdentityTokens = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new UserTokenPolicy(null);
             obj.decode(stream1);
             return obj;
         });
-        this.transportProfileUri = decodeUAString(stream, this.transportProfileUri);
+        this.transportProfileUri = decodeString(stream, this.transportProfileUri);
         this.securityLevel = decodeByte(stream, this.securityLevel);
     }
 
@@ -7727,7 +7727,7 @@ const schemaCreateSubscriptionRequest = buildStructuredType({
         {
             name: "publishingEnabled",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "priority",
@@ -7803,7 +7803,7 @@ export class CreateSubscriptionRequest extends ExtensionObject {
         encodeUInt32(this.requestedLifetimeCount, stream);
         encodeUInt32(this.requestedMaxKeepAliveCount, stream);
         encodeUInt32(this.maxNotificationsPerPublish, stream);
-        encodeUABoolean(this.publishingEnabled, stream);
+        encodeBoolean(this.publishingEnabled, stream);
         encodeByte(this.priority, stream);
     }
     public decode(stream: BinaryStream): void {
@@ -7814,7 +7814,7 @@ export class CreateSubscriptionRequest extends ExtensionObject {
         this.requestedLifetimeCount = decodeUInt32(stream, this.requestedLifetimeCount);
         this.requestedMaxKeepAliveCount = decodeUInt32(stream, this.requestedMaxKeepAliveCount);
         this.maxNotificationsPerPublish = decodeUInt32(stream, this.maxNotificationsPerPublish);
-        this.publishingEnabled = decodeUABoolean(stream, this.publishingEnabled);
+        this.publishingEnabled = decodeBoolean(stream, this.publishingEnabled);
         this.priority = decodeByte(stream, this.priority);
     }
     public get schema(): StructuredTypeSchema { return schemaCreateSubscriptionRequest; }
@@ -7950,7 +7950,7 @@ const schemaCurrencyUnitType = buildStructuredType({
         {
             name: "alphabeticCode",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "currency",
@@ -8008,7 +8008,7 @@ export class CurrencyUnitType extends ExtensionObject {
         /* NEEDED */ super.encode(stream);
         encodeInt16(this.numericCode, stream);
         encodeSByte(this.exponent, stream);
-        encodeUAString(this.alphabeticCode, stream);
+        encodeString(this.alphabeticCode, stream);
         encodeLocalizedText(this.currency, stream);
     }
     public decode(stream: BinaryStream): void {
@@ -8016,7 +8016,7 @@ export class CurrencyUnitType extends ExtensionObject {
         /* NEEDED !!! */ super.decode(stream);
         this.numericCode = decodeInt16(stream, this.numericCode);
         this.exponent = decodeSByte(stream, this.exponent);
-        this.alphabeticCode = decodeUAString(stream, this.alphabeticCode);
+        this.alphabeticCode = decodeString(stream, this.alphabeticCode);
         this.currency = decodeLocalizedText(stream, this.currency);
     }
     public get schema(): StructuredTypeSchema { return schemaCurrencyUnitType; }
@@ -8500,7 +8500,7 @@ const schemaStructureField = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "description",
@@ -8531,7 +8531,7 @@ const schemaStructureField = buildStructuredType({
         {
             name: "isOptional",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -8597,24 +8597,24 @@ export class StructureField extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
+        encodeString(this.name, stream);
         encodeLocalizedText(this.description, stream);
         encodeNodeId(this.dataType, stream);
         encodeInt32(this.valueRank, stream);
         encodeArray(this.arrayDimensions, stream, encodeUInt32);
         encodeUInt32(this.maxStringLength, stream);
-        encodeUABoolean(this.isOptional, stream);
+        encodeBoolean(this.isOptional, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
+        this.name = decodeString(stream, this.name);
         this.description = decodeLocalizedText(stream, this.description);
         this.dataType = decodeNodeId(stream, this.dataType);
         this.valueRank = decodeInt32(stream, this.valueRank);
         this.arrayDimensions = decodeArray(stream, decodeUInt32);
         this.maxStringLength = decodeUInt32(stream, this.maxStringLength);
-        this.isOptional = decodeUABoolean(stream, this.isOptional);
+        this.isOptional = decodeBoolean(stream, this.isOptional);
     }
     public get schema(): StructuredTypeSchema { return schemaStructureField; }
 }
@@ -8889,7 +8889,7 @@ const schemaEnumField = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -8925,12 +8925,12 @@ export class EnumField extends EnumValueType {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
+        encodeString(this.name, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
+        this.name = decodeString(stream, this.name);
     }
     public get schema(): StructuredTypeSchema { return schemaEnumField; }
 }
@@ -9158,7 +9158,7 @@ const schemaDataTypeSchemaHeader = buildStructuredType({
         {
             name: "namespaces",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -9240,7 +9240,7 @@ export class DataTypeSchemaHeader extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeArray(this.namespaces, stream, encodeUAString);
+        encodeArray(this.namespaces, stream, encodeString);
         encodeArray(this.structureDataTypes, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.enumDataTypes, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.simpleDataTypes, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -9248,7 +9248,7 @@ export class DataTypeSchemaHeader extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaces = decodeArray(stream, decodeUAString);
+        this.namespaces = decodeArray(stream, decodeString);
         this.structureDataTypes = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new StructureDescription(null);
             obj.decode(stream1);
@@ -9305,7 +9305,7 @@ const schemaFieldMetaData = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "description",
@@ -9437,7 +9437,7 @@ export class FieldMetaData extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
+        encodeString(this.name, stream);
         encodeLocalizedText(this.description, stream);
         encodeDataSetFieldFlags(this.fieldFlags, stream);
         encodeByte(this.builtInType, stream);
@@ -9451,7 +9451,7 @@ export class FieldMetaData extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
+        this.name = decodeString(stream, this.name);
         this.description = decodeLocalizedText(stream, this.description);
         this.fieldFlags = decodeDataSetFieldFlags(stream, this.fieldFlags);
         this.builtInType = decodeByte(stream, this.builtInType);
@@ -9493,7 +9493,7 @@ const schemaDataSetMetaDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "description",
@@ -9574,7 +9574,7 @@ export class DataSetMetaDataType extends DataTypeSchemaHeader {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
+        encodeString(this.name, stream);
         encodeLocalizedText(this.description, stream);
         encodeArray(this.fields, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeGuid(this.dataSetClassId, stream);
@@ -9583,7 +9583,7 @@ export class DataSetMetaDataType extends DataTypeSchemaHeader {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
+        this.name = decodeString(stream, this.name);
         this.description = decodeLocalizedText(stream, this.description);
         this.fields = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new FieldMetaData(null);
@@ -9633,12 +9633,12 @@ const schemaDataSetReaderDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "enabled",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "publisherId",
@@ -9678,7 +9678,7 @@ const schemaDataSetReaderDataType = buildStructuredType({
         {
             name: "headerLayoutUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityMode",
@@ -9688,7 +9688,7 @@ const schemaDataSetReaderDataType = buildStructuredType({
         {
             name: "securityGroupId",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityKeyServices",
@@ -9839,8 +9839,8 @@ export class DataSetReaderDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
-        encodeUABoolean(this.enabled, stream);
+        encodeString(this.name, stream);
+        encodeBoolean(this.enabled, stream);
         encodeVariant(this.publisherId, stream);
         encodeUInt16(this.writerGroupId, stream);
         encodeUInt16(this.dataSetWriterId, stream);
@@ -9848,9 +9848,9 @@ export class DataSetReaderDataType extends ExtensionObject {
         encodeDataSetFieldContentMask(this.dataSetFieldContentMask, stream);
         encodeDouble(this.messageReceiveTimeout, stream);
         encodeUInt32(this.keyFrameCount, stream);
-        encodeUAString(this.headerLayoutUri, stream);
+        encodeString(this.headerLayoutUri, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        encodeUAString(this.securityGroupId, stream);
+        encodeString(this.securityGroupId, stream);
         encodeArray(this.securityKeyServices, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.dataSetReaderProperties, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeExtensionObject(this.transportSettings, stream);
@@ -9860,8 +9860,8 @@ export class DataSetReaderDataType extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
-        this.enabled = decodeUABoolean(stream, this.enabled);
+        this.name = decodeString(stream, this.name);
+        this.enabled = decodeBoolean(stream, this.enabled);
         this.publisherId = decodeVariant(stream, this.publisherId);
         this.writerGroupId = decodeUInt16(stream, this.writerGroupId);
         this.dataSetWriterId = decodeUInt16(stream, this.dataSetWriterId);
@@ -9869,9 +9869,9 @@ export class DataSetReaderDataType extends ExtensionObject {
         this.dataSetFieldContentMask = decodeDataSetFieldContentMask(stream, this.dataSetFieldContentMask);
         this.messageReceiveTimeout = decodeDouble(stream, this.messageReceiveTimeout);
         this.keyFrameCount = decodeUInt32(stream, this.keyFrameCount);
-        this.headerLayoutUri = decodeUAString(stream, this.headerLayoutUri);
+        this.headerLayoutUri = decodeString(stream, this.headerLayoutUri);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityGroupId = decodeUAString(stream, this.securityGroupId);
+        this.securityGroupId = decodeString(stream, this.securityGroupId);
         this.securityKeyServices = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new EndpointDescription(null);
             obj.decode(stream1);
@@ -9970,12 +9970,12 @@ const schemaDataSetWriterDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "enabled",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "dataSetWriterId",
@@ -9995,7 +9995,7 @@ const schemaDataSetWriterDataType = buildStructuredType({
         {
             name: "dataSetName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "dataSetWriterProperties",
@@ -10091,12 +10091,12 @@ export class DataSetWriterDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
-        encodeUABoolean(this.enabled, stream);
+        encodeString(this.name, stream);
+        encodeBoolean(this.enabled, stream);
         encodeUInt16(this.dataSetWriterId, stream);
         encodeDataSetFieldContentMask(this.dataSetFieldContentMask, stream);
         encodeUInt32(this.keyFrameCount, stream);
-        encodeUAString(this.dataSetName, stream);
+        encodeString(this.dataSetName, stream);
         encodeArray(this.dataSetWriterProperties, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeExtensionObject(this.transportSettings, stream);
         encodeExtensionObject(this.messageSettings, stream);
@@ -10104,12 +10104,12 @@ export class DataSetWriterDataType extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
-        this.enabled = decodeUABoolean(stream, this.enabled);
+        this.name = decodeString(stream, this.name);
+        this.enabled = decodeBoolean(stream, this.enabled);
         this.dataSetWriterId = decodeUInt16(stream, this.dataSetWriterId);
         this.dataSetFieldContentMask = decodeDataSetFieldContentMask(stream, this.dataSetFieldContentMask);
         this.keyFrameCount = decodeUInt32(stream, this.keyFrameCount);
-        this.dataSetName = decodeUAString(stream, this.dataSetName);
+        this.dataSetName = decodeString(stream, this.dataSetName);
         this.dataSetWriterProperties = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new KeyValuePair(null);
             obj.decode(stream1);
@@ -10300,7 +10300,7 @@ const schemaDataTypeAttributes = buildStructuredType({
         {
             name: "isAbstract",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -10336,12 +10336,12 @@ export class DataTypeAttributes extends NodeAttributes {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.isAbstract, stream);
+        encodeBoolean(this.isAbstract, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isAbstract = decodeUABoolean(stream, this.isAbstract);
+        this.isAbstract = decodeBoolean(stream, this.isAbstract);
     }
     public get schema(): StructuredTypeSchema { return schemaDataTypeAttributes; }
 }
@@ -10481,7 +10481,7 @@ const schemaReferenceNode = buildStructuredType({
         {
             name: "isInverse",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "targetId",
@@ -10533,14 +10533,14 @@ export class ReferenceNode extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.referenceTypeId, stream);
-        encodeUABoolean(this.isInverse, stream);
+        encodeBoolean(this.isInverse, stream);
         encodeExpandedNodeId(this.targetId, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.referenceTypeId = decodeNodeId(stream, this.referenceTypeId);
-        this.isInverse = decodeUABoolean(stream, this.isInverse);
+        this.isInverse = decodeBoolean(stream, this.isInverse);
         this.targetId = decodeExpandedNodeId(stream, this.targetId);
     }
     public get schema(): StructuredTypeSchema { return schemaReferenceNode; }
@@ -10842,7 +10842,7 @@ const schemaDataTypeNode = buildStructuredType({
         {
             name: "isAbstract",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "dataTypeDefinition",
@@ -10918,7 +10918,7 @@ export class DataTypeNode extends TypeNode {
         encodeArray(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeUABoolean(this.isAbstract, stream);
+        encodeBoolean(this.isAbstract, stream);
         encodeExtensionObject(this.dataTypeDefinition, stream);
     }
     public decode(stream: BinaryStream): void {
@@ -10939,7 +10939,7 @@ export class DataTypeNode extends TypeNode {
             obj.decode(stream1);
             return obj;
         });
-        this.isAbstract = decodeUABoolean(stream, this.isAbstract);
+        this.isAbstract = decodeBoolean(stream, this.isAbstract);
         this.dataTypeDefinition = decodeExtensionObject(stream, this.dataTypeDefinition);
     }
     public get schema(): StructuredTypeSchema { return schemaDataTypeNode; }
@@ -11027,7 +11027,7 @@ const schemaDatagramConnectionTransport2DataType = buildStructuredType({
         {
             name: "qosCategory",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "datagramQos",
@@ -11086,7 +11086,7 @@ export class DatagramConnectionTransport2DataType extends DatagramConnectionTran
         /* NEEDED */ super.encode(stream);
         encodeUInt32(this.discoveryAnnounceRate, stream);
         encodeUInt32(this.discoveryMaxMessageSize, stream);
-        encodeUAString(this.qosCategory, stream);
+        encodeString(this.qosCategory, stream);
         encodeArray(this.datagramQos, stream, encodeExtensionObject);
     }
     public decode(stream: BinaryStream): void {
@@ -11094,7 +11094,7 @@ export class DatagramConnectionTransport2DataType extends DatagramConnectionTran
         /* NEEDED !!! */ super.decode(stream);
         this.discoveryAnnounceRate = decodeUInt32(stream, this.discoveryAnnounceRate);
         this.discoveryMaxMessageSize = decodeUInt32(stream, this.discoveryMaxMessageSize);
-        this.qosCategory = decodeUAString(stream, this.qosCategory);
+        this.qosCategory = decodeString(stream, this.qosCategory);
         this.datagramQos = decodeArray(stream, decodeExtensionObject);
     }
     public get schema(): StructuredTypeSchema { return schemaDatagramConnectionTransport2DataType; }
@@ -11118,7 +11118,7 @@ const schemaDatagramDataSetReaderTransportDataType = buildStructuredType({
         {
             name: "qosCategory",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "datagramQos",
@@ -11129,7 +11129,7 @@ const schemaDatagramDataSetReaderTransportDataType = buildStructuredType({
         {
             name: "topic",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -11181,17 +11181,17 @@ export class DatagramDataSetReaderTransportDataType extends DataSetReaderTranspo
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeExtensionObject(this.address, stream);
-        encodeUAString(this.qosCategory, stream);
+        encodeString(this.qosCategory, stream);
         encodeArray(this.datagramQos, stream, encodeExtensionObject);
-        encodeUAString(this.topic, stream);
+        encodeString(this.topic, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.address = decodeExtensionObject(stream, this.address);
-        this.qosCategory = decodeUAString(stream, this.qosCategory);
+        this.qosCategory = decodeString(stream, this.qosCategory);
         this.datagramQos = decodeArray(stream, decodeExtensionObject);
-        this.topic = decodeUAString(stream, this.topic);
+        this.topic = decodeString(stream, this.topic);
     }
     public get schema(): StructuredTypeSchema { return schemaDatagramDataSetReaderTransportDataType; }
 }
@@ -11285,7 +11285,7 @@ const schemaDatagramWriterGroupTransport2DataType = buildStructuredType({
         {
             name: "qosCategory",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "datagramQos",
@@ -11301,7 +11301,7 @@ const schemaDatagramWriterGroupTransport2DataType = buildStructuredType({
         {
             name: "topic",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -11358,19 +11358,19 @@ export class DatagramWriterGroupTransport2DataType extends DatagramWriterGroupTr
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeExtensionObject(this.address, stream);
-        encodeUAString(this.qosCategory, stream);
+        encodeString(this.qosCategory, stream);
         encodeArray(this.datagramQos, stream, encodeExtensionObject);
         encodeUInt32(this.discoveryAnnounceRate, stream);
-        encodeUAString(this.topic, stream);
+        encodeString(this.topic, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.address = decodeExtensionObject(stream, this.address);
-        this.qosCategory = decodeUAString(stream, this.qosCategory);
+        this.qosCategory = decodeString(stream, this.qosCategory);
         this.datagramQos = decodeArray(stream, decodeExtensionObject);
         this.discoveryAnnounceRate = decodeUInt32(stream, this.discoveryAnnounceRate);
-        this.topic = decodeUAString(stream, this.topic);
+        this.topic = decodeString(stream, this.topic);
     }
     public get schema(): StructuredTypeSchema { return schemaDatagramWriterGroupTransport2DataType; }
 }
@@ -11812,7 +11812,7 @@ const schemaDeleteNodesItem = buildStructuredType({
         {
             name: "deleteTargetReferences",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -11854,13 +11854,13 @@ export class DeleteNodesItem extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.nodeId, stream);
-        encodeUABoolean(this.deleteTargetReferences, stream);
+        encodeBoolean(this.deleteTargetReferences, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.nodeId = decodeNodeId(stream, this.nodeId);
-        this.deleteTargetReferences = decodeUABoolean(stream, this.deleteTargetReferences);
+        this.deleteTargetReferences = decodeBoolean(stream, this.deleteTargetReferences);
     }
     public get schema(): StructuredTypeSchema { return schemaDeleteNodesItem; }
 }
@@ -12043,7 +12043,7 @@ const schemaDeleteRawModifiedDetails = buildStructuredType({
         {
             name: "isDeleteModified",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "startTime",
@@ -12099,14 +12099,14 @@ export class DeleteRawModifiedDetails extends HistoryUpdateDetails {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.isDeleteModified, stream);
+        encodeBoolean(this.isDeleteModified, stream);
         encodeDateTime(this.startTime, stream);
         encodeDateTime(this.endTime, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isDeleteModified = decodeUABoolean(stream, this.isDeleteModified);
+        this.isDeleteModified = decodeBoolean(stream, this.isDeleteModified);
         this.startTime = decodeDateTime(stream, this.startTime);
         this.endTime = decodeDateTime(stream, this.endTime);
     }
@@ -12136,7 +12136,7 @@ const schemaDeleteReferencesItem = buildStructuredType({
         {
             name: "isForward",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "targetNodeId",
@@ -12146,7 +12146,7 @@ const schemaDeleteReferencesItem = buildStructuredType({
         {
             name: "deleteBidirectional",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -12204,18 +12204,18 @@ export class DeleteReferencesItem extends ExtensionObject {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.sourceNodeId, stream);
         encodeNodeId(this.referenceTypeId, stream);
-        encodeUABoolean(this.isForward, stream);
+        encodeBoolean(this.isForward, stream);
         encodeExpandedNodeId(this.targetNodeId, stream);
-        encodeUABoolean(this.deleteBidirectional, stream);
+        encodeBoolean(this.deleteBidirectional, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.sourceNodeId = decodeNodeId(stream, this.sourceNodeId);
         this.referenceTypeId = decodeNodeId(stream, this.referenceTypeId);
-        this.isForward = decodeUABoolean(stream, this.isForward);
+        this.isForward = decodeBoolean(stream, this.isForward);
         this.targetNodeId = decodeExpandedNodeId(stream, this.targetNodeId);
-        this.deleteBidirectional = decodeUABoolean(stream, this.deleteBidirectional);
+        this.deleteBidirectional = decodeBoolean(stream, this.deleteBidirectional);
     }
     public get schema(): StructuredTypeSchema { return schemaDeleteReferencesItem; }
 }
@@ -12738,7 +12738,7 @@ const schemaEndpointConfiguration = buildStructuredType({
         {
             name: "useBinaryEncoding",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "maxStringLength",
@@ -12850,7 +12850,7 @@ export class EndpointConfiguration extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeInt32(this.operationTimeout, stream);
-        encodeUABoolean(this.useBinaryEncoding, stream);
+        encodeBoolean(this.useBinaryEncoding, stream);
         encodeInt32(this.maxStringLength, stream);
         encodeInt32(this.maxByteStringLength, stream);
         encodeInt32(this.maxArrayLength, stream);
@@ -12863,7 +12863,7 @@ export class EndpointConfiguration extends ExtensionObject {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.operationTimeout = decodeInt32(stream, this.operationTimeout);
-        this.useBinaryEncoding = decodeUABoolean(stream, this.useBinaryEncoding);
+        this.useBinaryEncoding = decodeBoolean(stream, this.useBinaryEncoding);
         this.maxStringLength = decodeInt32(stream, this.maxStringLength);
         this.maxByteStringLength = decodeInt32(stream, this.maxByteStringLength);
         this.maxArrayLength = decodeInt32(stream, this.maxArrayLength);
@@ -12888,7 +12888,7 @@ const schemaEndpointType = buildStructuredType({
         {
             name: "endpointUrl",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityMode",
@@ -12898,12 +12898,12 @@ const schemaEndpointType = buildStructuredType({
         {
             name: "securityPolicyUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "transportProfileUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -12954,18 +12954,18 @@ export class EndpointType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.endpointUrl, stream);
+        encodeString(this.endpointUrl, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        encodeUAString(this.securityPolicyUri, stream);
-        encodeUAString(this.transportProfileUri, stream);
+        encodeString(this.securityPolicyUri, stream);
+        encodeString(this.transportProfileUri, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.endpointUrl = decodeUAString(stream, this.endpointUrl);
+        this.endpointUrl = decodeString(stream, this.endpointUrl);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityPolicyUri = decodeUAString(stream, this.securityPolicyUri);
-        this.transportProfileUri = decodeUAString(stream, this.transportProfileUri);
+        this.securityPolicyUri = decodeString(stream, this.securityPolicyUri);
+        this.transportProfileUri = decodeString(stream, this.transportProfileUri);
     }
 
     // Define Enumeration setters
@@ -12994,7 +12994,7 @@ const schemaEndpointUrlListDataType = buildStructuredType({
         {
             name: "endpointUrlList",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -13031,12 +13031,12 @@ export class EndpointUrlListDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeArray(this.endpointUrlList, stream, encodeUAString);
+        encodeArray(this.endpointUrlList, stream, encodeString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.endpointUrlList = decodeArray(stream, decodeUAString);
+        this.endpointUrlList = decodeArray(stream, decodeString);
     }
     public get schema(): StructuredTypeSchema { return schemaEndpointUrlListDataType; }
 }
@@ -13460,7 +13460,7 @@ const schemaFieldTargetDataType = buildStructuredType({
         {
             name: "receiverIndexRange",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "targetNodeId",
@@ -13475,7 +13475,7 @@ const schemaFieldTargetDataType = buildStructuredType({
         {
             name: "writeIndexRange",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "overrideValueHandling",
@@ -13552,10 +13552,10 @@ export class FieldTargetDataType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeGuid(this.dataSetFieldId, stream);
-        encodeUAString(this.receiverIndexRange, stream);
+        encodeString(this.receiverIndexRange, stream);
         encodeNodeId(this.targetNodeId, stream);
         encodeUInt32(this.attributeId, stream);
-        encodeUAString(this.writeIndexRange, stream);
+        encodeString(this.writeIndexRange, stream);
         encodeOverrideValueHandling(this.overrideValueHandling, stream);
         encodeVariant(this.overrideValue, stream);
     }
@@ -13563,10 +13563,10 @@ export class FieldTargetDataType extends ExtensionObject {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.dataSetFieldId = decodeGuid(stream, this.dataSetFieldId);
-        this.receiverIndexRange = decodeUAString(stream, this.receiverIndexRange);
+        this.receiverIndexRange = decodeString(stream, this.receiverIndexRange);
         this.targetNodeId = decodeNodeId(stream, this.targetNodeId);
         this.attributeId = decodeUInt32(stream, this.attributeId);
-        this.writeIndexRange = decodeUAString(stream, this.writeIndexRange);
+        this.writeIndexRange = decodeString(stream, this.writeIndexRange);
         this.overrideValueHandling = decodeOverrideValueHandling(stream, this.overrideValueHandling);
         this.overrideValue = decodeVariant(stream, this.overrideValue);
     }
@@ -13612,7 +13612,7 @@ const schemaFindServersOnNetworkRequest = buildStructuredType({
         {
             name: "serverCapabilityFilter",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -13667,7 +13667,7 @@ export class FindServersOnNetworkRequest extends ExtensionObject {
         this.requestHeader.encode(stream);
         encodeUInt32(this.startingRecordId, stream);
         encodeUInt32(this.maxRecordsToReturn, stream);
-        encodeArray(this.serverCapabilityFilter, stream, encodeUAString);
+        encodeArray(this.serverCapabilityFilter, stream, encodeString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
@@ -13675,7 +13675,7 @@ export class FindServersOnNetworkRequest extends ExtensionObject {
         this.requestHeader.decode(stream);
         this.startingRecordId = decodeUInt32(stream, this.startingRecordId);
         this.maxRecordsToReturn = decodeUInt32(stream, this.maxRecordsToReturn);
-        this.serverCapabilityFilter = decodeArray(stream, decodeUAString);
+        this.serverCapabilityFilter = decodeArray(stream, decodeString);
     }
     public get schema(): StructuredTypeSchema { return schemaFindServersOnNetworkRequest; }
 }
@@ -13698,17 +13698,17 @@ const schemaServerOnNetwork = buildStructuredType({
         {
             name: "serverName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "discoveryUrl",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "serverCapabilities",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -13761,17 +13761,17 @@ export class ServerOnNetwork extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeUInt32(this.recordId, stream);
-        encodeUAString(this.serverName, stream);
-        encodeUAString(this.discoveryUrl, stream);
-        encodeArray(this.serverCapabilities, stream, encodeUAString);
+        encodeString(this.serverName, stream);
+        encodeString(this.discoveryUrl, stream);
+        encodeArray(this.serverCapabilities, stream, encodeString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.recordId = decodeUInt32(stream, this.recordId);
-        this.serverName = decodeUAString(stream, this.serverName);
-        this.discoveryUrl = decodeUAString(stream, this.discoveryUrl);
-        this.serverCapabilities = decodeArray(stream, decodeUAString);
+        this.serverName = decodeString(stream, this.serverName);
+        this.discoveryUrl = decodeString(stream, this.discoveryUrl);
+        this.serverCapabilities = decodeArray(stream, decodeString);
     }
     public get schema(): StructuredTypeSchema { return schemaServerOnNetwork; }
 }
@@ -13886,18 +13886,18 @@ const schemaFindServersRequest = buildStructuredType({
         {
             name: "endpointUrl",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "localeIds",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "serverUris",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -13950,17 +13950,17 @@ export class FindServersRequest extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        encodeUAString(this.endpointUrl, stream);
-        encodeArray(this.localeIds, stream, encodeUAString);
-        encodeArray(this.serverUris, stream, encodeUAString);
+        encodeString(this.endpointUrl, stream);
+        encodeArray(this.localeIds, stream, encodeString);
+        encodeArray(this.serverUris, stream, encodeString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.endpointUrl = decodeUAString(stream, this.endpointUrl);
-        this.localeIds = decodeArray(stream, decodeUAString);
-        this.serverUris = decodeArray(stream, decodeUAString);
+        this.endpointUrl = decodeString(stream, this.endpointUrl);
+        this.localeIds = decodeArray(stream, decodeString);
+        this.serverUris = decodeArray(stream, decodeString);
     }
     public get schema(): StructuredTypeSchema { return schemaFindServersRequest; }
 }
@@ -14250,18 +14250,18 @@ const schemaGetEndpointsRequest = buildStructuredType({
         {
             name: "endpointUrl",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "localeIds",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "profileUris",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -14314,17 +14314,17 @@ export class GetEndpointsRequest extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        encodeUAString(this.endpointUrl, stream);
-        encodeArray(this.localeIds, stream, encodeUAString);
-        encodeArray(this.profileUris, stream, encodeUAString);
+        encodeString(this.endpointUrl, stream);
+        encodeArray(this.localeIds, stream, encodeString);
+        encodeArray(this.profileUris, stream, encodeString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.endpointUrl = decodeUAString(stream, this.endpointUrl);
-        this.localeIds = decodeArray(stream, decodeUAString);
-        this.profileUris = decodeArray(stream, decodeUAString);
+        this.endpointUrl = decodeString(stream, this.endpointUrl);
+        this.localeIds = decodeArray(stream, decodeString);
+        this.profileUris = decodeArray(stream, decodeString);
     }
     public get schema(): StructuredTypeSchema { return schemaGetEndpointsRequest; }
 }
@@ -14646,7 +14646,7 @@ const schemaModificationInfo = buildStructuredType({
         {
             name: "userName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -14694,14 +14694,14 @@ export class ModificationInfo extends ExtensionObject {
         /* NEEDED */ super.encode(stream);
         encodeDateTime(this.modificationTime, stream);
         encodeHistoryUpdateType(this.updateType, stream);
-        encodeUAString(this.userName, stream);
+        encodeString(this.userName, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.modificationTime = decodeDateTime(stream, this.modificationTime);
         this.updateType = decodeHistoryUpdateType(stream, this.updateType);
-        this.userName = decodeUAString(stream, this.userName);
+        this.userName = decodeString(stream, this.userName);
     }
 
     // Define Enumeration setters
@@ -14956,7 +14956,7 @@ const schemaHistoryReadRequest = buildStructuredType({
         {
             name: "releaseContinuationPoints",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "nodesToRead",
@@ -15025,7 +15025,7 @@ export class HistoryReadRequest extends ExtensionObject {
         this.requestHeader.encode(stream);
         encodeExtensionObject(this.historyReadDetails, stream);
         encodeTimestampsToReturn(this.timestampsToReturn, stream);
-        encodeUABoolean(this.releaseContinuationPoints, stream);
+        encodeBoolean(this.releaseContinuationPoints, stream);
         encodeArray(this.nodesToRead, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     public decode(stream: BinaryStream): void {
@@ -15034,7 +15034,7 @@ export class HistoryReadRequest extends ExtensionObject {
         this.requestHeader.decode(stream);
         this.historyReadDetails = decodeExtensionObject(stream, this.historyReadDetails);
         this.timestampsToReturn = decodeTimestampsToReturn(stream, this.timestampsToReturn);
-        this.releaseContinuationPoints = decodeUABoolean(stream, this.releaseContinuationPoints);
+        this.releaseContinuationPoints = decodeBoolean(stream, this.releaseContinuationPoints);
         this.nodesToRead = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new HistoryReadValueId(null);
             obj.decode(stream1);
@@ -15529,7 +15529,7 @@ const schemaIdentityMappingRuleType = buildStructuredType({
         {
             name: "criteria",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -15571,13 +15571,13 @@ export class IdentityMappingRuleType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeIdentityCriteriaType(this.criteriaType, stream);
-        encodeUAString(this.criteria, stream);
+        encodeString(this.criteria, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.criteriaType = decodeIdentityCriteriaType(stream, this.criteriaType);
-        this.criteria = decodeUAString(stream, this.criteria);
+        this.criteria = decodeString(stream, this.criteria);
     }
 
     // Define Enumeration setters
@@ -15659,7 +15659,7 @@ const schemaIssuedIdentityToken = buildStructuredType({
         {
             name: "encryptionAlgorithm",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -15701,13 +15701,13 @@ export class IssuedIdentityToken extends UserIdentityToken {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeByteString(this.tokenData, stream);
-        encodeUAString(this.encryptionAlgorithm, stream);
+        encodeString(this.encryptionAlgorithm, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.tokenData = decodeByteString(stream, this.tokenData);
-        this.encryptionAlgorithm = decodeUAString(stream, this.encryptionAlgorithm);
+        this.encryptionAlgorithm = decodeString(stream, this.encryptionAlgorithm);
     }
     public get schema(): StructuredTypeSchema { return schemaIssuedIdentityToken; }
 }
@@ -16113,12 +16113,12 @@ const schemaMdnsDiscoveryConfiguration = buildStructuredType({
         {
             name: "mdnsServerName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "serverCapabilities",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -16160,14 +16160,14 @@ export class MdnsDiscoveryConfiguration extends DiscoveryConfiguration {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.mdnsServerName, stream);
-        encodeArray(this.serverCapabilities, stream, encodeUAString);
+        encodeString(this.mdnsServerName, stream);
+        encodeArray(this.serverCapabilities, stream, encodeString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.mdnsServerName = decodeUAString(stream, this.mdnsServerName);
-        this.serverCapabilities = decodeArray(stream, decodeUAString);
+        this.mdnsServerName = decodeString(stream, this.mdnsServerName);
+        this.serverCapabilities = decodeArray(stream, decodeString);
     }
     public get schema(): StructuredTypeSchema { return schemaMdnsDiscoveryConfiguration; }
 }
@@ -16185,12 +16185,12 @@ const schemaMethodAttributes = buildStructuredType({
         {
             name: "executable",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "userExecutable",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -16231,14 +16231,14 @@ export class MethodAttributes extends NodeAttributes {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.executable, stream);
-        encodeUABoolean(this.userExecutable, stream);
+        encodeBoolean(this.executable, stream);
+        encodeBoolean(this.userExecutable, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.executable = decodeUABoolean(stream, this.executable);
-        this.userExecutable = decodeUABoolean(stream, this.userExecutable);
+        this.executable = decodeBoolean(stream, this.executable);
+        this.userExecutable = decodeBoolean(stream, this.userExecutable);
     }
     public get schema(): StructuredTypeSchema { return schemaMethodAttributes; }
 }
@@ -16274,12 +16274,12 @@ const schemaMethodNode = buildStructuredType({
         {
             name: "executable",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "userExecutable",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -16350,8 +16350,8 @@ export class MethodNode extends InstanceNode {
         encodeArray(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeUABoolean(this.executable, stream);
-        encodeUABoolean(this.userExecutable, stream);
+        encodeBoolean(this.executable, stream);
+        encodeBoolean(this.userExecutable, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
@@ -16371,8 +16371,8 @@ export class MethodNode extends InstanceNode {
             obj.decode(stream1);
             return obj;
         });
-        this.executable = decodeUABoolean(stream, this.executable);
-        this.userExecutable = decodeUABoolean(stream, this.userExecutable);
+        this.executable = decodeBoolean(stream, this.executable);
+        this.userExecutable = decodeBoolean(stream, this.userExecutable);
     }
     public get schema(): StructuredTypeSchema { return schemaMethodNode; }
 }
@@ -17073,7 +17073,7 @@ const schemaNetworkAddressDataType = buildStructuredType({
         {
             name: "networkInterface",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -17109,12 +17109,12 @@ export class NetworkAddressDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.networkInterface, stream);
+        encodeString(this.networkInterface, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.networkInterface = decodeUAString(stream, this.networkInterface);
+        this.networkInterface = decodeString(stream, this.networkInterface);
     }
     public get schema(): StructuredTypeSchema { return schemaNetworkAddressDataType; }
 }
@@ -17132,7 +17132,7 @@ const schemaNetworkAddressUrlDataType = buildStructuredType({
         {
             name: "url",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -17168,12 +17168,12 @@ export class NetworkAddressUrlDataType extends NetworkAddressDataType {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.url, stream);
+        encodeString(this.url, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.url = decodeUAString(stream, this.url);
+        this.url = decodeString(stream, this.url);
     }
     public get schema(): StructuredTypeSchema { return schemaNetworkAddressUrlDataType; }
 }
@@ -17191,7 +17191,7 @@ const schemaNetworkGroupDataType = buildStructuredType({
         {
             name: "serverUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "networkPaths",
@@ -17242,13 +17242,13 @@ export class NetworkGroupDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.serverUri, stream);
+        encodeString(this.serverUri, stream);
         encodeArray(this.networkPaths, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.serverUri = decodeUAString(stream, this.serverUri);
+        this.serverUri = decodeString(stream, this.serverUri);
         this.networkPaths = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new EndpointUrlListDataType(null);
             obj.decode(stream1);
@@ -17281,7 +17281,7 @@ const schemaNodeReference = buildStructuredType({
         {
             name: "isForward",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "referencedNodeIds",
@@ -17340,7 +17340,7 @@ export class NodeReference extends ExtensionObject {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.nodeId, stream);
         encodeNodeId(this.referenceTypeId, stream);
-        encodeUABoolean(this.isForward, stream);
+        encodeBoolean(this.isForward, stream);
         encodeArray(this.referencedNodeIds, stream, encodeNodeId);
     }
     public decode(stream: BinaryStream): void {
@@ -17348,7 +17348,7 @@ export class NodeReference extends ExtensionObject {
         /* NEEDED !!! */ super.decode(stream);
         this.nodeId = decodeNodeId(stream, this.nodeId);
         this.referenceTypeId = decodeNodeId(stream, this.referenceTypeId);
-        this.isForward = decodeUABoolean(stream, this.isForward);
+        this.isForward = decodeBoolean(stream, this.isForward);
         this.referencedNodeIds = decodeArray(stream, decodeNodeId);
     }
     public get schema(): StructuredTypeSchema { return schemaNodeReference; }
@@ -17455,7 +17455,7 @@ const schemaNodeTypeDescription = buildStructuredType({
         {
             name: "includeSubTypes",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "dataToReturn",
@@ -17512,14 +17512,14 @@ export class NodeTypeDescription extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeExpandedNodeId(this.typeDefinitionNode, stream);
-        encodeUABoolean(this.includeSubTypes, stream);
+        encodeBoolean(this.includeSubTypes, stream);
         encodeArray(this.dataToReturn, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.typeDefinitionNode = decodeExpandedNodeId(stream, this.typeDefinitionNode);
-        this.includeSubTypes = decodeUABoolean(stream, this.includeSubTypes);
+        this.includeSubTypes = decodeBoolean(stream, this.includeSubTypes);
         this.dataToReturn = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new QueryDataDescription(null);
             obj.decode(stream1);
@@ -17807,7 +17807,7 @@ const schemaObjectTypeAttributes = buildStructuredType({
         {
             name: "isAbstract",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -17843,12 +17843,12 @@ export class ObjectTypeAttributes extends NodeAttributes {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.isAbstract, stream);
+        encodeBoolean(this.isAbstract, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isAbstract = decodeUABoolean(stream, this.isAbstract);
+        this.isAbstract = decodeBoolean(stream, this.isAbstract);
     }
     public get schema(): StructuredTypeSchema { return schemaObjectTypeAttributes; }
 }
@@ -17884,7 +17884,7 @@ const schemaObjectTypeNode = buildStructuredType({
         {
             name: "isAbstract",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -17950,7 +17950,7 @@ export class ObjectTypeNode extends TypeNode {
         encodeArray(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeUABoolean(this.isAbstract, stream);
+        encodeBoolean(this.isAbstract, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
@@ -17970,7 +17970,7 @@ export class ObjectTypeNode extends TypeNode {
             obj.decode(stream1);
             return obj;
         });
-        this.isAbstract = decodeUABoolean(stream, this.isAbstract);
+        this.isAbstract = decodeBoolean(stream, this.isAbstract);
     }
     public get schema(): StructuredTypeSchema { return schemaObjectTypeNode; }
 }
@@ -18450,7 +18450,7 @@ const schemaPortableNodeId = buildStructuredType({
         {
             name: "namespaceUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "identifier",
@@ -18496,13 +18496,13 @@ export class PortableNodeId extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.namespaceUri, stream);
+        encodeString(this.namespaceUri, stream);
         encodeNodeId(this.identifier, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaceUri = decodeUAString(stream, this.namespaceUri);
+        this.namespaceUri = decodeString(stream, this.namespaceUri);
         this.identifier = decodeNodeId(stream, this.identifier);
     }
     public get schema(): StructuredTypeSchema { return schemaPortableNodeId; }
@@ -18521,12 +18521,12 @@ const schemaPortableQualifiedName = buildStructuredType({
         {
             name: "namespaceUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -18567,14 +18567,14 @@ export class PortableQualifiedName extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.namespaceUri, stream);
-        encodeUAString(this.name, stream);
+        encodeString(this.namespaceUri, stream);
+        encodeString(this.name, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaceUri = decodeUAString(stream, this.namespaceUri);
-        this.name = decodeUAString(stream, this.name);
+        this.namespaceUri = decodeString(stream, this.namespaceUri);
+        this.name = decodeString(stream, this.name);
     }
     public get schema(): StructuredTypeSchema { return schemaPortableQualifiedName; }
 }
@@ -18592,12 +18592,12 @@ const schemaPriorityMappingEntryType = buildStructuredType({
         {
             name: "mappingUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "priorityLabel",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "priorityValue_PCP",
@@ -18658,16 +18658,16 @@ export class PriorityMappingEntryType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.mappingUri, stream);
-        encodeUAString(this.priorityLabel, stream);
+        encodeString(this.mappingUri, stream);
+        encodeString(this.priorityLabel, stream);
         encodeByte(this.priorityValue_PCP, stream);
         encodeUInt32(this.priorityValue_DSCP, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.mappingUri = decodeUAString(stream, this.mappingUri);
-        this.priorityLabel = decodeUAString(stream, this.priorityLabel);
+        this.mappingUri = decodeString(stream, this.mappingUri);
+        this.priorityLabel = decodeString(stream, this.priorityLabel);
         this.priorityValue_PCP = decodeByte(stream, this.priorityValue_PCP);
         this.priorityValue_DSCP = decodeUInt32(stream, this.priorityValue_DSCP);
     }
@@ -18692,7 +18692,7 @@ const schemaProgramDiagnostic2DataType = buildStructuredType({
         {
             name: "createClientName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "invocationCreationTime",
@@ -18707,7 +18707,7 @@ const schemaProgramDiagnostic2DataType = buildStructuredType({
         {
             name: "lastMethodCall",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "lastMethodSessionId",
@@ -18846,10 +18846,10 @@ export class ProgramDiagnostic2DataType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.createSessionId, stream);
-        encodeUAString(this.createClientName, stream);
+        encodeString(this.createClientName, stream);
         encodeDateTime(this.invocationCreationTime, stream);
         encodeDateTime(this.lastTransitionTime, stream);
-        encodeUAString(this.lastMethodCall, stream);
+        encodeString(this.lastMethodCall, stream);
         encodeNodeId(this.lastMethodSessionId, stream);
         encodeArray(this.lastMethodInputArguments, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.lastMethodOutputArguments, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -18862,10 +18862,10 @@ export class ProgramDiagnostic2DataType extends ExtensionObject {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.createSessionId = decodeNodeId(stream, this.createSessionId);
-        this.createClientName = decodeUAString(stream, this.createClientName);
+        this.createClientName = decodeString(stream, this.createClientName);
         this.invocationCreationTime = decodeDateTime(stream, this.invocationCreationTime);
         this.lastTransitionTime = decodeDateTime(stream, this.lastTransitionTime);
-        this.lastMethodCall = decodeUAString(stream, this.lastMethodCall);
+        this.lastMethodCall = decodeString(stream, this.lastMethodCall);
         this.lastMethodSessionId = decodeNodeId(stream, this.lastMethodSessionId);
         this.lastMethodInputArguments = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new Argument(null);
@@ -18974,7 +18974,7 @@ const schemaProgramDiagnosticDataType = buildStructuredType({
         {
             name: "createClientName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "invocationCreationTime",
@@ -18989,7 +18989,7 @@ const schemaProgramDiagnosticDataType = buildStructuredType({
         {
             name: "lastMethodCall",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "lastMethodSessionId",
@@ -19106,10 +19106,10 @@ export class ProgramDiagnosticDataType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.createSessionId, stream);
-        encodeUAString(this.createClientName, stream);
+        encodeString(this.createClientName, stream);
         encodeDateTime(this.invocationCreationTime, stream);
         encodeDateTime(this.lastTransitionTime, stream);
-        encodeUAString(this.lastMethodCall, stream);
+        encodeString(this.lastMethodCall, stream);
         encodeNodeId(this.lastMethodSessionId, stream);
         encodeArray(this.lastMethodInputArguments, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.lastMethodOutputArguments, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -19120,10 +19120,10 @@ export class ProgramDiagnosticDataType extends ExtensionObject {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.createSessionId = decodeNodeId(stream, this.createSessionId);
-        this.createClientName = decodeUAString(stream, this.createClientName);
+        this.createClientName = decodeString(stream, this.createClientName);
         this.invocationCreationTime = decodeDateTime(stream, this.invocationCreationTime);
         this.lastTransitionTime = decodeDateTime(stream, this.lastTransitionTime);
-        this.lastMethodCall = decodeUAString(stream, this.lastMethodCall);
+        this.lastMethodCall = decodeString(stream, this.lastMethodCall);
         this.lastMethodSessionId = decodeNodeId(stream, this.lastMethodSessionId);
         this.lastMethodInputArguments = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new Argument(null);
@@ -19154,12 +19154,12 @@ const schemaPublishedDataSetDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "dataSetFolder",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -19236,8 +19236,8 @@ export class PublishedDataSetDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
-        encodeArray(this.dataSetFolder, stream, encodeUAString);
+        encodeString(this.name, stream);
+        encodeArray(this.dataSetFolder, stream, encodeString);
         this.dataSetMetaData.encode(stream);
         encodeArray(this.extensionFields, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeExtensionObject(this.dataSetSource, stream);
@@ -19245,8 +19245,8 @@ export class PublishedDataSetDataType extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
-        this.dataSetFolder = decodeArray(stream, decodeUAString);
+        this.name = decodeString(stream, this.name);
+        this.dataSetFolder = decodeArray(stream, decodeString);
         this.dataSetMetaData.decode(stream);
         this.extensionFields = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new KeyValuePair(null);
@@ -19271,12 +19271,12 @@ const schemaPubSubGroupDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "enabled",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "securityMode",
@@ -19286,7 +19286,7 @@ const schemaPubSubGroupDataType = buildStructuredType({
         {
             name: "securityGroupId",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityKeyServices",
@@ -19377,10 +19377,10 @@ export class PubSubGroupDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
-        encodeUABoolean(this.enabled, stream);
+        encodeString(this.name, stream);
+        encodeBoolean(this.enabled, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        encodeUAString(this.securityGroupId, stream);
+        encodeString(this.securityGroupId, stream);
         encodeArray(this.securityKeyServices, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeUInt32(this.maxNetworkMessageSize, stream);
         encodeArray(this.groupProperties, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -19388,10 +19388,10 @@ export class PubSubGroupDataType extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
-        this.enabled = decodeUABoolean(stream, this.enabled);
+        this.name = decodeString(stream, this.name);
+        this.enabled = decodeBoolean(stream, this.enabled);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityGroupId = decodeUAString(stream, this.securityGroupId);
+        this.securityGroupId = decodeString(stream, this.securityGroupId);
         this.securityKeyServices = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new EndpointDescription(null);
             obj.decode(stream1);
@@ -19451,13 +19451,13 @@ const schemaWriterGroupDataType = buildStructuredType({
         {
             name: "localeIds",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "headerLayoutUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "transportSettings",
@@ -19557,8 +19557,8 @@ export class WriterGroupDataType extends PubSubGroupDataType {
         encodeDouble(this.publishingInterval, stream);
         encodeDouble(this.keepAliveTime, stream);
         encodeByte(this.priority, stream);
-        encodeArray(this.localeIds, stream, encodeUAString);
-        encodeUAString(this.headerLayoutUri, stream);
+        encodeArray(this.localeIds, stream, encodeString);
+        encodeString(this.headerLayoutUri, stream);
         encodeExtensionObject(this.transportSettings, stream);
         encodeExtensionObject(this.messageSettings, stream);
         encodeArray(this.dataSetWriters, stream, (obj, stream1) => { obj.encode(stream1); });
@@ -19570,8 +19570,8 @@ export class WriterGroupDataType extends PubSubGroupDataType {
         this.publishingInterval = decodeDouble(stream, this.publishingInterval);
         this.keepAliveTime = decodeDouble(stream, this.keepAliveTime);
         this.priority = decodeByte(stream, this.priority);
-        this.localeIds = decodeArray(stream, decodeUAString);
-        this.headerLayoutUri = decodeUAString(stream, this.headerLayoutUri);
+        this.localeIds = decodeArray(stream, decodeString);
+        this.headerLayoutUri = decodeString(stream, this.headerLayoutUri);
         this.transportSettings = decodeExtensionObject(stream, this.transportSettings);
         this.messageSettings = decodeExtensionObject(stream, this.messageSettings);
         this.dataSetWriters = decodeArray(stream, (stream1: BinaryStream) => {
@@ -19688,12 +19688,12 @@ const schemaPubSubConnectionDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "enabled",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "publisherId",
@@ -19703,7 +19703,7 @@ const schemaPubSubConnectionDataType = buildStructuredType({
         {
             name: "transportProfileUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "address",
@@ -19819,10 +19819,10 @@ export class PubSubConnectionDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
-        encodeUABoolean(this.enabled, stream);
+        encodeString(this.name, stream);
+        encodeBoolean(this.enabled, stream);
         encodeVariant(this.publisherId, stream);
-        encodeUAString(this.transportProfileUri, stream);
+        encodeString(this.transportProfileUri, stream);
         encodeExtensionObject(this.address, stream);
         encodeArray(this.connectionProperties, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeExtensionObject(this.transportSettings, stream);
@@ -19832,10 +19832,10 @@ export class PubSubConnectionDataType extends ExtensionObject {
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
-        this.enabled = decodeUABoolean(stream, this.enabled);
+        this.name = decodeString(stream, this.name);
+        this.enabled = decodeBoolean(stream, this.enabled);
         this.publisherId = decodeVariant(stream, this.publisherId);
-        this.transportProfileUri = decodeUAString(stream, this.transportProfileUri);
+        this.transportProfileUri = decodeString(stream, this.transportProfileUri);
         this.address = decodeExtensionObject(stream, this.address);
         this.connectionProperties = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new KeyValuePair(null);
@@ -19882,7 +19882,7 @@ const schemaPubSubConfigurationDataType = buildStructuredType({
         {
             name: "enabled",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -19938,7 +19938,7 @@ export class PubSubConfigurationDataType extends ExtensionObject {
         /* NEEDED */ super.encode(stream);
         encodeArray(this.publishedDataSets, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.connections, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeUABoolean(this.enabled, stream);
+        encodeBoolean(this.enabled, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
@@ -19953,7 +19953,7 @@ export class PubSubConfigurationDataType extends ExtensionObject {
             obj.decode(stream1);
             return obj;
         });
-        this.enabled = decodeUABoolean(stream, this.enabled);
+        this.enabled = decodeBoolean(stream, this.enabled);
     }
     public get schema(): StructuredTypeSchema { return schemaPubSubConfigurationDataType; }
 }
@@ -20019,12 +20019,12 @@ const schemaStandaloneSubscribedDataSetDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "dataSetFolder",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -20086,16 +20086,16 @@ export class StandaloneSubscribedDataSetDataType extends SubscribedDataSetDataTy
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
-        encodeArray(this.dataSetFolder, stream, encodeUAString);
+        encodeString(this.name, stream);
+        encodeArray(this.dataSetFolder, stream, encodeString);
         this.dataSetMetaData.encode(stream);
         encodeExtensionObject(this.subscribedDataSet, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
-        this.dataSetFolder = decodeArray(stream, decodeUAString);
+        this.name = decodeString(stream, this.name);
+        this.dataSetFolder = decodeArray(stream, decodeString);
         this.dataSetMetaData.decode(stream);
         this.subscribedDataSet = decodeExtensionObject(stream, this.subscribedDataSet);
     }
@@ -20115,12 +20115,12 @@ const schemaSecurityGroupDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "securityGroupFolder",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -20131,7 +20131,7 @@ const schemaSecurityGroupDataType = buildStructuredType({
         {
             name: "securityPolicyUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "maxFutureKeyCount",
@@ -20146,7 +20146,7 @@ const schemaSecurityGroupDataType = buildStructuredType({
         {
             name: "securityGroupId",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "rolePermissions",
@@ -20242,26 +20242,26 @@ export class SecurityGroupDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.name, stream);
-        encodeArray(this.securityGroupFolder, stream, encodeUAString);
+        encodeString(this.name, stream);
+        encodeArray(this.securityGroupFolder, stream, encodeString);
         encodeDouble(this.keyLifetime, stream);
-        encodeUAString(this.securityPolicyUri, stream);
+        encodeString(this.securityPolicyUri, stream);
         encodeUInt32(this.maxFutureKeyCount, stream);
         encodeUInt32(this.maxPastKeyCount, stream);
-        encodeUAString(this.securityGroupId, stream);
+        encodeString(this.securityGroupId, stream);
         encodeArray(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.groupProperties, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.name = decodeUAString(stream, this.name);
-        this.securityGroupFolder = decodeArray(stream, decodeUAString);
+        this.name = decodeString(stream, this.name);
+        this.securityGroupFolder = decodeArray(stream, decodeString);
         this.keyLifetime = decodeDouble(stream, this.keyLifetime);
-        this.securityPolicyUri = decodeUAString(stream, this.securityPolicyUri);
+        this.securityPolicyUri = decodeString(stream, this.securityPolicyUri);
         this.maxFutureKeyCount = decodeUInt32(stream, this.maxFutureKeyCount);
         this.maxPastKeyCount = decodeUInt32(stream, this.maxPastKeyCount);
-        this.securityGroupId = decodeUAString(stream, this.securityGroupId);
+        this.securityGroupId = decodeString(stream, this.securityGroupId);
         this.rolePermissions = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new RolePermissionType(null);
             obj.decode(stream1);
@@ -20289,23 +20289,23 @@ const schemaPubSubKeyPushTargetDataType = buildStructuredType({
         {
             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",
@@ -20331,7 +20331,7 @@ const schemaPubSubKeyPushTargetDataType = buildStructuredType({
         {
             name: "securityGroups",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
     ]
@@ -20412,23 +20412,23 @@ export class PubSubKeyPushTargetDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.applicationUri, stream);
-        encodeArray(this.pushTargetFolder, stream, encodeUAString);
-        encodeUAString(this.endpointUrl, stream);
-        encodeUAString(this.securityPolicyUri, stream);
+        encodeString(this.applicationUri, stream);
+        encodeArray(this.pushTargetFolder, stream, encodeString);
+        encodeString(this.endpointUrl, stream);
+        encodeString(this.securityPolicyUri, stream);
         this.userTokenType.encode(stream);
         encodeUInt16(this.requestedKeyCount, stream);
         encodeDouble(this.retryInterval, stream);
         encodeArray(this.pushTargetProperties, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeArray(this.securityGroups, stream, encodeUAString);
+        encodeArray(this.securityGroups, stream, encodeString);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.applicationUri = decodeUAString(stream, this.applicationUri);
-        this.pushTargetFolder = decodeArray(stream, decodeUAString);
-        this.endpointUrl = decodeUAString(stream, this.endpointUrl);
-        this.securityPolicyUri = decodeUAString(stream, this.securityPolicyUri);
+        this.applicationUri = decodeString(stream, this.applicationUri);
+        this.pushTargetFolder = decodeArray(stream, decodeString);
+        this.endpointUrl = decodeString(stream, this.endpointUrl);
+        this.securityPolicyUri = decodeString(stream, this.securityPolicyUri);
         this.userTokenType.decode(stream);
         this.requestedKeyCount = decodeUInt16(stream, this.requestedKeyCount);
         this.retryInterval = decodeDouble(stream, this.retryInterval);
@@ -20437,7 +20437,7 @@ export class PubSubKeyPushTargetDataType extends ExtensionObject {
             obj.decode(stream1);
             return obj;
         });
-        this.securityGroups = decodeArray(stream, decodeUAString);
+        this.securityGroups = decodeArray(stream, decodeString);
     }
     public get schema(): StructuredTypeSchema { return schemaPubSubKeyPushTargetDataType; }
 }
@@ -20782,7 +20782,7 @@ const schemaPubSubConfigurationValueDataType = buildStructuredType({
         {
             name: "name",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "identifier",
@@ -20834,14 +20834,14 @@ export class PubSubConfigurationValueDataType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         this.configurationElement.encode(stream);
-        encodeUAString(this.name, stream);
+        encodeString(this.name, stream);
         encodeVariant(this.identifier, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.configurationElement.decode(stream);
-        this.name = decodeUAString(stream, this.name);
+        this.name = decodeString(stream, this.name);
         this.identifier = decodeVariant(stream, this.identifier);
     }
     public get schema(): StructuredTypeSchema { return schemaPubSubConfigurationValueDataType; }
@@ -21027,7 +21027,7 @@ const schemaPublishResponse = buildStructuredType({
         {
             name: "moreNotifications",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "notificationMessage",
@@ -21113,7 +21113,7 @@ export class PublishResponse extends ExtensionObject {
         this.responseHeader.encode(stream);
         encodeUInt32(this.subscriptionId, stream);
         encodeArray(this.availableSequenceNumbers, stream, encodeUInt32);
-        encodeUABoolean(this.moreNotifications, stream);
+        encodeBoolean(this.moreNotifications, stream);
         this.notificationMessage.encode(stream);
         encodeArray(this.results, stream, encodeStatusCode);
         encodeArray(this.diagnosticInfos, stream, encodeDiagnosticInfo);
@@ -21124,7 +21124,7 @@ export class PublishResponse extends ExtensionObject {
         this.responseHeader.decode(stream);
         this.subscriptionId = decodeUInt32(stream, this.subscriptionId);
         this.availableSequenceNumbers = decodeArray(stream, decodeUInt32);
-        this.moreNotifications = decodeUABoolean(stream, this.moreNotifications);
+        this.moreNotifications = decodeBoolean(stream, this.moreNotifications);
         this.notificationMessage.decode(stream);
         this.results = decodeArray(stream, decodeStatusCode);
         this.diagnosticInfos = decodeArray(stream, decodeDiagnosticInfo);
@@ -21405,7 +21405,7 @@ const schemaPublishedDataSetCustomSourceDataType = buildStructuredType({
         {
             name: "cyclicDataSet",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -21441,12 +21441,12 @@ export class PublishedDataSetCustomSourceDataType extends PublishedDataSetSource
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.cyclicDataSet, stream);
+        encodeBoolean(this.cyclicDataSet, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.cyclicDataSet = decodeUABoolean(stream, this.cyclicDataSet);
+        this.cyclicDataSet = decodeBoolean(stream, this.cyclicDataSet);
     }
     public get schema(): StructuredTypeSchema { return schemaPublishedDataSetCustomSourceDataType; }
 }
@@ -21959,7 +21959,7 @@ const schemaQueryNextRequest = buildStructuredType({
         {
             name: "releaseContinuationPoint",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "continuationPoint",
@@ -22011,14 +22011,14 @@ export class QueryNextRequest extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        encodeUABoolean(this.releaseContinuationPoint, stream);
+        encodeBoolean(this.releaseContinuationPoint, stream);
         encodeByteString(this.continuationPoint, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.releaseContinuationPoint = decodeUABoolean(stream, this.releaseContinuationPoint);
+        this.releaseContinuationPoint = decodeBoolean(stream, this.releaseContinuationPoint);
         this.continuationPoint = decodeByteString(stream, this.continuationPoint);
     }
     public get schema(): StructuredTypeSchema { return schemaQueryNextRequest; }
@@ -22266,7 +22266,7 @@ const schemaReadAtTimeDetails = buildStructuredType({
         {
             name: "useSimpleBounds",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -22308,13 +22308,13 @@ export class ReadAtTimeDetails extends HistoryReadDetails {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeArray(this.reqTimes, stream, encodeDateTime);
-        encodeUABoolean(this.useSimpleBounds, stream);
+        encodeBoolean(this.useSimpleBounds, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.reqTimes = decodeArray(stream, decodeDateTime);
-        this.useSimpleBounds = decodeUABoolean(stream, this.useSimpleBounds);
+        this.useSimpleBounds = decodeBoolean(stream, this.useSimpleBounds);
     }
     public get schema(): StructuredTypeSchema { return schemaReadAtTimeDetails; }
 }
@@ -22535,7 +22535,7 @@ const schemaReadRawModifiedDetails = buildStructuredType({
         {
             name: "isReadModified",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "startTime",
@@ -22555,7 +22555,7 @@ const schemaReadRawModifiedDetails = buildStructuredType({
         {
             name: "returnBounds",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -22611,20 +22611,20 @@ export class ReadRawModifiedDetails extends HistoryReadDetails {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.isReadModified, stream);
+        encodeBoolean(this.isReadModified, stream);
         encodeDateTime(this.startTime, stream);
         encodeDateTime(this.endTime, stream);
         encodeUInt32(this.numValuesPerNode, stream);
-        encodeUABoolean(this.returnBounds, stream);
+        encodeBoolean(this.returnBounds, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isReadModified = decodeUABoolean(stream, this.isReadModified);
+        this.isReadModified = decodeBoolean(stream, this.isReadModified);
         this.startTime = decodeDateTime(stream, this.startTime);
         this.endTime = decodeDateTime(stream, this.endTime);
         this.numValuesPerNode = decodeUInt32(stream, this.numValuesPerNode);
-        this.returnBounds = decodeUABoolean(stream, this.returnBounds);
+        this.returnBounds = decodeBoolean(stream, this.returnBounds);
     }
     public get schema(): StructuredTypeSchema { return schemaReadRawModifiedDetails; }
 }
@@ -22986,7 +22986,7 @@ const schemaReceiveQosPriorityDataType = buildStructuredType({
         {
             name: "priorityLabel",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -23022,12 +23022,12 @@ export class ReceiveQosPriorityDataType extends ReceiveQosDataType {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.priorityLabel, stream);
+        encodeString(this.priorityLabel, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.priorityLabel = decodeUAString(stream, this.priorityLabel);
+        this.priorityLabel = decodeString(stream, this.priorityLabel);
     }
     public get schema(): StructuredTypeSchema { return schemaReceiveQosPriorityDataType; }
 }
@@ -23075,7 +23075,7 @@ const schemaRedundantServerDataType = buildStructuredType({
         {
             name: "serverId",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "serviceLevel",
@@ -23131,14 +23131,14 @@ export class RedundantServerDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.serverId, stream);
+        encodeString(this.serverId, stream);
         encodeByte(this.serviceLevel, stream);
         encodeServerState(this.serverState, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.serverId = decodeUAString(stream, this.serverId);
+        this.serverId = decodeString(stream, this.serverId);
         this.serviceLevel = decodeByte(stream, this.serviceLevel);
         this.serverState = decodeServerState(stream, this.serverState);
     }
@@ -23169,12 +23169,12 @@ const schemaReferenceTypeAttributes = buildStructuredType({
         {
             name: "isAbstract",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "symmetric",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "inverseName",
@@ -23225,15 +23225,15 @@ export class ReferenceTypeAttributes extends NodeAttributes {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.isAbstract, stream);
-        encodeUABoolean(this.symmetric, stream);
+        encodeBoolean(this.isAbstract, stream);
+        encodeBoolean(this.symmetric, stream);
         encodeLocalizedText(this.inverseName, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.isAbstract = decodeUABoolean(stream, this.isAbstract);
-        this.symmetric = decodeUABoolean(stream, this.symmetric);
+        this.isAbstract = decodeBoolean(stream, this.isAbstract);
+        this.symmetric = decodeBoolean(stream, this.symmetric);
         this.inverseName = decodeLocalizedText(stream, this.inverseName);
     }
     public get schema(): StructuredTypeSchema { return schemaReferenceTypeAttributes; }
@@ -23270,12 +23270,12 @@ const schemaReferenceTypeNode = buildStructuredType({
         {
             name: "isAbstract",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "symmetric",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "inverseName",
@@ -23356,8 +23356,8 @@ export class ReferenceTypeNode extends TypeNode {
         encodeArray(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeUABoolean(this.isAbstract, stream);
-        encodeUABoolean(this.symmetric, stream);
+        encodeBoolean(this.isAbstract, stream);
+        encodeBoolean(this.symmetric, stream);
         encodeLocalizedText(this.inverseName, stream);
     }
     public decode(stream: BinaryStream): void {
@@ -23378,8 +23378,8 @@ export class ReferenceTypeNode extends TypeNode {
             obj.decode(stream1);
             return obj;
         });
-        this.isAbstract = decodeUABoolean(stream, this.isAbstract);
-        this.symmetric = decodeUABoolean(stream, this.symmetric);
+        this.isAbstract = decodeBoolean(stream, this.isAbstract);
+        this.symmetric = decodeBoolean(stream, this.symmetric);
         this.inverseName = decodeLocalizedText(stream, this.inverseName);
     }
     public get schema(): StructuredTypeSchema { return schemaReferenceTypeNode; }
@@ -23542,12 +23542,12 @@ const schemaRegisteredServer = buildStructuredType({
         {
             name: "serverUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "productUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "serverNames",
@@ -23563,23 +23563,23 @@ const schemaRegisteredServer = 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",
         },
     ]
 });
@@ -23650,26 +23650,26 @@ export class RegisteredServer extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.serverUri, stream);
-        encodeUAString(this.productUri, stream);
+        encodeString(this.serverUri, stream);
+        encodeString(this.productUri, stream);
         encodeArray(this.serverNames, stream, encodeLocalizedText);
         encodeApplicationType(this.serverType, stream);
-        encodeUAString(this.gatewayServerUri, stream);
-        encodeArray(this.discoveryUrls, stream, encodeUAString);
-        encodeUAString(this.semaphoreFilePath, stream);
-        encodeUABoolean(this.isOnline, stream);
+        encodeString(this.gatewayServerUri, stream);
+        encodeArray(this.discoveryUrls, stream, encodeString);
+        encodeString(this.semaphoreFilePath, stream);
+        encodeBoolean(this.isOnline, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.serverUri = decodeUAString(stream, this.serverUri);
-        this.productUri = decodeUAString(stream, this.productUri);
+        this.serverUri = decodeString(stream, this.serverUri);
+        this.productUri = decodeString(stream, this.productUri);
         this.serverNames = decodeArray(stream, decodeLocalizedText);
         this.serverType = decodeApplicationType(stream, this.serverType);
-        this.gatewayServerUri = decodeUAString(stream, this.gatewayServerUri);
-        this.discoveryUrls = decodeArray(stream, decodeUAString);
-        this.semaphoreFilePath = decodeUAString(stream, this.semaphoreFilePath);
-        this.isOnline = decodeUABoolean(stream, this.isOnline);
+        this.gatewayServerUri = decodeString(stream, this.gatewayServerUri);
+        this.discoveryUrls = decodeArray(stream, decodeString);
+        this.semaphoreFilePath = decodeString(stream, this.semaphoreFilePath);
+        this.isOnline = decodeBoolean(stream, this.isOnline);
     }
 
     // Define Enumeration setters
@@ -24773,7 +24773,7 @@ const schemaSessionDiagnosticsDataType = buildStructuredType({
         {
             name: "sessionName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "clientDescription",
@@ -24783,17 +24783,17 @@ const schemaSessionDiagnosticsDataType = buildStructuredType({
         {
             name: "serverUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "endpointUrl",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "localeIds",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -25226,11 +25226,11 @@ export class SessionDiagnosticsDataType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.sessionId, stream);
-        encodeUAString(this.sessionName, stream);
+        encodeString(this.sessionName, stream);
         this.clientDescription.encode(stream);
-        encodeUAString(this.serverUri, stream);
-        encodeUAString(this.endpointUrl, stream);
-        encodeArray(this.localeIds, stream, encodeUAString);
+        encodeString(this.serverUri, stream);
+        encodeString(this.endpointUrl, stream);
+        encodeArray(this.localeIds, stream, encodeString);
         encodeDouble(this.actualSessionTimeout, stream);
         encodeUInt32(this.maxResponseMessageSize, stream);
         encodeDateTime(this.clientConnectionTime, stream);
@@ -25273,11 +25273,11 @@ export class SessionDiagnosticsDataType extends ExtensionObject {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.sessionId = decodeNodeId(stream, this.sessionId);
-        this.sessionName = decodeUAString(stream, this.sessionName);
+        this.sessionName = decodeString(stream, this.sessionName);
         this.clientDescription.decode(stream);
-        this.serverUri = decodeUAString(stream, this.serverUri);
-        this.endpointUrl = decodeUAString(stream, this.endpointUrl);
-        this.localeIds = decodeArray(stream, decodeUAString);
+        this.serverUri = decodeString(stream, this.serverUri);
+        this.endpointUrl = decodeString(stream, this.endpointUrl);
+        this.localeIds = decodeArray(stream, decodeString);
         this.actualSessionTimeout = decodeDouble(stream, this.actualSessionTimeout);
         this.maxResponseMessageSize = decodeUInt32(stream, this.maxResponseMessageSize);
         this.clientConnectionTime = decodeDateTime(stream, this.clientConnectionTime);
@@ -25337,28 +25337,28 @@ const schemaSessionSecurityDiagnosticsDataType = buildStructuredType({
         {
             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",
@@ -25368,7 +25368,7 @@ const schemaSessionSecurityDiagnosticsDataType = buildStructuredType({
         {
             name: "securityPolicyUri",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "clientCertificate",
@@ -25450,26 +25450,26 @@ export class SessionSecurityDiagnosticsDataType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeNodeId(this.sessionId, stream);
-        encodeUAString(this.clientUserIdOfSession, stream);
-        encodeArray(this.clientUserIdHistory, stream, encodeUAString);
-        encodeUAString(this.authenticationMechanism, stream);
-        encodeUAString(this.encoding, stream);
-        encodeUAString(this.transportProtocol, stream);
+        encodeString(this.clientUserIdOfSession, stream);
+        encodeArray(this.clientUserIdHistory, stream, encodeString);
+        encodeString(this.authenticationMechanism, stream);
+        encodeString(this.encoding, stream);
+        encodeString(this.transportProtocol, stream);
         encodeMessageSecurityMode(this.securityMode, stream);
-        encodeUAString(this.securityPolicyUri, stream);
+        encodeString(this.securityPolicyUri, stream);
         encodeByteString(this.clientCertificate, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.sessionId = decodeNodeId(stream, this.sessionId);
-        this.clientUserIdOfSession = decodeUAString(stream, this.clientUserIdOfSession);
-        this.clientUserIdHistory = decodeArray(stream, decodeUAString);
-        this.authenticationMechanism = decodeUAString(stream, this.authenticationMechanism);
-        this.encoding = decodeUAString(stream, this.encoding);
-        this.transportProtocol = decodeUAString(stream, this.transportProtocol);
+        this.clientUserIdOfSession = decodeString(stream, this.clientUserIdOfSession);
+        this.clientUserIdHistory = decodeArray(stream, decodeString);
+        this.authenticationMechanism = decodeString(stream, this.authenticationMechanism);
+        this.encoding = decodeString(stream, this.encoding);
+        this.transportProtocol = decodeString(stream, this.transportProtocol);
         this.securityMode = decodeMessageSecurityMode(stream, this.securityMode);
-        this.securityPolicyUri = decodeUAString(stream, this.securityPolicyUri);
+        this.securityPolicyUri = decodeString(stream, this.securityPolicyUri);
         this.clientCertificate = decodeByteString(stream, this.clientCertificate);
     }
 
@@ -25504,19 +25504,19 @@ const schemaSessionlessInvokeRequestType = buildStructuredType({
         {
             name: "namespaceUris",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "serverUris",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "localeIds",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -25579,18 +25579,18 @@ export class SessionlessInvokeRequestType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeUInt32(this.urisVersion, stream);
-        encodeArray(this.namespaceUris, stream, encodeUAString);
-        encodeArray(this.serverUris, stream, encodeUAString);
-        encodeArray(this.localeIds, stream, encodeUAString);
+        encodeArray(this.namespaceUris, stream, encodeString);
+        encodeArray(this.serverUris, stream, encodeString);
+        encodeArray(this.localeIds, stream, encodeString);
         encodeUInt32(this.serviceId, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.urisVersion = decodeUInt32(stream, this.urisVersion);
-        this.namespaceUris = decodeArray(stream, decodeUAString);
-        this.serverUris = decodeArray(stream, decodeUAString);
-        this.localeIds = decodeArray(stream, decodeUAString);
+        this.namespaceUris = decodeArray(stream, decodeString);
+        this.serverUris = decodeArray(stream, decodeString);
+        this.localeIds = decodeArray(stream, decodeString);
         this.serviceId = decodeUInt32(stream, this.serviceId);
     }
     public get schema(): StructuredTypeSchema { return schemaSessionlessInvokeRequestType; }
@@ -25609,13 +25609,13 @@ const schemaSessionlessInvokeResponseType = buildStructuredType({
         {
             name: "namespaceUris",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
             name: "serverUris",
 
-            fieldType: "UAString",
+            fieldType: "String",
             isArray: true
         },
         {
@@ -25667,15 +25667,15 @@ export class SessionlessInvokeResponseType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeArray(this.namespaceUris, stream, encodeUAString);
-        encodeArray(this.serverUris, stream, encodeUAString);
+        encodeArray(this.namespaceUris, stream, encodeString);
+        encodeArray(this.serverUris, stream, encodeString);
         encodeUInt32(this.serviceId, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.namespaceUris = decodeArray(stream, decodeUAString);
-        this.serverUris = decodeArray(stream, decodeUAString);
+        this.namespaceUris = decodeArray(stream, decodeString);
+        this.serverUris = decodeArray(stream, decodeString);
         this.serviceId = decodeUInt32(stream, this.serviceId);
     }
     public get schema(): StructuredTypeSchema { return schemaSessionlessInvokeResponseType; }
@@ -25891,7 +25891,7 @@ const schemaSetPublishingModeRequest = buildStructuredType({
         {
             name: "publishingEnabled",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "subscriptionIds",
@@ -25944,14 +25944,14 @@ export class SetPublishingModeRequest extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
-        encodeUABoolean(this.publishingEnabled, stream);
+        encodeBoolean(this.publishingEnabled, stream);
         encodeArray(this.subscriptionIds, stream, encodeUInt32);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
-        this.publishingEnabled = decodeUABoolean(stream, this.publishingEnabled);
+        this.publishingEnabled = decodeBoolean(stream, this.publishingEnabled);
         this.subscriptionIds = decodeArray(stream, decodeUInt32);
     }
     public get schema(): StructuredTypeSchema { return schemaSetPublishingModeRequest; }
@@ -26275,7 +26275,7 @@ const schemaStandaloneSubscribedDataSetRefDataType = buildStructuredType({
         {
             name: "dataSetName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -26311,12 +26311,12 @@ export class StandaloneSubscribedDataSetRefDataType extends SubscribedDataSetDat
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.dataSetName, stream);
+        encodeString(this.dataSetName, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.dataSetName = decodeUAString(stream, this.dataSetName);
+        this.dataSetName = decodeString(stream, this.dataSetName);
     }
     public get schema(): StructuredTypeSchema { return schemaStandaloneSubscribedDataSetRefDataType; }
 }
@@ -26405,7 +26405,7 @@ const schemaSubscribedDataSetMirrorDataType = buildStructuredType({
         {
             name: "parentNodeName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "rolePermissions",
@@ -26456,13 +26456,13 @@ export class SubscribedDataSetMirrorDataType extends SubscribedDataSetDataType {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.parentNodeName, stream);
+        encodeString(this.parentNodeName, stream);
         encodeArray(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.parentNodeName = decodeUAString(stream, this.parentNodeName);
+        this.parentNodeName = decodeString(stream, this.parentNodeName);
         this.rolePermissions = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new RolePermissionType(null);
             obj.decode(stream1);
@@ -26520,7 +26520,7 @@ const schemaSubscriptionDiagnosticsDataType = buildStructuredType({
         {
             name: "publishingEnabled",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "modifyCount",
@@ -26828,7 +26828,7 @@ export class SubscriptionDiagnosticsDataType extends ExtensionObject {
         encodeUInt32(this.maxKeepAliveCount, stream);
         encodeUInt32(this.maxLifetimeCount, stream);
         encodeUInt32(this.maxNotificationsPerPublish, stream);
-        encodeUABoolean(this.publishingEnabled, stream);
+        encodeBoolean(this.publishingEnabled, stream);
         encodeUInt32(this.modifyCount, stream);
         encodeUInt32(this.enableCount, stream);
         encodeUInt32(this.disableCount, stream);
@@ -26863,7 +26863,7 @@ export class SubscriptionDiagnosticsDataType extends ExtensionObject {
         this.maxKeepAliveCount = decodeUInt32(stream, this.maxKeepAliveCount);
         this.maxLifetimeCount = decodeUInt32(stream, this.maxLifetimeCount);
         this.maxNotificationsPerPublish = decodeUInt32(stream, this.maxNotificationsPerPublish);
-        this.publishingEnabled = decodeUABoolean(stream, this.publishingEnabled);
+        this.publishingEnabled = decodeBoolean(stream, this.publishingEnabled);
         this.modifyCount = decodeUInt32(stream, this.modifyCount);
         this.enableCount = decodeUInt32(stream, this.enableCount);
         this.disableCount = decodeUInt32(stream, this.disableCount);
@@ -27345,7 +27345,7 @@ const schemaTimeZoneDataType = buildStructuredType({
         {
             name: "daylightSavingInOffset",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -27387,13 +27387,13 @@ export class TimeZoneDataType extends ExtensionObject {
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
         encodeInt16(this.offset, stream);
-        encodeUABoolean(this.daylightSavingInOffset, stream);
+        encodeBoolean(this.daylightSavingInOffset, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.offset = decodeInt16(stream, this.offset);
-        this.daylightSavingInOffset = decodeUABoolean(stream, this.daylightSavingInOffset);
+        this.daylightSavingInOffset = decodeBoolean(stream, this.daylightSavingInOffset);
     }
     public get schema(): StructuredTypeSchema { return schemaTimeZoneDataType; }
 }
@@ -27494,7 +27494,7 @@ const schemaTransferSubscriptionsRequest = buildStructuredType({
         {
             name: "sendInitialValues",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -27542,14 +27542,14 @@ export class TransferSubscriptionsRequest extends ExtensionObject {
         /* NEEDED */ super.encode(stream);
         this.requestHeader.encode(stream);
         encodeArray(this.subscriptionIds, stream, encodeUInt32);
-        encodeUABoolean(this.sendInitialValues, stream);
+        encodeBoolean(this.sendInitialValues, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
         this.requestHeader.decode(stream);
         this.subscriptionIds = decodeArray(stream, decodeUInt32);
-        this.sendInitialValues = decodeUABoolean(stream, this.sendInitialValues);
+        this.sendInitialValues = decodeBoolean(stream, this.sendInitialValues);
     }
     public get schema(): StructuredTypeSchema { return schemaTransferSubscriptionsRequest; }
 }
@@ -27881,7 +27881,7 @@ const schemaTransmitQosPriorityDataType = buildStructuredType({
         {
             name: "priorityLabel",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -27917,12 +27917,12 @@ export class TransmitQosPriorityDataType extends TransmitQosDataType {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.priorityLabel, stream);
+        encodeString(this.priorityLabel, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.priorityLabel = decodeUAString(stream, this.priorityLabel);
+        this.priorityLabel = decodeString(stream, this.priorityLabel);
     }
     public get schema(): StructuredTypeSchema { return schemaTransmitQosPriorityDataType; }
 }
@@ -28051,7 +28051,7 @@ const schemaUABinaryFileDataType = buildStructuredType({
         {
             name: "schemaLocation",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "fileHeader",
@@ -28112,14 +28112,14 @@ export class UABinaryFileDataType extends DataTypeSchemaHeader {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.schemaLocation, stream);
+        encodeString(this.schemaLocation, stream);
         encodeArray(this.fileHeader, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeVariant(this.body, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.schemaLocation = decodeUAString(stream, this.schemaLocation);
+        this.schemaLocation = decodeString(stream, this.schemaLocation);
         this.fileHeader = decodeArray(stream, (stream1: BinaryStream) => {
             const obj = new KeyValuePair(null);
             obj.decode(stream1);
@@ -29197,7 +29197,7 @@ const schemaUserManagementDataType = buildStructuredType({
         {
             name: "userName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "userConfiguration",
@@ -29207,7 +29207,7 @@ const schemaUserManagementDataType = buildStructuredType({
         {
             name: "description",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -29253,16 +29253,16 @@ export class UserManagementDataType extends ExtensionObject {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.userName, stream);
+        encodeString(this.userName, stream);
         encodeUserConfigurationMask(this.userConfiguration, stream);
-        encodeUAString(this.description, stream);
+        encodeString(this.description, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.userName = decodeUAString(stream, this.userName);
+        this.userName = decodeString(stream, this.userName);
         this.userConfiguration = decodeUserConfigurationMask(stream, this.userConfiguration);
-        this.description = decodeUAString(stream, this.description);
+        this.description = decodeString(stream, this.description);
     }
 
     // Define Enumeration setters
@@ -29291,7 +29291,7 @@ const schemaUserNameIdentityToken = buildStructuredType({
         {
             name: "userName",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
         {
             name: "password",
@@ -29301,7 +29301,7 @@ const schemaUserNameIdentityToken = buildStructuredType({
         {
             name: "encryptionAlgorithm",
 
-            fieldType: "UAString",
+            fieldType: "String",
         },
     ]
 });
@@ -29347,16 +29347,16 @@ export class UserNameIdentityToken extends UserIdentityToken {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUAString(this.userName, stream);
+        encodeString(this.userName, stream);
         encodeByteString(this.password, stream);
-        encodeUAString(this.encryptionAlgorithm, stream);
+        encodeString(this.encryptionAlgorithm, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.userName = decodeUAString(stream, this.userName);
+        this.userName = decodeString(stream, this.userName);
         this.password = decodeByteString(stream, this.password);
-        this.encryptionAlgorithm = decodeUAString(stream, this.encryptionAlgorithm);
+        this.encryptionAlgorithm = decodeString(stream, this.encryptionAlgorithm);
     }
     public get schema(): StructuredTypeSchema { return schemaUserNameIdentityToken; }
 }
@@ -29410,7 +29410,7 @@ const schemaVariableAttributes = buildStructuredType({
         {
             name: "historizing",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -29488,7 +29488,7 @@ export class VariableAttributes extends NodeAttributes {
         encodeByte(this.accessLevel, stream);
         encodeByte(this.userAccessLevel, stream);
         encodeDouble(this.minimumSamplingInterval, stream);
-        encodeUABoolean(this.historizing, stream);
+        encodeBoolean(this.historizing, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
@@ -29500,7 +29500,7 @@ export class VariableAttributes extends NodeAttributes {
         this.accessLevel = decodeByte(stream, this.accessLevel);
         this.userAccessLevel = decodeByte(stream, this.userAccessLevel);
         this.minimumSamplingInterval = decodeDouble(stream, this.minimumSamplingInterval);
-        this.historizing = decodeUABoolean(stream, this.historizing);
+        this.historizing = decodeBoolean(stream, this.historizing);
     }
     public get schema(): StructuredTypeSchema { return schemaVariableAttributes; }
 }
@@ -29572,7 +29572,7 @@ const schemaVariableNode = buildStructuredType({
         {
             name: "historizing",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "accessLevelEx",
@@ -29690,7 +29690,7 @@ export class VariableNode extends InstanceNode {
         encodeByte(this.accessLevel, stream);
         encodeByte(this.userAccessLevel, stream);
         encodeDouble(this.minimumSamplingInterval, stream);
-        encodeUABoolean(this.historizing, stream);
+        encodeBoolean(this.historizing, stream);
         encodeUInt32(this.accessLevelEx, stream);
     }
     public decode(stream: BinaryStream): void {
@@ -29718,7 +29718,7 @@ export class VariableNode extends InstanceNode {
         this.accessLevel = decodeByte(stream, this.accessLevel);
         this.userAccessLevel = decodeByte(stream, this.userAccessLevel);
         this.minimumSamplingInterval = decodeDouble(stream, this.minimumSamplingInterval);
-        this.historizing = decodeUABoolean(stream, this.historizing);
+        this.historizing = decodeBoolean(stream, this.historizing);
         this.accessLevelEx = decodeUInt32(stream, this.accessLevelEx);
     }
     public get schema(): StructuredTypeSchema { return schemaVariableNode; }
@@ -29758,7 +29758,7 @@ const schemaVariableTypeAttributes = buildStructuredType({
         {
             name: "isAbstract",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -29818,7 +29818,7 @@ export class VariableTypeAttributes extends NodeAttributes {
         encodeNodeId(this.dataType, stream);
         encodeInt32(this.valueRank, stream);
         encodeArray(this.arrayDimensions, stream, encodeUInt32);
-        encodeUABoolean(this.isAbstract, stream);
+        encodeBoolean(this.isAbstract, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
@@ -29827,7 +29827,7 @@ export class VariableTypeAttributes extends NodeAttributes {
         this.dataType = decodeNodeId(stream, this.dataType);
         this.valueRank = decodeInt32(stream, this.valueRank);
         this.arrayDimensions = decodeArray(stream, decodeUInt32);
-        this.isAbstract = decodeUABoolean(stream, this.isAbstract);
+        this.isAbstract = decodeBoolean(stream, this.isAbstract);
     }
     public get schema(): StructuredTypeSchema { return schemaVariableTypeAttributes; }
 }
@@ -29884,7 +29884,7 @@ const schemaVariableTypeNode = buildStructuredType({
         {
             name: "isAbstract",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
     ]
 });
@@ -29974,7 +29974,7 @@ export class VariableTypeNode extends TypeNode {
         encodeNodeId(this.dataType, stream);
         encodeInt32(this.valueRank, stream);
         encodeArray(this.arrayDimensions, stream, encodeUInt32);
-        encodeUABoolean(this.isAbstract, stream);
+        encodeBoolean(this.isAbstract, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
@@ -29998,7 +29998,7 @@ export class VariableTypeNode extends TypeNode {
         this.dataType = decodeNodeId(stream, this.dataType);
         this.valueRank = decodeInt32(stream, this.valueRank);
         this.arrayDimensions = decodeArray(stream, decodeUInt32);
-        this.isAbstract = decodeUABoolean(stream, this.isAbstract);
+        this.isAbstract = decodeBoolean(stream, this.isAbstract);
     }
     public get schema(): StructuredTypeSchema { return schemaVariableTypeNode; }
 }
@@ -30016,7 +30016,7 @@ const schemaViewAttributes = buildStructuredType({
         {
             name: "containsNoLoops",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "eventNotifier",
@@ -30062,13 +30062,13 @@ export class ViewAttributes extends NodeAttributes {
     }
      public encode(stream: OutputBinaryStream): void {
         /* NEEDED */ super.encode(stream);
-        encodeUABoolean(this.containsNoLoops, stream);
+        encodeBoolean(this.containsNoLoops, stream);
         encodeByte(this.eventNotifier, stream);
     }
     public decode(stream: BinaryStream): void {
         // call base class implementation first
         /* NEEDED !!! */ super.decode(stream);
-        this.containsNoLoops = decodeUABoolean(stream, this.containsNoLoops);
+        this.containsNoLoops = decodeBoolean(stream, this.containsNoLoops);
         this.eventNotifier = decodeByte(stream, this.eventNotifier);
     }
     public get schema(): StructuredTypeSchema { return schemaViewAttributes; }
@@ -30105,7 +30105,7 @@ const schemaViewNode = buildStructuredType({
         {
             name: "containsNoLoops",
 
-            fieldType: "UABoolean",
+            fieldType: "Boolean",
         },
         {
             name: "eventNotifier",
@@ -30181,7 +30181,7 @@ export class ViewNode extends InstanceNode {
         encodeArray(this.rolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.userRolePermissions, stream, (obj, stream1) => { obj.encode(stream1); });
         encodeArray(this.references, stream, (obj, stream1) => { obj.encode(stream1); });
-        encodeUABoolean(this.containsNoLoops, stream);
+        encodeBoolean(this.containsNoLoops, stream);
         encodeByte(this.eventNotifier, stream);
     }
     public decode(stream: BinaryStream): void {
@@ -30202,7 +30202,7 @@ export class ViewNode extends InstanceNode {
             obj.decode(stream1);
             return obj;
         });
-        this.containsNoLoops = decodeUABoolean(stream, this.containsNoLoops);
+        this.containsNoLoops = decodeBoolean(stream, this.containsNoLoops);
         this.eventNotifier = decodeByte(stream, this.eventNotifier);
     }
     public get schema(): StructuredTypeSchema { return schemaViewNode; }