diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.xml
index f967e0a7..f70509f5 100644
--- a/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.xml
+++ b/SemanticData/UAModelDesignExport.UnitTest/Models/DataTypeTest.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="OPCUAModelDesign.xslt"?>
-<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
+<ModelDesign xmlns:cas="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
   <Namespaces>
     <Namespace Name="cas" Prefix="DataTypeTest" XmlPrefix="cas">http://cas.eu/UA/CommServer/UnitTests/DataTypeTest</Namespace>
     <Namespace Name="ua" XmlPrefix="ua">http://opcfoundation.org/UA/</Namespace>
   </Namespaces>
-  <DataType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q1:AbstractEnumerationDataType" xmlns:q2="http://opcfoundation.org/UA/" BaseType="q2:Enumeration" IsAbstract="true">
+  <DataType SymbolicName="cas:AbstractEnumerationDataType" BaseType="ua:Enumeration" IsAbstract="true">
     <Fields>
       <Field Name="Field1" Identifier="0" />
       <Field Name="Field2" Identifier="1" />
     </Fields>
   </DataType>
-  <DataType xmlns:q3="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q3:EnumerationDataType" BaseType="q3:AbstractEnumerationDataType">
+  <DataType SymbolicName="cas:EnumerationDataType" BaseType="cas:AbstractEnumerationDataType">
     <Description>Enumeration DataType derived from abstract type</Description>
     <Fields>
       <Field Name="Field3" Identifier="1" />
     </Fields>
   </DataType>
-  <DataType xmlns:q4="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q4:AbstractStructure" xmlns:q5="http://opcfoundation.org/UA/" BaseType="q5:Structure" IsAbstract="true">
+  <DataType SymbolicName="cas:AbstractStructure" BaseType="ua:Structure" IsAbstract="true">
     <Description>Abstract structure</Description>
     <Fields>
-      <Field Name="Number" DataType="q5:Number" />
+      <Field Name="Number" DataType="ua:Number" />
     </Fields>
   </DataType>
-  <DataType xmlns:q6="http://cas.eu/UA/CommServer/UnitTests/DataTypeTest" SymbolicName="q6:DerivedStructure" BaseType="q6:AbstractStructure">
+  <DataType SymbolicName="cas:DerivedStructure" BaseType="cas:AbstractStructure">
     <Fields>
-      <Field Name="Number" xmlns:q7="http://opcfoundation.org/UA/" DataType="q7:Int32">
+      <Field Name="Number" DataType="ua:Int32">
         <Description>Derived from Number</Description>
       </Field>
     </Fields>
diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest.xml
index d0887e35..6fc85d94 100644
--- a/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest.xml
+++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ObjectTypeTest.xml
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="OPCUAModelDesign.xslt"?>
-<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
+<ModelDesign xmlns:cas="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
   <Namespaces>
     <Namespace Name="cas" Prefix="ObjectTypeTest" XmlPrefix="cas">http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest</Namespace>
     <Namespace Name="ua" XmlPrefix="ua">http://opcfoundation.org/UA/</Namespace>
   </Namespaces>
-  <ObjectType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q1:ComplexObjectType">
+  <ObjectType SymbolicName="cas:ComplexObjectType">
     <Children>
-      <Object SymbolicName="q1:ChildObject" ModellingRule="MandatoryPlaceholder" SupportsEvents="true" />
-      <Property SymbolicName="q1:BrowseName4node66" ModellingRule="Mandatory" xmlns:q2="http://opcfoundation.org/UA/" DataType="q2:LocalizedText">
+      <Object SymbolicName="cas:ChildObject" ModellingRule="MandatoryPlaceholder" SupportsEvents="true" />
+      <Property SymbolicName="cas:BrowseName4node66" ModellingRule="Mandatory" DataType="ua:LocalizedText">
         <BrowseName>ChildProperty</BrowseName>
       </Property>
-      <Variable SymbolicName="q1:ChildVariable" xmlns:q3="http://opcfoundation.org/UA/" TypeDefinition="q3:AnalogItemType" ModellingRule="Mandatory">
+      <Variable SymbolicName="cas:ChildVariable" TypeDefinition="ua:AnalogItemType" ModellingRule="Mandatory">
         <BrowseName />
       </Variable>
-      <Method SymbolicName="q1:ChildMethod" ModellingRule="Mandatory">
+      <Method SymbolicName="cas:ChildMethod" ModellingRule="Mandatory">
         <InputArguments>
-          <Argument Name="Input1" xmlns:q4="http://opcfoundation.org/UA/" DataType="q4:Int32" />
-          <Argument Name="Input2" xmlns:q5="http://opcfoundation.org/UA/" DataType="q5:Int32" />
+          <Argument Name="Input1" DataType="ua:Int32" />
+          <Argument Name="Input2" DataType="ua:Int32" />
         </InputArguments>
         <OutputArguments>
-          <Argument Name="Output1" xmlns:q6="http://opcfoundation.org/UA/" DataType="q6:Int32" />
+          <Argument Name="Output1" DataType="ua:Int32" />
         </OutputArguments>
       </Method>
     </Children>
   </ObjectType>
-  <ObjectType xmlns:q7="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q7:DerivedFromComplexObjectType" BaseType="q7:ComplexObjectType">
+  <ObjectType SymbolicName="cas:DerivedFromComplexObjectType" BaseType="cas:ComplexObjectType">
     <Children>
-      <Method SymbolicName="q7:ChildMethod">
+      <Method SymbolicName="cas:ChildMethod">
         <DisplayName>ChildMethodNewName</DisplayName>
       </Method>
     </Children>
   </ObjectType>
-  <Object xmlns:q8="http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest" SymbolicName="q8:InstanceOfDerivedFromComplexObjectType" TypeDefinition="q8:DerivedFromComplexObjectType">
+  <Object SymbolicName="cas:InstanceOfDerivedFromComplexObjectType" TypeDefinition="cas:DerivedFromComplexObjectType">
     <References>
       <Reference IsInverse="true">
-        <ReferenceType xmlns:q9="http://opcfoundation.org/UA/">q9:Organizes</ReferenceType>
-        <TargetId xmlns:q10="http://opcfoundation.org/UA/">q10:ObjectsFolder</TargetId>
+        <ReferenceType>ua:Organizes</ReferenceType>
+        <TargetId>ua:ObjectsFolder</TargetId>
       </Reference>
     </References>
   </Object>
diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest.xml
index 78422ef6..61b04122 100644
--- a/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest.xml
+++ b/SemanticData/UAModelDesignExport.UnitTest/Models/ReferenceTest.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="OPCUAModelDesign.xslt"?>
-<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
+<ModelDesign xmlns:cas="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
   <Namespaces>
     <Namespace Name="cas" Prefix="ReferenceTest" XmlPrefix="cas">http://cas.eu/UA/CommServer/UnitTests/ReferenceTest</Namespace>
     <Namespace Name="ua" XmlPrefix="ua">http://opcfoundation.org/UA/</Namespace>
   </Namespaces>
-  <ReferenceType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/ReferenceTest" SymbolicName="q1:ReferenceTypeTest" xmlns:q2="http://opcfoundation.org/UA/" BaseType="q2:HasProperty" Symmetric="false">
+  <ReferenceType SymbolicName="cas:ReferenceTypeTest" BaseType="ua:HasProperty" Symmetric="false">
     <InverseName>FromSomwhere</InverseName>
   </ReferenceType>
 </ModelDesign>
\ No newline at end of file
diff --git a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest.xml b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest.xml
index b3dacf41..40e6e0e6 100644
--- a/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest.xml
+++ b/SemanticData/UAModelDesignExport.UnitTest/Models/VariableTypeTest.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="OPCUAModelDesign.xslt"?>
-<ModelDesign xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
+<ModelDesign xmlns:cas="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" xmlns="http://opcfoundation.org/UA/ModelDesign.xsd">
   <Namespaces>
     <Namespace Name="cas" Prefix="VariableTypeTest" XmlPrefix="cas">http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest</Namespace>
     <Namespace Name="ua" XmlPrefix="ua">http://opcfoundation.org/UA/</Namespace>
   </Namespaces>
-  <VariableType xmlns:q1="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" SymbolicName="q1:ComplexVariableType" xmlns:q2="http://opcfoundation.org/UA/" BaseType="q2:AnalogItemType">
+  <VariableType SymbolicName="cas:ComplexVariableType" BaseType="ua:AnalogItemType">
     <Children>
-      <Property SymbolicName="q1:VariableChild" ModellingRule="Mandatory" DataType="q2:Int32" AccessLevel="Write" />
-      <Property SymbolicName="q2:EURange">
+      <Property SymbolicName="cas:VariableChild" ModellingRule="Mandatory" DataType="ua:Int32" AccessLevel="Write" />
+      <Property SymbolicName="ua:EURange">
         <DisplayName> NewDisplayName</DisplayName>
       </Property>
     </Children>
   </VariableType>
-  <VariableType xmlns:q3="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" SymbolicName="q3:ArrayVariableType" xmlns:q4="http://opcfoundation.org/UA/" DataType="q4:Int32" ValueRank="OneOrMoreDimensions" ArrayDimensions="0,0,0" />
-  <VariableType xmlns:q5="http://cas.eu/UA/CommServer/UnitTests/VariableTypeTest" SymbolicName="q5:SimpleVariableWithValueType" xmlns:q6="http://opcfoundation.org/UA/" DataType="q6:Int32">
+  <VariableType SymbolicName="cas:ArrayVariableType" DataType="ua:Int32" ValueRank="OneOrMoreDimensions" ArrayDimensions="0,0,0" />
+  <VariableType SymbolicName="cas:SimpleVariableWithValueType" DataType="ua:Int32">
     <DefaultValue>
       <Int32 xmlns="http://opcfoundation.org/UA/2008/02/Types.xsd">1</Int32>
     </DefaultValue>