diff --git a/public/FWEArea/v2.1/XSD/FWEArea.xsd b/public/FWEArea/v2.1/XSD/FWEArea.xsd
index d8c938af0067b99ba9876ca8c1db00579c353490..3d4d61ce667ce72814378da51e774f4729fa4ccd 100644
--- a/public/FWEArea/v2.1/XSD/FWEArea.xsd
+++ b/public/FWEArea/v2.1/XSD/FWEArea.xsd
@@ -92,7 +92,7 @@
   </element>
   <complexType name="FWEAreaType">
     <complexContent>
-      <extension base="core:_CityObjectType">
+      <extension base="core:AbstractCityObjectType">
         <sequence>
           <element minOccurs="0" name="fweAreaName" type="string">
             <annotation>
diff --git a/public/FWESystem/v2.1/XSD/FWESystem.xsd b/public/FWESystem/v2.1/XSD/FWESystem.xsd
index aaf7bbb2cd7dcb219cc3874a35f00ba7b5afec4e..765aa38f326b525d4d87e593bda95f34745c46f2 100644
--- a/public/FWESystem/v2.1/XSD/FWESystem.xsd
+++ b/public/FWESystem/v2.1/XSD/FWESystem.xsd
@@ -45,7 +45,7 @@
   </element>
   <complexType name="FWESystemType">
     <complexContent>
-      <extension base="core:_CityObjectType">
+      <extension base="core:AbstractCityObjectType">
         <sequence>
           <element minOccurs="0" name="fweSystemName" type="string">
             <annotation>