diff --git a/src/XmlMNaming/XmlMNaming.cdl b/src/XmlMNaming/XmlMNaming.cdl
index 5c1b2676c2..0a865317c4 100644
--- a/src/XmlMNaming/XmlMNaming.cdl
+++ b/src/XmlMNaming/XmlMNaming.cdl
@@ -33,9 +33,6 @@ is
     class NamingDriver;
 
     class Shape1;
-    
-    class Array1OfShape1 instantiates Array1 from XmlObjMgt
-                (Shape1 from XmlMNaming);
 
     AddDrivers (aDriverTable  : ADriverTable  from XmlMDF;
                 aMessageDriver: MessageDriver from CDM);
diff --git a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx
index 0f1d3845f5..7a90be70ff 100644
--- a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx
+++ b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx
@@ -18,7 +18,7 @@
 #include <XmlMNaming_NamedShapeDriver.ixx>
 
 #include <XmlObjMgt.hxx>
-#include <XmlMNaming_Array1OfShape1.hxx>
+#include <XmlObjMgt_Array1.hxx>
 #include <XmlMNaming_Shape1.hxx>
 
 #include <TDF_Label.hxx>
@@ -103,8 +103,8 @@ Standard_Boolean XmlMNaming_NamedShapeDriver::Paste
   // apres creation Builder qui a mis la version a 1 :
   aTarget -> SetVersion (aVersion);
 
-  const XmlMNaming_Array1OfShape1 OldPShapes (anElement, ::OldsString());
-  const XmlMNaming_Array1OfShape1 NewPShapes (anElement, ::NewsString());
+  const XmlObjMgt_Array1 OldPShapes (anElement, ::OldsString());
+  const XmlObjMgt_Array1 NewPShapes (anElement, ::NewsString());
   if (NewPShapes.Length() == 0 && OldPShapes.Length() == 0)
     return Standard_True;
 
@@ -198,7 +198,7 @@ void XmlMNaming_NamedShapeDriver::Paste (const Handle(TDF_Attribute)& theSource,
   }
 
   BRepTools_ShapeSet& aShapeSet = (BRepTools_ShapeSet&) myShapeSet;
-  XmlMNaming_Array1OfShape1 OldPShapes (1,NbShapes), NewPShapes (1,NbShapes);
+  XmlObjMgt_Array1 OldPShapes (1,NbShapes), NewPShapes (1,NbShapes);
 
   OldPShapes.CreateArrayElement (theTarget, ::OldsString());
   NewPShapes.CreateArrayElement (theTarget, ::NewsString());
diff --git a/src/XmlObjMgt/XmlObjMgt.cdl b/src/XmlObjMgt/XmlObjMgt.cdl
index 62c9a7dd08..3c6ed3bf71 100644
--- a/src/XmlObjMgt/XmlObjMgt.cdl
+++ b/src/XmlObjMgt/XmlObjMgt.cdl
@@ -41,7 +41,7 @@ is
     -- Retrieval Relocation Table
     alias RRelocationTable is DataMapOfIntegerTransient from TColStd;
 
-    generic class Array1; 
+    class Array1; 
 
     -- Package methods
     IdString returns DOMString from XmlObjMgt;
diff --git a/src/XmlObjMgt/XmlObjMgt_Array1.cdl b/src/XmlObjMgt/XmlObjMgt_Array1.cdl
index c67dc433b7..ca95826279 100644
--- a/src/XmlObjMgt/XmlObjMgt_Array1.cdl
+++ b/src/XmlObjMgt/XmlObjMgt_Array1.cdl
@@ -14,7 +14,7 @@
 -- Alternatively, this file may be used under the terms of Open CASCADE
 -- commercial license or contractual agreement.
 
-generic class Array1 from XmlObjMgt  (Item as Storable) 
+class Array1 from XmlObjMgt
 
         ---Purpose: The class Array1 represents unidimensionnal 
         -- array of fixed size known at run time. 
diff --git a/src/XmlObjMgt/XmlObjMgt_Array1.gxx b/src/XmlObjMgt/XmlObjMgt_Array1.cxx
similarity index 98%
rename from src/XmlObjMgt/XmlObjMgt_Array1.gxx
rename to src/XmlObjMgt/XmlObjMgt_Array1.cxx
index 12ba063248..f603e71a68 100644
--- a/src/XmlObjMgt/XmlObjMgt_Array1.gxx
+++ b/src/XmlObjMgt/XmlObjMgt_Array1.cxx
@@ -14,9 +14,11 @@
 // commercial license or contractual agreement.
 
 //AGV 130202: Changed prototype LDOM_Node::getOwnerDocument()
+#include <XmlObjMgt_Array1.ixx>
 
 #include <XmlObjMgt.hxx>
 #include <XmlObjMgt_DOMString.hxx>
+#include <XmlObjMgt_Document.hxx>
 #include <TCollection_AsciiString.hxx>
 
 IMPLEMENT_DOMSTRING (LowerString, "lower")