diff --git a/silecs-model/src/xml/DesignSchema.xsd b/silecs-model/src/xml/DesignSchema.xsd
index bdfac8e6ac21250213960f11fb2e12de4dd6816e..65876435a644fd124c83ac4574d03e86a6853b49 100644
--- a/silecs-model/src/xml/DesignSchema.xsd
+++ b/silecs-model/src/xml/DesignSchema.xsd
@@ -156,14 +156,22 @@ along with this program.  If not, see http://www.gnu.org/licenses/.-->
 							</xs:simpleType>
 						</xs:attribute>
 					</xs:complexType>
-					<xs:unique name="Register-name-per-class">
+					<xs:unique name="Register-name-has-to-be-unique-per-class">
 						<xs:selector xpath="Block/Register"/>
 						<xs:field xpath="@name"/>
 					</xs:unique>
-					<xs:unique name="Block-name-per-class">
+					<xs:unique name="Block-name-has-to-be-unique-per-class">
 						<xs:selector xpath="Block"/>
 						<xs:field xpath="@name"/>
 					</xs:unique>
+					<xs:unique name="Property-name-has-to-be-unique-per-class">
+                        <xs:selector xpath="Block"/>
+                        <xs:field xpath="@fesaPropertyName"/>
+                    </xs:unique>
+                    <xs:unique name="Field-name-has-to-be-unique-per-class">
+                        <xs:selector xpath="Block/Register"/>
+                        <xs:field xpath="@fesaFieldName"/>
+                    </xs:unique>
 				</xs:element>
 			</xs:sequence>
 			<xs:attribute name="silecs-version" type="VersionType" use="required"/>