diff --git a/silecs-model/src/xml/DesignSchema.xsd b/silecs-model/src/xml/DesignSchema.xsd
index 1fa8455298619adc785ecae719836bae0dc2218d..ed52412e0a6ccd4c4713afbea641e5168d17b7e8 100644
--- a/silecs-model/src/xml/DesignSchema.xsd
+++ b/silecs-model/src/xml/DesignSchema.xsd
@@ -110,20 +110,20 @@ along with this program.  If not, see http://www.gnu.org/licenses/.-->
 							</xs:simpleType>
 						</xs:attribute>
 					</xs:complexType>
-					<xs:unique name="Register-name-has-to-be-unique-per-class">
-						<xs:selector xpath="Block/Register"/>
+					<xs:unique name="Register-name-has-to-be-unique">
+						<xs:selector xpath="*/*"/>
 						<xs:field xpath="@name"/>
 					</xs:unique>
-					<xs:unique name="Block-name-has-to-be-unique-per-class">
-						<xs:selector xpath="Block"/>
+					<xs:unique name="Block-name-has-to-be-unique">
+						<xs:selector xpath="*"/>
 						<xs:field xpath="@name"/>
 					</xs:unique>
-					<xs:unique name="Property-name-has-to-be-unique-per-class">
-                        <xs:selector xpath="Block"/>
+					<xs:unique name="Property-name-has-to-be-unique">
+                        <xs:selector xpath="*"/>
                         <xs:field xpath="@fesaPropertyName"/>
                     </xs:unique>
-                    <xs:unique name="Field-name-has-to-be-unique-per-class">
-                        <xs:selector xpath="Block/Register"/>
+                    <xs:unique name="Field-name-has-to-be-unique">
+                        <xs:selector xpath="*/*"/>
                         <xs:field xpath="@fesaFieldName"/>
                     </xs:unique>
 				</xs:element>