Merge branch 'RDM-2019-0010-SDT_4_0_–_Align_types_of_names_and_identifiers'...

Merge branch 'RDM-2019-0010-SDT_4_0_–_Align_types_of_names_and_identifiers' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png

SDT/schema4.0/docs/SDT_UML.uxf

@@ -121,7 +121,7 @@ m1=0..1
     </coordinates>
     <panel_attributes>DataType
 --
-/@ name : text/
+/@ name : Name/
 /@ unitOfMeasure : text/
 /- Doc : Doc/
 /- semanticURI : uri/
@@ -194,7 +194,7 @@ m1= 1
     </coordinates>
     <panel_attributes>Constraint
 --
-*@ name : text*
+*@ name : Name*
 /@ type : BasicType/
 /@ value : text/
 /- Doc : Doc/
@@ -310,7 +310,7 @@ lw=0.1</panel_attributes>
     </coordinates>
     <panel_attributes>ModuleClass
 --
-*@ name : text*
+*@ name : Name*
 /@ optional : boolean = false/
 /- Doc : Doc/
 /- semanticURI : uri/
@@ -333,7 +333,7 @@ fg=blue
     </coordinates>
     <panel_attributes>Action
 --
-*@ name : text*
+*@ name : Name*
 /@ optional : boolean = false/
 /- Doc : Doc/
 /- semanticURI : uri/
@@ -352,7 +352,7 @@ fg=blue</panel_attributes>
     </coordinates>
     <panel_attributes>Arg
 --
-*@ name : text*
+*@ name : Name*
 /@ optional : boolean = false/
 /@ default : text/
 /- Doc : Doc/
@@ -383,7 +383,7 @@ m1= 0..n</panel_attributes>
     </coordinates>
     <panel_attributes>Domain
 --
-*@ id : ID*
+*@ id : Name*
 /- Doc : Doc/
 /- semanticURI : uri/
 /* Imports/
@@ -509,7 +509,7 @@ m1= 0..n
     </coordinates>
     <panel_attributes>DataPoint
 --
-*@ name : text*
+*@ name : Name*
 /@ optional : boolean = false/
 /@ writable : boolean = true/
 /@ readable : boolean = true/
@@ -533,7 +533,7 @@ fg=blue
     </coordinates>
     <panel_attributes>Event
 --
-*@ name : text*
+*@ name : Name*
 /@ optional : boolean = false/
 /- Doc : Doc/
 /- semanticURI : uri/
@@ -632,7 +632,7 @@ m1= 0..n</panel_attributes>
     </coordinates>
     <panel_attributes>Property
 --
-*@ name : text*
+*@ name : Name*
 /@ optional : boolean = false/
 /@ value : text/
 /- Doc : Doc/
@@ -717,7 +717,7 @@ m1= 1
 /* SubDevices : SubDevice/
 /- DeviceClass/
 /   @domain : IDRF/
-/   @class : id /
+/   @class : Name /
 /   -ImplementedProperties : Property /
 /   -ImplementedModuleClasses : ModuleClass  /
 /- extends : Extends/
@@ -810,7 +810,7 @@ m1=0..1
     </coordinates>
     <panel_attributes>EnumValue
 --
-*@ name : text*
+*@ name : Name*
 *@ value : value*
 /@ type : BasicType = integer/
 /- Doc : Doc/
@@ -854,7 +854,7 @@ m1=0..1</panel_attributes>
     <panel_attributes>Extends
 --
 *@domain : IDRF*
-*@class : id*
+*@class : Name*
 /- exclude : Exclude/
 
 fg=blue</panel_attributes>
@@ -870,7 +870,7 @@ fg=blue</panel_attributes>
     </coordinates>
     <panel_attributes>Exclude
 --
-*@name : text*
+*@name : Name*
 /@type : text = datapoint/
 fg=blue</panel_attributes>
     <additional_attributes/>