diff -uN a/dds-xml_domain_definitions_nonamespace.xsd b/dds-xml_domain_definitions_nonamespace.xsd
--- a/dds-xml_domain_definitions_nonamespace.xsd	2017-02-15 22:16:28.000000000 +0100
+++ b/dds-xml_domain_definitions_nonamespace.xsd	2018-05-12 12:56:05.710623080 +0200
@@ -20,13 +20,6 @@
     <!-- Domain Definition -->
     <!-- ================================================================== -->
 
-    <xs:simpleType name="elementNameReference">
-        <xs:restriction base="xs:string">
-            <xs:whiteSpace value="collapse" />
-            <xs:pattern value="((::)?[a-zA-Z0-9_.])+" />
-        </xs:restriction>
-    </xs:simpleType>
-
     <!-- Register Type -->
 
     <xs:complexType name="registerType">
diff -uN a/dds-xml_qos_definitions_nonamespace.xsd b/dds-xml_qos_definitions_nonamespace.xsd
--- a/dds-xml_qos_definitions_nonamespace.xsd	2017-02-15 19:27:36.000000000 +0100
+++ b/dds-xml_qos_definitions_nonamespace.xsd	2018-05-12 12:55:54.632647762 +0200
@@ -17,6 +17,13 @@
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:simpleType name="elementNameReference">
+        <xs:restriction base="xs:string">
+            <xs:whiteSpace value="collapse" />
+            <xs:pattern value="((::)?[a-zA-Z0-9_.])+" />
+        </xs:restriction>
+    </xs:simpleType>
+
     <xs:simpleType name="topicNameFilter">
         <xs:restriction base="xs:string">
             <xs:pattern value="([a-zA-Z0-9/*_.:])+" />
@@ -319,7 +326,7 @@
         </xs:all>
 
         <xs:attribute name="name" type="elementName" />
-        <xs:attribute name="base_name" type="elementName" />
+        <xs:attribute name="base_name" type="elementNameReference" />
         <xs:attribute name="topic_filter" type="topicNameFilter" />
     </xs:complexType>
 
@@ -336,7 +343,7 @@
         </xs:all>
 
         <xs:attribute name="name" type="elementName" />
-        <xs:attribute name="base_name" type="elementName" />
+        <xs:attribute name="base_name" type="elementNameReference" />
         <xs:attribute name="topic_filter" type="topicNameFilter" />
     </xs:complexType>
 
@@ -353,7 +360,7 @@
         </xs:all>
 
         <xs:attribute name="name" type="elementName" />
-        <xs:attribute name="base_name" type="elementName" />
+        <xs:attribute name="base_name" type="elementNameReference" />
         <xs:attribute name="topic_filter" type="topicNameFilter" />
     </xs:complexType>
 
@@ -388,7 +395,7 @@
         </xs:all>
 
         <xs:attribute name="name" type="elementName"/>
-        <xs:attribute name="base_name" type="elementName"/>
+        <xs:attribute name="base_name" type="elementNameReference"/>
         <xs:attribute name="topic_filter" type="topicNameFilter"/>
     </xs:complexType>
 
@@ -421,7 +428,7 @@
         </xs:all>
 
         <xs:attribute name="name" type="elementName" />
-        <xs:attribute name="base_name" type="elementName" />
+        <xs:attribute name="base_name" type="elementNameReference" />
         <xs:attribute name="topic_filter" type="topicNameFilter" />
     </xs:complexType>
 
@@ -460,7 +467,7 @@
         </xs:all>
 
         <xs:attribute name="name" type="elementName" />
-        <xs:attribute name="base_name" type="elementName" />
+        <xs:attribute name="base_name" type="elementNameReference" />
         <xs:attribute name="topic_filter" type="topicNameFilter" />
     </xs:complexType>
 
@@ -531,7 +538,7 @@
         </xs:sequence>
 
         <xs:attribute name="name" type="elementName" use="required" />
-        <xs:attribute name="base_name" type="elementName" />
+        <xs:attribute name="base_name" type="elementNameReference" />
     </xs:complexType>
 
     <xs:complexType name="qosLibrary">