From 6e33d3ced24d90956b61626c9c57df0154e8dc20 Mon Sep 17 00:00:00 2001
From: abv <abv@opencascade.com>
Date: Tue, 15 Apr 2014 08:50:00 +0400
Subject: [PATCH] 0024830: Remove redundant keyword 'mutable' in CDL
 declarations

Redundant keyword 'mutable' removed in CDL files.
In IGESConvGeom_GeomBuilder, unused methods MakeXY() and MakeXYZ() removed.
Method StepAP214_AutoDesignGroupAssignment::Init() replicating same method of the base class is removed as it causes CDL extraction error after above (seemingly irrelevant) changes.
---
 src/AIS/AIS.cdl                               |  8 +-
 src/AIS/AIS_AttributeFilter.cdl               |  6 +-
 src/AIS/AIS_Axis.cdl                          | 14 +--
 src/AIS/AIS_BadEdgeFilter.cdl                 |  2 +-
 src/AIS/AIS_C0RegularityFilter.cdl            |  2 +-
 src/AIS/AIS_Chamf2dDimension.cdl              | 12 +--
 src/AIS/AIS_Chamf3dDimension.cdl              | 12 +--
 src/AIS/AIS_Circle.cdl                        | 20 ++---
 src/AIS/AIS_ConcentricRelation.cdl            | 10 +--
 src/AIS/AIS_ConnectedInteractive.cdl          | 12 +--
 src/AIS/AIS_ConnectedShape.cdl                | 14 +--
 src/AIS/AIS_DimensionOwner.cdl                |  2 +-
 src/AIS/AIS_Drawer.cdl                        | 38 ++++----
 src/AIS/AIS_EqualDistanceRelation.cdl         | 16 ++--
 src/AIS/AIS_EqualRadiusRelation.cdl           | 10 +--
 src/AIS/AIS_ExclusionFilter.cdl               |  6 +-
 src/AIS/AIS_FixRelation.cdl                   | 16 ++--
 src/AIS/AIS_GlobalStatus.cdl                  |  4 +-
 src/AIS/AIS_IdenticRelation.cdl               | 22 ++---
 src/AIS/AIS_InteractiveContext.cdl            |  4 +-
 src/AIS/AIS_Line.cdl                          | 20 ++---
 src/AIS/AIS_LocalContext.cdl                  |  4 +-
 src/AIS/AIS_LocalStatus.cdl                   |  2 +-
 src/AIS/AIS_MaxRadiusDimension.cdl            | 16 ++--
 src/AIS/AIS_MidPointRelation.cdl              | 16 ++--
 src/AIS/AIS_MinRadiusDimension.cdl            | 16 ++--
 src/AIS/AIS_MultipleConnectedInteractive.cdl  | 10 +--
 src/AIS/AIS_MultipleConnectedShape.cdl        | 12 +--
 src/AIS/AIS_OffsetDimension.cdl               | 16 ++--
 src/AIS/AIS_ParallelRelation.cdl              | 16 ++--
 src/AIS/AIS_PerpendicularRelation.cdl         | 16 ++--
 src/AIS/AIS_Plane.cdl                         | 16 ++--
 src/AIS/AIS_PlaneTrihedron.cdl                | 10 +--
 src/AIS/AIS_Point.cdl                         | 10 +--
 src/AIS/AIS_Relation.cdl                      |  6 +-
 src/AIS/AIS_Selection.cdl                     |  6 +-
 src/AIS/AIS_Shape.cdl                         | 12 +--
 src/AIS/AIS_SignatureFilter.cdl               |  2 +-
 src/AIS/AIS_SymmetricRelation.cdl             | 16 ++--
 src/AIS/AIS_TangentRelation.cdl               | 14 +--
 src/AIS/AIS_Triangulation.cdl                 |  4 +-
 src/AIS/AIS_Trihedron.cdl                     | 10 +--
 src/AIS/AIS_TypeFilter.cdl                    |  2 +-
 .../APIHeaderSection_MakeHeader.cdl           |  5 +-
 src/Adaptor2d/Adaptor2d_GenHCurve2d.cdl       |  4 +-
 src/Adaptor3d/Adaptor3d_GenHCurve.cdl         |  4 +-
 src/Adaptor3d/Adaptor3d_GenHSurface.cdl       |  4 +-
 src/Adaptor3d/Adaptor3d_HVertex.cdl           |  6 +-
 src/Adaptor3d/Adaptor3d_TopolTool.cdl         |  8 +-
 src/AppStd/AppStd_Application.cdl             |  2 +-
 src/AppStdL/AppStdL_Application.cdl           |  2 +-
 src/Approx/Approx_CurvlinFunc.cdl             |  6 +-
 src/Aspect/Aspect_CircularGrid.cdl            |  2 +-
 src/Aspect/Aspect_ColorCubeColorMap.cdl       |  2 +-
 src/Aspect/Aspect_ColorRampColorMap.cdl       |  4 +-
 src/Aspect/Aspect_Driver.cdl                  | 10 +--
 src/Aspect/Aspect_FontMap.cdl                 |  2 +-
 src/Aspect/Aspect_GenericColorMap.cdl         |  2 +-
 src/Aspect/Aspect_MarkMap.cdl                 |  2 +-
 src/Aspect/Aspect_RectangularGrid.cdl         |  2 +-
 src/Aspect/Aspect_TypeMap.cdl                 |  2 +-
 src/Aspect/Aspect_WidthMap.cdl                |  2 +-
 src/BOPDS/BOPDS_PaveBlock.cdl                 |  4 +-
 src/BOPInt/BOPInt_Context.cdl                 |  2 +-
 src/BOPTest/BOPTest_DrawableShape.cdl         |  4 +-
 src/BRep/BRep_Curve3D.cdl                     |  4 +-
 src/BRep/BRep_CurveOn2Surfaces.cdl            |  4 +-
 src/BRep/BRep_CurveOnClosedSurface.cdl        |  4 +-
 src/BRep/BRep_CurveOnSurface.cdl              |  4 +-
 src/BRep/BRep_CurveRepresentation.cdl         |  2 +-
 src/BRep/BRep_PointOnCurve.cdl                |  2 +-
 src/BRep/BRep_PointOnCurveOnSurface.cdl       |  2 +-
 src/BRep/BRep_PointOnSurface.cdl              |  2 +-
 src/BRep/BRep_Polygon3D.cdl                   |  4 +-
 src/BRep/BRep_PolygonOnClosedSurface.cdl      |  4 +-
 .../BRep_PolygonOnClosedTriangulation.cdl     |  4 +-
 src/BRep/BRep_PolygonOnSurface.cdl            |  4 +-
 src/BRep/BRep_PolygonOnTriangulation.cdl      |  4 +-
 src/BRep/BRep_TEdge.cdl                       |  4 +-
 src/BRep/BRep_TFace.cdl                       |  4 +-
 src/BRep/BRep_TVertex.cdl                     |  4 +-
 src/BRepAlgo/BRepAlgo_AsDes.cdl               |  2 +-
 src/BRepApprox/BRepApprox_ApproxLine.cdl      |  4 +-
 src/BRepBlend/BRepBlend_Line.cdl              |  2 +-
 .../BRepBuilderAPI_FindPlane.cdl              |  2 +-
 src/BRepCheck/BRepCheck_Edge.cdl              |  2 +-
 src/BRepCheck/BRepCheck_Face.cdl              |  2 +-
 src/BRepCheck/BRepCheck_Shell.cdl             |  2 +-
 src/BRepCheck/BRepCheck_Vertex.cdl            |  2 +-
 src/BRepCheck/BRepCheck_Wire.cdl              |  2 +-
 .../BRepFilletAPI_LocalOperation.cdl          |  2 +-
 .../BRepFilletAPI_MakeChamfer.cdl             |  2 +-
 .../BRepFilletAPI_MakeFillet.cdl              |  4 +-
 src/BRepLib/BRepLib_FindSurface.cdl           |  2 +-
 .../BRepMesh_DataStructureOfDelaun.cdl        |  2 +-
 src/BRepMesh/BRepMesh_FaceAttribute.cdl       |  2 +-
 src/BRepMesh/BRepMesh_FastDiscret.cdl         |  4 +-
 src/BRepMesh/BRepMesh_FastDiscretFace.cdl     |  2 +-
 src/BRepOffset/BRepOffset_Inter2d.cdl         |  4 +-
 src/BRepOffset/BRepOffset_Inter3d.cdl         |  2 +-
 src/BRepToIGES/BRepToIGES_BRShell.cdl         |  6 +-
 src/BRepToIGES/BRepToIGES_BRSolid.cdl         |  8 +-
 src/BRepToIGES/BRepToIGES_BRWire.cdl          | 20 ++---
 src/BRepToIGESBRep/BRepToIGESBRep_Entity.cdl  | 16 ++--
 src/BRepTools/BRepTools_GTrsfModification.cdl |  2 +-
 .../BRepTools_NurbsConvertModification.cdl    |  2 +-
 src/BRepTools/BRepTools_ReShape.cdl           |  2 +-
 src/BRepTools/BRepTools_TrsfModification.cdl  |  2 +-
 src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cdl |  4 +-
 src/BRepTopAdaptor/BRepTopAdaptor_Tool.cdl    |  4 +-
 .../BRepTopAdaptor_TopolTool.cdl              |  8 +-
 .../BinDrivers_DocumentRetrievalDriver.cdl    |  2 +-
 .../BinDrivers_DocumentStorageDriver.cdl      |  2 +-
 .../BinLDrivers_DocumentRetrievalDriver.cdl   |  2 +-
 .../BinLDrivers_DocumentStorageDriver.cdl     |  2 +-
 src/BinMDF/BinMDF_ADriver.cdl                 |  4 +-
 src/BinMDF/BinMDF_ADriverTable.cdl            |  2 +-
 src/BinMDF/BinMDF_ReferenceDriver.cdl         |  6 +-
 src/BinMDF/BinMDF_TagSourceDriver.cdl         |  6 +-
 .../BinMDataStd_AsciiStringDriver.cdl         |  6 +-
 .../BinMDataStd_BooleanArrayDriver.cdl        |  6 +-
 .../BinMDataStd_BooleanListDriver.cdl         |  6 +-
 .../BinMDataStd_ByteArrayDriver.cdl           |  6 +-
 src/BinMDataStd/BinMDataStd_CommentDriver.cdl |  6 +-
 .../BinMDataStd_DirectoryDriver.cdl           |  6 +-
 .../BinMDataStd_ExpressionDriver.cdl          |  6 +-
 .../BinMDataStd_ExtStringArrayDriver.cdl      |  6 +-
 .../BinMDataStd_ExtStringListDriver.cdl       |  6 +-
 .../BinMDataStd_IntPackedMapDriver.cdl        |  6 +-
 .../BinMDataStd_IntegerArrayDriver.cdl        |  6 +-
 src/BinMDataStd/BinMDataStd_IntegerDriver.cdl |  6 +-
 .../BinMDataStd_IntegerListDriver.cdl         |  6 +-
 src/BinMDataStd/BinMDataStd_NameDriver.cdl    |  6 +-
 .../BinMDataStd_NamedDataDriver.cdl           |  6 +-
 .../BinMDataStd_NoteBookDriver.cdl            |  6 +-
 .../BinMDataStd_RealArrayDriver.cdl           |  6 +-
 src/BinMDataStd/BinMDataStd_RealDriver.cdl    |  6 +-
 .../BinMDataStd_RealListDriver.cdl            |  6 +-
 .../BinMDataStd_ReferenceArrayDriver.cdl      |  6 +-
 .../BinMDataStd_ReferenceListDriver.cdl       |  6 +-
 .../BinMDataStd_RelationDriver.cdl            |  6 +-
 src/BinMDataStd/BinMDataStd_TickDriver.cdl    |  6 +-
 .../BinMDataStd_TreeNodeDriver.cdl            |  6 +-
 .../BinMDataStd_UAttributeDriver.cdl          |  6 +-
 .../BinMDataStd_VariableDriver.cdl            |  6 +-
 src/BinMDataXtd/BinMDataXtd_AxisDriver.cdl    |  6 +-
 .../BinMDataXtd_ConstraintDriver.cdl          |  6 +-
 .../BinMDataXtd_GeometryDriver.cdl            |  6 +-
 .../BinMDataXtd_PatternStdDriver.cdl          |  6 +-
 .../BinMDataXtd_PlacementDriver.cdl           |  6 +-
 src/BinMDataXtd/BinMDataXtd_PlaneDriver.cdl   |  6 +-
 src/BinMDataXtd/BinMDataXtd_PointDriver.cdl   |  6 +-
 src/BinMDataXtd/BinMDataXtd_ShapeDriver.cdl   |  6 +-
 src/BinMDocStd/BinMDocStd_XLinkDriver.cdl     |  6 +-
 .../BinMFunction_FunctionDriver.cdl           |  6 +-
 .../BinMFunction_GraphNodeDriver.cdl          |  6 +-
 src/BinMFunction/BinMFunction_ScopeDriver.cdl |  6 +-
 .../BinMNaming_NamedShapeDriver.cdl           |  6 +-
 src/BinMNaming/BinMNaming_NamingDriver.cdl    |  6 +-
 .../BinMPrsStd_AISPresentationDriver.cdl      |  6 +-
 src/BinMPrsStd/BinMPrsStd_PositionDriver.cdl  |  6 +-
 src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cdl    |  6 +-
 .../BinMXCAFDoc_CentroidDriver.cdl            |  6 +-
 src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cdl   |  6 +-
 .../BinMXCAFDoc_ColorToolDriver.cdl           |  6 +-
 src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cdl   |  6 +-
 src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cdl  |  6 +-
 .../BinMXCAFDoc_DimTolToolDriver.cdl          |  6 +-
 .../BinMXCAFDoc_DocumentToolDriver.cdl        |  6 +-
 .../BinMXCAFDoc_GraphNodeDriver.cdl           |  6 +-
 .../BinMXCAFDoc_LayerToolDriver.cdl           |  6 +-
 .../BinMXCAFDoc_LocationDriver.cdl            |  6 +-
 .../BinMXCAFDoc_MaterialDriver.cdl            |  6 +-
 .../BinMXCAFDoc_MaterialToolDriver.cdl        |  6 +-
 .../BinMXCAFDoc_ShapeToolDriver.cdl           |  6 +-
 src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cdl  |  6 +-
 ...BinXCAFDrivers_DocumentRetrievalDriver.cdl |  2 +-
 .../BinXCAFDrivers_DocumentStorageDriver.cdl  |  2 +-
 src/Bisector/Bisector_Bisec.cdl               |  2 +-
 src/Bisector/Bisector_BisecAna.cdl            |  4 +-
 src/Bisector/Bisector_BisecCC.cdl             |  8 +-
 src/Bisector/Bisector_BisecPC.cdl             |  8 +-
 src/CDF/CDF_Application.cdl                   |  6 +-
 src/CDF/CDF_Directory.cdl                     |  2 +-
 src/CDF/CDF_Session.cdl                       |  8 +-
 src/CDF/CDF_StoreList.cdl                     |  2 +-
 src/CDM/CDM_Application.cdl                   |  2 +-
 src/CDM/CDM_NullMessageDriver.cdl             |  2 +-
 src/CDM/CDM_Reference.cdl                     |  4 +-
 src/ChFi3d/ChFi3d_Builder.cdl                 |  2 +-
 src/ChFi3d/ChFi3d_ChBuilder.cdl               |  4 +-
 src/ChFi3d/ChFi3d_FilBuilder.cdl              |  6 +-
 src/ChFiDS/ChFiDS_ChamfSpine.cdl              |  4 +-
 src/ChFiDS/ChFiDS_ElSpine.cdl                 |  4 +-
 src/ChFiDS/ChFiDS_FilSpine.cdl                | 10 +--
 src/ChFiDS/ChFiDS_Spine.cdl                   | 10 +--
 src/ChFiDS/ChFiDS_Stripe.cdl                  |  2 +-
 src/ChFiDS/ChFiDS_SurfData.cdl                |  4 +-
 src/DBC/DBC_VArray.cdl                        |  4 +-
 src/DBRep/DBRep_DrawableShape.cdl             |  4 +-
 src/DBRep/DBRep_Edge.cdl                      |  2 +-
 src/DBRep/DBRep_Face.cdl                      |  2 +-
 src/DBRep/DBRep_IsoBuilder.cdl                |  2 +-
 src/DDF/DDF_Browser.cdl                       |  4 +-
 src/DDF/DDF_Data.cdl                          |  4 +-
 src/DDataStd/DDataStd_DrawPresentation.cdl    |  8 +-
 src/DDataStd/DDataStd_TreeBrowser.cdl         |  4 +-
 src/DDocStd/DDocStd_DrawDocument.cdl          |  4 +-
 .../DNaming_BooleanOperationDriver.cdl        |  2 +-
 src/DNaming/DNaming_BoxDriver.cdl             |  2 +-
 src/DNaming/DNaming_CylinderDriver.cdl        |  2 +-
 src/DNaming/DNaming_FilletDriver.cdl          |  2 +-
 src/DNaming/DNaming_Line3DDriver.cdl          |  2 +-
 src/DNaming/DNaming_PointDriver.cdl           |  2 +-
 src/DNaming/DNaming_PrismDriver.cdl           |  2 +-
 src/DNaming/DNaming_RevolutionDriver.cdl      |  2 +-
 src/DNaming/DNaming_SelectionDriver.cdl       |  2 +-
 src/DNaming/DNaming_SphereDriver.cdl          |  2 +-
 src/DNaming/DNaming_TransformationDriver.cdl  |  2 +-
 src/Dico/Dico_Dictionary.cdl                  | 24 +++---
 src/Draft/Draft_Modification.cdl              |  6 +-
 src/Draw/Draw_Axis2D.cdl                      |  6 +-
 src/Draw/Draw_Axis3D.cdl                      |  6 +-
 src/Draw/Draw_Box.cdl                         |  2 +-
 src/Draw/Draw_Chronometer.cdl                 |  4 +-
 src/Draw/Draw_Circle2D.cdl                    |  2 +-
 src/Draw/Draw_Circle3D.cdl                    |  2 +-
 src/Draw/Draw_Drawable3D.cdl                  |  2 +-
 src/Draw/Draw_Grid.cdl                        |  2 +-
 src/Draw/Draw_Marker2D.cdl                    |  4 +-
 src/Draw/Draw_Marker3D.cdl                    |  4 +-
 src/Draw/Draw_Number.cdl                      |  4 +-
 src/Draw/Draw_Segment2D.cdl                   |  2 +-
 src/Draw/Draw_Segment3D.cdl                   |  2 +-
 src/Draw/Draw_Text2D.cdl                      |  4 +-
 src/Draw/Draw_Text3D.cdl                      |  4 +-
 src/DrawDim/DrawDim_Angle.cdl                 |  2 +-
 src/DrawDim/DrawDim_Distance.cdl              |  4 +-
 src/DrawDim/DrawDim_PlanarAngle.cdl           |  4 +-
 src/DrawDim/DrawDim_PlanarDiameter.cdl        |  4 +-
 src/DrawDim/DrawDim_PlanarDistance.cdl        |  4 +-
 src/DrawDim/DrawDim_PlanarRadius.cdl          |  4 +-
 src/DrawDim/DrawDim_Radius.cdl                |  2 +-
 src/DrawFairCurve/DrawFairCurve_Batten.cdl    |  2 +-
 .../DrawFairCurve_MinimalVariation.cdl        |  2 +-
 src/DrawTrSurf/DrawTrSurf_BSplineCurve.cdl    |  6 +-
 src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cdl  |  6 +-
 src/DrawTrSurf/DrawTrSurf_BSplineSurface.cdl  |  8 +-
 src/DrawTrSurf/DrawTrSurf_BezierCurve.cdl     |  6 +-
 src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cdl   |  6 +-
 src/DrawTrSurf/DrawTrSurf_BezierSurface.cdl   |  6 +-
 src/DrawTrSurf/DrawTrSurf_Curve.cdl           |  6 +-
 src/DrawTrSurf/DrawTrSurf_Curve2d.cdl         |  6 +-
 src/DrawTrSurf/DrawTrSurf_Point.cdl           |  6 +-
 src/DrawTrSurf/DrawTrSurf_Polygon2D.cdl       |  4 +-
 src/DrawTrSurf/DrawTrSurf_Polygon3D.cdl       |  4 +-
 src/DrawTrSurf/DrawTrSurf_Surface.cdl         |  6 +-
 src/DrawTrSurf/DrawTrSurf_Triangulation.cdl   |  4 +-
 src/DrawTrSurf/DrawTrSurf_Triangulation2D.cdl |  4 +-
 src/Expr/Expr_Absolute.cdl                    |  4 +-
 src/Expr/Expr_ArcCosine.cdl                   |  4 +-
 src/Expr/Expr_ArcSine.cdl                     |  4 +-
 src/Expr/Expr_ArcTangent.cdl                  |  4 +-
 src/Expr/Expr_ArgCosh.cdl                     |  4 +-
 src/Expr/Expr_ArgSinh.cdl                     |  4 +-
 src/Expr/Expr_ArgTanh.cdl                     |  4 +-
 src/Expr/Expr_BinaryFunction.cdl              |  4 +-
 src/Expr/Expr_Cosh.cdl                        |  4 +-
 src/Expr/Expr_Cosine.cdl                      |  4 +-
 src/Expr/Expr_Difference.cdl                  |  4 +-
 src/Expr/Expr_Different.cdl                   |  6 +-
 src/Expr/Expr_Division.cdl                    |  4 +-
 src/Expr/Expr_Equal.cdl                       |  6 +-
 src/Expr/Expr_Exponential.cdl                 |  4 +-
 src/Expr/Expr_Exponentiate.cdl                |  4 +-
 src/Expr/Expr_FunctionDerivative.cdl          |  4 +-
 src/Expr/Expr_GeneralExpression.cdl           |  2 +-
 src/Expr/Expr_GeneralFunction.cdl             |  2 +-
 src/Expr/Expr_GeneralRelation.cdl             |  4 +-
 src/Expr/Expr_GreaterThan.cdl                 |  6 +-
 src/Expr/Expr_GreaterThanOrEqual.cdl          |  6 +-
 src/Expr/Expr_LessThan.cdl                    |  6 +-
 src/Expr/Expr_LessThanOrEqual.cdl             |  6 +-
 src/Expr/Expr_LogOf10.cdl                     |  4 +-
 src/Expr/Expr_LogOfe.cdl                      |  4 +-
 src/Expr/Expr_NamedConstant.cdl               |  4 +-
 src/Expr/Expr_NamedFunction.cdl               |  4 +-
 src/Expr/Expr_NamedUnknown.cdl                |  4 +-
 src/Expr/Expr_NumericValue.cdl                |  4 +-
 src/Expr/Expr_PolyFunction.cdl                |  4 +-
 src/Expr/Expr_Product.cdl                     |  6 +-
 src/Expr/Expr_Sign.cdl                        |  4 +-
 src/Expr/Expr_Sine.cdl                        |  4 +-
 src/Expr/Expr_Sinh.cdl                        |  4 +-
 src/Expr/Expr_Square.cdl                      |  4 +-
 src/Expr/Expr_SquareRoot.cdl                  |  4 +-
 src/Expr/Expr_Sum.cdl                         |  6 +-
 src/Expr/Expr_SystemRelation.cdl              |  6 +-
 src/Expr/Expr_Tangent.cdl                     |  4 +-
 src/Expr/Expr_Tanh.cdl                        |  4 +-
 src/Expr/Expr_UnaryFunction.cdl               |  4 +-
 src/Expr/Expr_UnaryMinus.cdl                  |  4 +-
 src/ExprIntrp/ExprIntrp_GenExp.cdl            |  2 +-
 src/ExprIntrp/ExprIntrp_GenFct.cdl            |  2 +-
 src/ExprIntrp/ExprIntrp_GenRel.cdl            |  4 +-
 src/FEmTool/FEmTool_ProfileMatrix.cdl         |  2 +-
 src/FWOSDriver/FWOSDriver_Driver.cdl          |  2 +-
 src/FWOSDriver/FWOSDriver_DriverFactory.cdl   |  2 +-
 src/GccInt/GccInt_BCirc.cdl                   |  2 +-
 src/GccInt/GccInt_BElips.cdl                  |  2 +-
 src/GccInt/GccInt_BHyper.cdl                  |  2 +-
 src/GccInt/GccInt_BLine.cdl                   |  2 +-
 src/GccInt/GccInt_BParab.cdl                  |  2 +-
 src/GccInt/GccInt_BPoint.cdl                  |  2 +-
 src/Geom/Geom_Axis1Placement.cdl              |  8 +-
 src/Geom/Geom_Axis2Placement.cdl              |  8 +-
 src/Geom/Geom_BSplineCurve.cdl                |  6 +-
 src/Geom/Geom_BSplineSurface.cdl              | 14 +--
 src/Geom/Geom_BezierCurve.cdl                 |  6 +-
 src/Geom/Geom_BezierSurface.cdl               | 12 +--
 src/Geom/Geom_CartesianPoint.cdl              |  6 +-
 src/Geom/Geom_Circle.cdl                      |  6 +-
 src/Geom/Geom_ConicalSurface.cdl              | 10 +--
 src/Geom/Geom_Curve.cdl                       |  2 +-
 src/Geom/Geom_CylindricalSurface.cdl          | 10 +--
 src/Geom/Geom_Direction.cdl                   | 10 +--
 src/Geom/Geom_Ellipse.cdl                     |  6 +-
 src/Geom/Geom_Geometry.cdl                    | 18 ++--
 src/Geom/Geom_Hyperbola.cdl                   |  6 +-
 src/Geom/Geom_Line.cdl                        |  8 +-
 src/Geom/Geom_OffsetCurve.cdl                 |  4 +-
 src/Geom/Geom_OffsetSurface.cdl               | 10 +--
 src/Geom/Geom_OsculatingSurface.cdl           |  2 +-
 src/Geom/Geom_Parabola.cdl                    |  8 +-
 src/Geom/Geom_Plane.cdl                       | 14 +--
 src/Geom/Geom_RectangularTrimmedSurface.cdl   | 10 +--
 src/Geom/Geom_SphericalSurface.cdl            | 10 +--
 src/Geom/Geom_Surface.cdl                     |  8 +-
 src/Geom/Geom_SurfaceOfLinearExtrusion.cdl    |  8 +-
 src/Geom/Geom_SurfaceOfRevolution.cdl         |  8 +-
 src/Geom/Geom_ToroidalSurface.cdl             | 10 +--
 src/Geom/Geom_Transformation.cdl              | 10 +--
 src/Geom/Geom_TrimmedCurve.cdl                |  4 +-
 src/Geom/Geom_Vector.cdl                      |  6 +-
 src/Geom/Geom_VectorWithMagnitude.cdl         | 22 ++---
 src/Geom2d/Geom2d_AxisPlacement.cdl           |  8 +-
 src/Geom2d/Geom2d_BSplineCurve.cdl            |  6 +-
 src/Geom2d/Geom2d_BezierCurve.cdl             |  6 +-
 src/Geom2d/Geom2d_CartesianPoint.cdl          |  6 +-
 src/Geom2d/Geom2d_Circle.cdl                  |  8 +-
 src/Geom2d/Geom2d_Curve.cdl                   |  2 +-
 src/Geom2d/Geom2d_Direction.cdl               |  6 +-
 src/Geom2d/Geom2d_Ellipse.cdl                 |  8 +-
 src/Geom2d/Geom2d_Geometry.cdl                | 16 ++--
 src/Geom2d/Geom2d_Hyperbola.cdl               |  8 +-
 src/Geom2d/Geom2d_Line.cdl                    |  8 +-
 src/Geom2d/Geom2d_OffsetCurve.cdl             |  4 +-
 src/Geom2d/Geom2d_Parabola.cdl                | 10 +--
 src/Geom2d/Geom2d_Transformation.cdl          | 10 +--
 src/Geom2d/Geom2d_TrimmedCurve.cdl            |  4 +-
 src/Geom2d/Geom2d_Vector.cdl                  |  2 +-
 src/Geom2d/Geom2d_VectorWithMagnitude.cdl     | 18 ++--
 src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cdl    |  8 +-
 src/Geom2dConvert/Geom2dConvert.cdl           |  6 +-
 ...eom2dConvert_BSplineCurveToBezierCurve.cdl |  2 +-
 src/Geom2dToIGES/Geom2dToIGES_Geom2dCurve.cdl |  2 +-
 src/Geom2dToIGES/Geom2dToIGES_Geom2dPoint.cdl |  4 +-
 .../Geom2dToIGES_Geom2dVector.cdl             |  6 +-
 src/GeomAdaptor/GeomAdaptor_HCurve.cdl        |  8 +-
 src/GeomAdaptor/GeomAdaptor_HSurface.cdl      |  8 +-
 src/GeomConvert/GeomConvert.cdl               | 16 ++--
 .../GeomConvert_BSplineCurveToBezierCurve.cdl |  2 +-
 ...mConvert_BSplineSurfaceToBezierSurface.cdl |  2 +-
 src/GeomFill/GeomFill_BoundWithSurf.cdl       |  2 +-
 src/GeomFill/GeomFill_CoonsAlgPatch.cdl       |  2 +-
 src/GeomFill/GeomFill_DegeneratedBound.cdl    |  2 +-
 src/GeomFill/GeomFill_Line.cdl                |  4 +-
 src/GeomFill/GeomFill_SimpleBound.cdl         |  2 +-
 src/GeomFill/GeomFill_TgtOnCoons.cdl          |  2 +-
 src/GeomPlate/GeomPlate_Surface.cdl           |  8 +-
 src/GeomToIGES/GeomToIGES_GeomCurve.cdl       | 24 +++---
 src/GeomToIGES/GeomToIGES_GeomPoint.cdl       |  4 +-
 src/GeomToIGES/GeomToIGES_GeomSurface.cdl     | 40 ++++-----
 src/GeomToIGES/GeomToIGES_GeomVector.cdl      |  6 +-
 .../GeomTools_UndefinedTypeHandler.cdl        |  2 +-
 src/Graphic3d/Graphic3d_ArrayOfPoints.cdl     |  2 +-
 src/Graphic3d/Graphic3d_ArrayOfPolygons.cdl   |  2 +-
 src/Graphic3d/Graphic3d_ArrayOfPolylines.cdl  |  2 +-
 src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl |  2 +-
 .../Graphic3d_ArrayOfQuadrangleStrips.cdl     |  2 +-
 .../Graphic3d_ArrayOfQuadrangles.cdl          |  2 +-
 src/Graphic3d/Graphic3d_ArrayOfSegments.cdl   |  2 +-
 .../Graphic3d_ArrayOfTriangleFans.cdl         |  2 +-
 .../Graphic3d_ArrayOfTriangleStrips.cdl       |  2 +-
 src/Graphic3d/Graphic3d_ArrayOfTriangles.cdl  |  2 +-
 src/Graphic3d/Graphic3d_AspectFillArea3d.cdl  |  4 +-
 src/Graphic3d/Graphic3d_AspectLine3d.cdl      |  4 +-
 src/Graphic3d/Graphic3d_AspectMarker3d.cdl    |  8 +-
 src/Graphic3d/Graphic3d_AspectText3d.cdl      |  4 +-
 src/Graphic3d/Graphic3d_GraphicDriver.cdl     |  2 +-
 src/Graphic3d/Graphic3d_Group.cdl             |  4 +-
 src/Graphic3d/Graphic3d_Structure.cdl         |  4 +-
 src/Graphic3d/Graphic3d_Texture1Dmanual.cdl   |  6 +-
 src/Graphic3d/Graphic3d_Texture1Dsegment.cdl  |  6 +-
 src/Graphic3d/Graphic3d_Texture2Dmanual.cdl   |  6 +-
 src/Graphic3d/Graphic3d_Texture2Dplane.cdl    |  6 +-
 src/Graphic3d/Graphic3d_TextureEnv.cdl        |  4 +-
 src/HLRAlgo/HLRAlgo_EdgesBlock.cdl            |  2 +-
 src/HLRAlgo/HLRAlgo_PolyAlgo.cdl              |  2 +-
 src/HLRAlgo/HLRAlgo_PolyData.cdl              |  2 +-
 src/HLRAlgo/HLRAlgo_PolyInternalData.cdl      |  2 +-
 src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl      |  2 +-
 src/HLRAlgo/HLRAlgo_PolyShellData.cdl         |  2 +-
 src/HLRAlgo/HLRAlgo_WiresBlock.cdl            |  2 +-
 src/HLRBRep/HLRBRep_Algo.cdl                  |  4 +-
 src/HLRBRep/HLRBRep_AreaLimit.cdl             |  6 +-
 src/HLRBRep/HLRBRep_Data.cdl                  |  2 +-
 src/HLRBRep/HLRBRep_InternalAlgo.cdl          |  4 +-
 src/HLRBRep/HLRBRep_PolyAlgo.cdl              |  6 +-
 src/HLRBRep/HLRBRep_ShapeToHLR.cdl            |  4 +-
 src/HLRTest/HLRTest_DrawableEdgeTool.cdl      |  2 +-
 src/HLRTest/HLRTest_DrawablePolyEdgeTool.cdl  |  2 +-
 src/HLRTest/HLRTest_OutLiner.cdl              |  4 +-
 src/HLRTest/HLRTest_Projector.cdl             |  4 +-
 src/HLRTest/HLRTest_ShapeData.cdl             |  2 +-
 src/HLRTopoBRep/HLRTopoBRep_OutLiner.cdl      |  6 +-
 .../HeaderSection_FileDescription.cdl         | 16 ++--
 src/HeaderSection/HeaderSection_FileName.cdl  | 48 +++++------
 .../HeaderSection_FileSchema.cdl              | 10 +--
 .../HeaderSection_HeaderRecognizer.cdl        |  2 +-
 src/HeaderSection/HeaderSection_Protocol.cdl  |  2 +-
 src/IFSelect/IFSelect.cdl                     |  2 +-
 src/IFSelect/IFSelect_Act.cdl                 |  4 +-
 src/IFSelect/IFSelect_Activator.cdl           |  4 +-
 src/IFSelect/IFSelect_AppliedModifiers.cdl    |  6 +-
 src/IFSelect/IFSelect_BasicDumper.cdl         |  4 +-
 src/IFSelect/IFSelect_CheckCounter.cdl        |  2 +-
 src/IFSelect/IFSelect_ContextWrite.cdl        |  8 +-
 src/IFSelect/IFSelect_DispGlobal.cdl          |  2 +-
 src/IFSelect/IFSelect_DispPerCount.cdl        |  6 +-
 src/IFSelect/IFSelect_DispPerFiles.cdl        |  6 +-
 src/IFSelect/IFSelect_DispPerOne.cdl          |  2 +-
 src/IFSelect/IFSelect_DispPerSignature.cdl    |  6 +-
 src/IFSelect/IFSelect_Dispatch.cdl            |  6 +-
 src/IFSelect/IFSelect_Editor.cdl              |  6 +-
 src/IFSelect/IFSelect_GeneralModifier.cdl     |  4 +-
 src/IFSelect/IFSelect_GraphCounter.cdl        |  2 +-
 src/IFSelect/IFSelect_IntParam.cdl            |  2 +-
 src/IFSelect/IFSelect_ModelCopier.cdl         | 16 ++--
 src/IFSelect/IFSelect_ModelModifier.cdl       |  6 +-
 src/IFSelect/IFSelect_ModifEditForm.cdl       |  4 +-
 src/IFSelect/IFSelect_ModifReorder.cdl        |  4 +-
 src/IFSelect/IFSelect_Modifier.cdl            |  2 +-
 src/IFSelect/IFSelect_PacketList.cdl          |  2 +-
 src/IFSelect/IFSelect_SelectAnyList.cdl       | 12 +--
 src/IFSelect/IFSelect_SelectCombine.cdl       |  4 +-
 src/IFSelect/IFSelect_SelectControl.cdl       |  8 +-
 src/IFSelect/IFSelect_SelectDeduct.cdl        |  4 +-
 src/IFSelect/IFSelect_SelectDiff.cdl          |  2 +-
 src/IFSelect/IFSelect_SelectEntityNumber.cdl  |  6 +-
 src/IFSelect/IFSelect_SelectErrorEntities.cdl |  2 +-
 src/IFSelect/IFSelect_SelectFlag.cdl          |  2 +-
 .../IFSelect_SelectIncorrectEntities.cdl      |  2 +-
 src/IFSelect/IFSelect_SelectIntersection.cdl  |  2 +-
 src/IFSelect/IFSelect_SelectModelEntities.cdl |  2 +-
 src/IFSelect/IFSelect_SelectModelRoots.cdl    |  2 +-
 src/IFSelect/IFSelect_SelectPointed.cdl       |  2 +-
 src/IFSelect/IFSelect_SelectRange.cdl         | 14 +--
 src/IFSelect/IFSelect_SelectRootComps.cdl     |  2 +-
 src/IFSelect/IFSelect_SelectRoots.cdl         |  2 +-
 src/IFSelect/IFSelect_SelectSent.cdl          |  2 +-
 src/IFSelect/IFSelect_SelectShared.cdl        |  2 +-
 src/IFSelect/IFSelect_SelectSharing.cdl       |  2 +-
 src/IFSelect/IFSelect_SelectSignature.cdl     | 10 +--
 src/IFSelect/IFSelect_SelectSignedShared.cdl  |  4 +-
 src/IFSelect/IFSelect_SelectSignedSharing.cdl |  4 +-
 src/IFSelect/IFSelect_SelectType.cdl          |  4 +-
 src/IFSelect/IFSelect_SelectUnion.cdl         |  2 +-
 .../IFSelect_SelectUnknownEntities.cdl        |  2 +-
 src/IFSelect/IFSelect_SessionDumper.cdl       |  2 +-
 src/IFSelect/IFSelect_SessionFile.cdl         |  6 +-
 src/IFSelect/IFSelect_SessionPilot.cdl        | 14 +--
 src/IFSelect/IFSelect_ShareOut.cdl            | 20 ++---
 src/IFSelect/IFSelect_ShareOutResult.cdl      |  6 +-
 src/IFSelect/IFSelect_SignAncestor.cdl        |  2 +-
 src/IFSelect/IFSelect_SignCategory.cdl        |  2 +-
 src/IFSelect/IFSelect_SignCounter.cdl         |  8 +-
 src/IFSelect/IFSelect_SignMultiple.cdl        |  2 +-
 src/IFSelect/IFSelect_SignType.cdl            |  2 +-
 src/IFSelect/IFSelect_SignValidity.cdl        |  2 +-
 src/IFSelect/IFSelect_SignatureList.cdl       |  2 +-
 src/IFSelect/IFSelect_TransformStandard.cdl   | 18 ++--
 src/IFSelect/IFSelect_Transformer.cdl         |  4 +-
 src/IFSelect/IFSelect_WorkLibrary.cdl         |  4 +-
 src/IFSelect/IFSelect_WorkSession.cdl         | 86 +++++++++----------
 src/IGESAppli/IGESAppli_DrilledHole.cdl       |  2 +-
 src/IGESAppli/IGESAppli_ElementResults.cdl    |  2 +-
 src/IGESAppli/IGESAppli_FiniteElement.cdl     |  2 +-
 src/IGESAppli/IGESAppli_Flow.cdl              |  2 +-
 src/IGESAppli/IGESAppli_FlowLineSpec.cdl      |  2 +-
 src/IGESAppli/IGESAppli_GeneralModule.cdl     |  6 +-
 src/IGESAppli/IGESAppli_LevelFunction.cdl     |  2 +-
 .../IGESAppli_LevelToPWBLayerMap.cdl          |  2 +-
 src/IGESAppli/IGESAppli_LineWidening.cdl      |  2 +-
 src/IGESAppli/IGESAppli_NodalConstraint.cdl   |  2 +-
 src/IGESAppli/IGESAppli_NodalDisplAndRot.cdl  |  2 +-
 src/IGESAppli/IGESAppli_NodalResults.cdl      |  2 +-
 src/IGESAppli/IGESAppli_Node.cdl              |  2 +-
 src/IGESAppli/IGESAppli_PWBArtworkStackup.cdl |  2 +-
 src/IGESAppli/IGESAppli_PWBDrilledHole.cdl    |  2 +-
 src/IGESAppli/IGESAppli_PartNumber.cdl        |  2 +-
 src/IGESAppli/IGESAppli_PinNumber.cdl         |  2 +-
 src/IGESAppli/IGESAppli_PipingFlow.cdl        |  2 +-
 src/IGESAppli/IGESAppli_Protocol.cdl          |  2 +-
 src/IGESAppli/IGESAppli_ReadWriteModule.cdl   |  4 +-
 .../IGESAppli_ReferenceDesignator.cdl         |  2 +-
 src/IGESAppli/IGESAppli_RegionRestriction.cdl |  2 +-
 src/IGESAppli/IGESAppli_SpecificModule.cdl    |  4 +-
 src/IGESAppli/IGESAppli_ToolDrilledHole.cdl   |  6 +-
 .../IGESAppli_ToolElementResults.cdl          |  4 +-
 src/IGESAppli/IGESAppli_ToolFiniteElement.cdl |  4 +-
 src/IGESAppli/IGESAppli_ToolFlow.cdl          |  6 +-
 src/IGESAppli/IGESAppli_ToolFlowLineSpec.cdl  |  4 +-
 src/IGESAppli/IGESAppli_ToolLevelFunction.cdl |  6 +-
 .../IGESAppli_ToolLevelToPWBLayerMap.cdl      |  4 +-
 src/IGESAppli/IGESAppli_ToolLineWidening.cdl  |  6 +-
 .../IGESAppli_ToolNodalConstraint.cdl         |  4 +-
 .../IGESAppli_ToolNodalDisplAndRot.cdl        |  4 +-
 src/IGESAppli/IGESAppli_ToolNodalResults.cdl  |  4 +-
 src/IGESAppli/IGESAppli_ToolNode.cdl          |  4 +-
 .../IGESAppli_ToolPWBArtworkStackup.cdl       |  4 +-
 .../IGESAppli_ToolPWBDrilledHole.cdl          |  6 +-
 src/IGESAppli/IGESAppli_ToolPartNumber.cdl    |  6 +-
 src/IGESAppli/IGESAppli_ToolPinNumber.cdl     |  6 +-
 src/IGESAppli/IGESAppli_ToolPipingFlow.cdl    |  6 +-
 .../IGESAppli_ToolReferenceDesignator.cdl     |  6 +-
 .../IGESAppli_ToolRegionRestriction.cdl       |  6 +-
 src/IGESBasic/IGESBasic_AssocGroupType.cdl    |  2 +-
 src/IGESBasic/IGESBasic_ExternalRefFile.cdl   |  2 +-
 .../IGESBasic_ExternalRefFileIndex.cdl        |  2 +-
 .../IGESBasic_ExternalRefFileName.cdl         |  2 +-
 .../IGESBasic_ExternalRefLibName.cdl          |  2 +-
 src/IGESBasic/IGESBasic_ExternalRefName.cdl   |  2 +-
 .../IGESBasic_ExternalReferenceFile.cdl       |  2 +-
 src/IGESBasic/IGESBasic_GeneralModule.cdl     |  6 +-
 src/IGESBasic/IGESBasic_Group.cdl             |  2 +-
 src/IGESBasic/IGESBasic_GroupWithoutBackP.cdl |  2 +-
 src/IGESBasic/IGESBasic_Hierarchy.cdl         |  2 +-
 src/IGESBasic/IGESBasic_Name.cdl              |  2 +-
 src/IGESBasic/IGESBasic_OrderedGroup.cdl      |  2 +-
 .../IGESBasic_OrderedGroupWithoutBackP.cdl    |  2 +-
 src/IGESBasic/IGESBasic_Protocol.cdl          |  2 +-
 src/IGESBasic/IGESBasic_ReadWriteModule.cdl   |  4 +-
 src/IGESBasic/IGESBasic_SingleParent.cdl      |  2 +-
 src/IGESBasic/IGESBasic_SingularSubfigure.cdl |  2 +-
 src/IGESBasic/IGESBasic_SpecificModule.cdl    |  4 +-
 src/IGESBasic/IGESBasic_SubfigureDef.cdl      |  2 +-
 .../IGESBasic_ToolAssocGroupType.cdl          |  6 +-
 .../IGESBasic_ToolExternalRefFile.cdl         |  4 +-
 .../IGESBasic_ToolExternalRefFileIndex.cdl    |  4 +-
 .../IGESBasic_ToolExternalRefFileName.cdl     |  4 +-
 .../IGESBasic_ToolExternalRefLibName.cdl      |  4 +-
 .../IGESBasic_ToolExternalRefName.cdl         |  4 +-
 .../IGESBasic_ToolExternalReferenceFile.cdl   |  4 +-
 src/IGESBasic/IGESBasic_ToolGroup.cdl         |  6 +-
 .../IGESBasic_ToolGroupWithoutBackP.cdl       |  6 +-
 src/IGESBasic/IGESBasic_ToolHierarchy.cdl     |  6 +-
 src/IGESBasic/IGESBasic_ToolName.cdl          |  6 +-
 src/IGESBasic/IGESBasic_ToolOrderedGroup.cdl  |  6 +-
 ...IGESBasic_ToolOrderedGroupWithoutBackP.cdl |  6 +-
 src/IGESBasic/IGESBasic_ToolSingleParent.cdl  |  6 +-
 .../IGESBasic_ToolSingularSubfigure.cdl       |  4 +-
 src/IGESBasic/IGESBasic_ToolSubfigureDef.cdl  |  4 +-
 src/IGESCAFControl/IGESCAFControl_Reader.cdl  |  2 +-
 src/IGESCAFControl/IGESCAFControl_Writer.cdl  |  2 +-
 src/IGESControl/IGESControl_ActorWrite.cdl    |  2 +-
 src/IGESControl/IGESControl_AlgoContainer.cdl |  2 +-
 src/IGESControl/IGESControl_Controller.cdl    | 10 +--
 src/IGESControl/IGESControl_IGESBoundary.cdl  |  4 +-
 src/IGESControl/IGESControl_Reader.cdl        |  2 +-
 src/IGESControl/IGESControl_ToolContainer.cdl |  2 +-
 src/IGESControl/IGESControl_Writer.cdl        |  6 +-
 src/IGESConvGeom/IGESConvGeom.cdl             | 10 +--
 src/IGESConvGeom/IGESConvGeom_GeomBuilder.cdl | 13 +--
 src/IGESConvGeom/IGESConvGeom_GeomBuilder.cxx | 29 -------
 src/IGESData/IGESData_BasicEditor.cdl         |  4 +-
 src/IGESData/IGESData_DefaultGeneral.cdl      |  6 +-
 src/IGESData/IGESData_DefaultSpecific.cdl     |  2 +-
 src/IGESData/IGESData_DirChecker.cdl          |  2 +-
 src/IGESData/IGESData_FileProtocol.cdl        |  2 +-
 src/IGESData/IGESData_FreeFormatEntity.cdl    |  8 +-
 src/IGESData/IGESData_GeneralModule.cdl       | 14 +--
 src/IGESData/IGESData_GlobalSection.cdl       |  4 +-
 src/IGESData/IGESData_IGESEntity.cdl          |  8 +-
 src/IGESData/IGESData_IGESModel.cdl           |  6 +-
 src/IGESData/IGESData_IGESReaderData.cdl      |  2 +-
 src/IGESData/IGESData_IGESReaderTool.cdl      | 20 ++---
 src/IGESData/IGESData_ParamReader.cdl         | 10 +--
 src/IGESData/IGESData_Protocol.cdl            |  6 +-
 src/IGESData/IGESData_ReadWriteModule.cdl     |  4 +-
 src/IGESData/IGESData_SpecificModule.cdl      |  2 +-
 src/IGESData/IGESData_ToolLocation.cdl        |  2 +-
 src/IGESData/IGESData_UndefinedEntity.cdl     |  8 +-
 src/IGESDefs/IGESDefs_AssociativityDef.cdl    |  2 +-
 src/IGESDefs/IGESDefs_AttributeDef.cdl        |  2 +-
 src/IGESDefs/IGESDefs_AttributeTable.cdl      |  2 +-
 src/IGESDefs/IGESDefs_GeneralModule.cdl       |  6 +-
 src/IGESDefs/IGESDefs_GenericData.cdl         |  2 +-
 src/IGESDefs/IGESDefs_MacroDef.cdl            |  2 +-
 src/IGESDefs/IGESDefs_Protocol.cdl            |  2 +-
 src/IGESDefs/IGESDefs_ReadWriteModule.cdl     |  4 +-
 src/IGESDefs/IGESDefs_SpecificModule.cdl      |  2 +-
 src/IGESDefs/IGESDefs_TabularData.cdl         |  2 +-
 .../IGESDefs_ToolAssociativityDef.cdl         |  4 +-
 src/IGESDefs/IGESDefs_ToolAttributeDef.cdl    |  4 +-
 src/IGESDefs/IGESDefs_ToolAttributeTable.cdl  |  4 +-
 src/IGESDefs/IGESDefs_ToolGenericData.cdl     |  4 +-
 src/IGESDefs/IGESDefs_ToolMacroDef.cdl        |  4 +-
 src/IGESDefs/IGESDefs_ToolTabularData.cdl     |  4 +-
 src/IGESDefs/IGESDefs_ToolUnitsData.cdl       |  4 +-
 src/IGESDefs/IGESDefs_UnitsData.cdl           |  2 +-
 src/IGESDimen/IGESDimen_AngularDimension.cdl  |  2 +-
 src/IGESDimen/IGESDimen_BasicDimension.cdl    |  2 +-
 src/IGESDimen/IGESDimen_CenterLine.cdl        |  2 +-
 src/IGESDimen/IGESDimen_CurveDimension.cdl    |  2 +-
 src/IGESDimen/IGESDimen_DiameterDimension.cdl |  2 +-
 .../IGESDimen_DimensionDisplayData.cdl        |  2 +-
 .../IGESDimen_DimensionTolerance.cdl          |  2 +-
 src/IGESDimen/IGESDimen_DimensionUnits.cdl    |  2 +-
 .../IGESDimen_DimensionedGeometry.cdl         |  2 +-
 src/IGESDimen/IGESDimen_FlagNote.cdl          |  2 +-
 src/IGESDimen/IGESDimen_GeneralLabel.cdl      |  2 +-
 src/IGESDimen/IGESDimen_GeneralModule.cdl     |  6 +-
 src/IGESDimen/IGESDimen_GeneralNote.cdl       |  2 +-
 src/IGESDimen/IGESDimen_GeneralSymbol.cdl     |  2 +-
 src/IGESDimen/IGESDimen_LeaderArrow.cdl       |  2 +-
 src/IGESDimen/IGESDimen_LinearDimension.cdl   |  2 +-
 .../IGESDimen_NewDimensionedGeometry.cdl      |  2 +-
 src/IGESDimen/IGESDimen_NewGeneralNote.cdl    |  2 +-
 src/IGESDimen/IGESDimen_OrdinateDimension.cdl |  2 +-
 src/IGESDimen/IGESDimen_PointDimension.cdl    |  2 +-
 src/IGESDimen/IGESDimen_Protocol.cdl          |  2 +-
 src/IGESDimen/IGESDimen_RadiusDimension.cdl   |  2 +-
 src/IGESDimen/IGESDimen_ReadWriteModule.cdl   |  4 +-
 src/IGESDimen/IGESDimen_Section.cdl           |  2 +-
 src/IGESDimen/IGESDimen_SectionedArea.cdl     |  2 +-
 src/IGESDimen/IGESDimen_SpecificModule.cdl    |  4 +-
 .../IGESDimen_ToolAngularDimension.cdl        |  4 +-
 .../IGESDimen_ToolBasicDimension.cdl          |  6 +-
 src/IGESDimen/IGESDimen_ToolCenterLine.cdl    |  6 +-
 .../IGESDimen_ToolCurveDimension.cdl          |  4 +-
 .../IGESDimen_ToolDiameterDimension.cdl       |  4 +-
 .../IGESDimen_ToolDimensionDisplayData.cdl    |  6 +-
 .../IGESDimen_ToolDimensionTolerance.cdl      |  6 +-
 .../IGESDimen_ToolDimensionUnits.cdl          |  6 +-
 .../IGESDimen_ToolDimensionedGeometry.cdl     |  6 +-
 src/IGESDimen/IGESDimen_ToolFlagNote.cdl      |  4 +-
 src/IGESDimen/IGESDimen_ToolGeneralLabel.cdl  |  4 +-
 src/IGESDimen/IGESDimen_ToolGeneralNote.cdl   |  4 +-
 src/IGESDimen/IGESDimen_ToolGeneralSymbol.cdl |  4 +-
 src/IGESDimen/IGESDimen_ToolLeaderArrow.cdl   |  4 +-
 .../IGESDimen_ToolLinearDimension.cdl         |  4 +-
 .../IGESDimen_ToolNewDimensionedGeometry.cdl  |  6 +-
 .../IGESDimen_ToolNewGeneralNote.cdl          |  4 +-
 .../IGESDimen_ToolOrdinateDimension.cdl       |  4 +-
 .../IGESDimen_ToolPointDimension.cdl          |  4 +-
 .../IGESDimen_ToolRadiusDimension.cdl         |  4 +-
 src/IGESDimen/IGESDimen_ToolSection.cdl       |  6 +-
 src/IGESDimen/IGESDimen_ToolSectionedArea.cdl |  4 +-
 src/IGESDimen/IGESDimen_ToolWitnessLine.cdl   |  6 +-
 src/IGESDimen/IGESDimen_WitnessLine.cdl       |  2 +-
 src/IGESDraw/IGESDraw_CircArraySubfigure.cdl  |  2 +-
 src/IGESDraw/IGESDraw_ConnectPoint.cdl        |  2 +-
 src/IGESDraw/IGESDraw_Drawing.cdl             |  2 +-
 src/IGESDraw/IGESDraw_DrawingWithRotation.cdl |  2 +-
 src/IGESDraw/IGESDraw_GeneralModule.cdl       | 10 +--
 src/IGESDraw/IGESDraw_LabelDisplay.cdl        |  2 +-
 src/IGESDraw/IGESDraw_NetworkSubfigure.cdl    |  2 +-
 src/IGESDraw/IGESDraw_NetworkSubfigureDef.cdl |  2 +-
 src/IGESDraw/IGESDraw_PerspectiveView.cdl     |  2 +-
 src/IGESDraw/IGESDraw_Planar.cdl              |  2 +-
 src/IGESDraw/IGESDraw_Protocol.cdl            |  2 +-
 src/IGESDraw/IGESDraw_ReadWriteModule.cdl     |  4 +-
 src/IGESDraw/IGESDraw_RectArraySubfigure.cdl  |  2 +-
 .../IGESDraw_SegmentedViewsVisible.cdl        |  2 +-
 src/IGESDraw/IGESDraw_SpecificModule.cdl      |  4 +-
 .../IGESDraw_ToolCircArraySubfigure.cdl       |  4 +-
 src/IGESDraw/IGESDraw_ToolConnectPoint.cdl    |  4 +-
 src/IGESDraw/IGESDraw_ToolDrawing.cdl         |  6 +-
 .../IGESDraw_ToolDrawingWithRotation.cdl      |  6 +-
 src/IGESDraw/IGESDraw_ToolLabelDisplay.cdl    |  4 +-
 .../IGESDraw_ToolNetworkSubfigure.cdl         |  4 +-
 .../IGESDraw_ToolNetworkSubfigureDef.cdl      |  4 +-
 src/IGESDraw/IGESDraw_ToolPerspectiveView.cdl |  4 +-
 src/IGESDraw/IGESDraw_ToolPlanar.cdl          |  6 +-
 .../IGESDraw_ToolRectArraySubfigure.cdl       |  4 +-
 .../IGESDraw_ToolSegmentedViewsVisible.cdl    |  4 +-
 src/IGESDraw/IGESDraw_ToolView.cdl            |  4 +-
 src/IGESDraw/IGESDraw_ToolViewsVisible.cdl    |  8 +-
 .../IGESDraw_ToolViewsVisibleWithAttr.cdl     |  8 +-
 src/IGESDraw/IGESDraw_View.cdl                |  2 +-
 src/IGESDraw/IGESDraw_ViewsVisible.cdl        |  2 +-
 .../IGESDraw_ViewsVisibleWithAttr.cdl         |  2 +-
 src/IGESGeom/IGESGeom_BSplineCurve.cdl        |  2 +-
 src/IGESGeom/IGESGeom_BSplineSurface.cdl      |  2 +-
 src/IGESGeom/IGESGeom_Boundary.cdl            |  4 +-
 src/IGESGeom/IGESGeom_BoundedSurface.cdl      |  2 +-
 src/IGESGeom/IGESGeom_CircularArc.cdl         |  2 +-
 src/IGESGeom/IGESGeom_CompositeCurve.cdl      |  2 +-
 src/IGESGeom/IGESGeom_ConicArc.cdl            |  2 +-
 src/IGESGeom/IGESGeom_CopiousData.cdl         |  2 +-
 src/IGESGeom/IGESGeom_CurveOnSurface.cdl      |  2 +-
 src/IGESGeom/IGESGeom_Direction.cdl           |  2 +-
 src/IGESGeom/IGESGeom_Flash.cdl               |  2 +-
 src/IGESGeom/IGESGeom_GeneralModule.cdl       |  6 +-
 src/IGESGeom/IGESGeom_Line.cdl                |  2 +-
 src/IGESGeom/IGESGeom_OffsetCurve.cdl         |  2 +-
 src/IGESGeom/IGESGeom_OffsetSurface.cdl       |  2 +-
 src/IGESGeom/IGESGeom_Plane.cdl               |  2 +-
 src/IGESGeom/IGESGeom_Point.cdl               |  2 +-
 src/IGESGeom/IGESGeom_Protocol.cdl            |  2 +-
 src/IGESGeom/IGESGeom_ReadWriteModule.cdl     |  4 +-
 src/IGESGeom/IGESGeom_RuledSurface.cdl        |  2 +-
 src/IGESGeom/IGESGeom_SpecificModule.cdl      |  4 +-
 src/IGESGeom/IGESGeom_SplineCurve.cdl         |  2 +-
 src/IGESGeom/IGESGeom_SplineSurface.cdl       |  2 +-
 src/IGESGeom/IGESGeom_SurfaceOfRevolution.cdl |  2 +-
 src/IGESGeom/IGESGeom_TabulatedCylinder.cdl   |  2 +-
 src/IGESGeom/IGESGeom_ToolBSplineCurve.cdl    |  4 +-
 src/IGESGeom/IGESGeom_ToolBSplineSurface.cdl  |  4 +-
 src/IGESGeom/IGESGeom_ToolBoundary.cdl        |  6 +-
 src/IGESGeom/IGESGeom_ToolBoundedSurface.cdl  |  4 +-
 src/IGESGeom/IGESGeom_ToolCircularArc.cdl     |  4 +-
 src/IGESGeom/IGESGeom_ToolCompositeCurve.cdl  |  4 +-
 src/IGESGeom/IGESGeom_ToolConicArc.cdl        |  6 +-
 src/IGESGeom/IGESGeom_ToolCopiousData.cdl     |  4 +-
 src/IGESGeom/IGESGeom_ToolCurveOnSurface.cdl  |  6 +-
 src/IGESGeom/IGESGeom_ToolDirection.cdl       |  4 +-
 src/IGESGeom/IGESGeom_ToolFlash.cdl           |  6 +-
 src/IGESGeom/IGESGeom_ToolLine.cdl            |  4 +-
 src/IGESGeom/IGESGeom_ToolOffsetCurve.cdl     |  6 +-
 src/IGESGeom/IGESGeom_ToolOffsetSurface.cdl   |  4 +-
 src/IGESGeom/IGESGeom_ToolPlane.cdl           |  4 +-
 src/IGESGeom/IGESGeom_ToolPoint.cdl           |  4 +-
 src/IGESGeom/IGESGeom_ToolRuledSurface.cdl    |  4 +-
 src/IGESGeom/IGESGeom_ToolSplineCurve.cdl     |  4 +-
 src/IGESGeom/IGESGeom_ToolSplineSurface.cdl   |  4 +-
 .../IGESGeom_ToolSurfaceOfRevolution.cdl      |  4 +-
 .../IGESGeom_ToolTabulatedCylinder.cdl        |  4 +-
 .../IGESGeom_ToolTransformationMatrix.cdl     |  6 +-
 src/IGESGeom/IGESGeom_ToolTrimmedSurface.cdl  |  4 +-
 .../IGESGeom_TransformationMatrix.cdl         |  2 +-
 src/IGESGeom/IGESGeom_TrimmedSurface.cdl      |  2 +-
 src/IGESGraph/IGESGraph_Color.cdl             |  2 +-
 src/IGESGraph/IGESGraph_DefinitionLevel.cdl   |  2 +-
 src/IGESGraph/IGESGraph_DrawingSize.cdl       |  2 +-
 src/IGESGraph/IGESGraph_DrawingUnits.cdl      |  2 +-
 src/IGESGraph/IGESGraph_GeneralModule.cdl     |  6 +-
 src/IGESGraph/IGESGraph_HighLight.cdl         |  2 +-
 .../IGESGraph_IntercharacterSpacing.cdl       |  2 +-
 .../IGESGraph_LineFontDefPattern.cdl          |  2 +-
 .../IGESGraph_LineFontDefTemplate.cdl         |  2 +-
 .../IGESGraph_LineFontPredefined.cdl          |  2 +-
 src/IGESGraph/IGESGraph_NominalSize.cdl       |  2 +-
 src/IGESGraph/IGESGraph_Pick.cdl              |  2 +-
 src/IGESGraph/IGESGraph_Protocol.cdl          |  2 +-
 src/IGESGraph/IGESGraph_ReadWriteModule.cdl   |  4 +-
 src/IGESGraph/IGESGraph_SpecificModule.cdl    |  4 +-
 .../IGESGraph_TextDisplayTemplate.cdl         |  2 +-
 src/IGESGraph/IGESGraph_TextFontDef.cdl       |  2 +-
 src/IGESGraph/IGESGraph_ToolColor.cdl         |  4 +-
 .../IGESGraph_ToolDefinitionLevel.cdl         |  4 +-
 src/IGESGraph/IGESGraph_ToolDrawingSize.cdl   |  6 +-
 src/IGESGraph/IGESGraph_ToolDrawingUnits.cdl  |  6 +-
 src/IGESGraph/IGESGraph_ToolHighLight.cdl     |  6 +-
 .../IGESGraph_ToolIntercharacterSpacing.cdl   |  6 +-
 .../IGESGraph_ToolLineFontDefPattern.cdl      |  4 +-
 .../IGESGraph_ToolLineFontDefTemplate.cdl     |  4 +-
 .../IGESGraph_ToolLineFontPredefined.cdl      |  6 +-
 src/IGESGraph/IGESGraph_ToolNominalSize.cdl   |  6 +-
 src/IGESGraph/IGESGraph_ToolPick.cdl          |  6 +-
 .../IGESGraph_ToolTextDisplayTemplate.cdl     |  4 +-
 src/IGESGraph/IGESGraph_ToolTextFontDef.cdl   |  4 +-
 .../IGESGraph_ToolUniformRectGrid.cdl         |  6 +-
 src/IGESGraph/IGESGraph_UniformRectGrid.cdl   |  2 +-
 src/IGESSelect/IGESSelect_Activator.cdl       |  4 +-
 src/IGESSelect/IGESSelect_AddFileComment.cdl  |  2 +-
 src/IGESSelect/IGESSelect_AddGroup.cdl        |  4 +-
 src/IGESSelect/IGESSelect_AutoCorrect.cdl     |  4 +-
 src/IGESSelect/IGESSelect_ChangeLevelList.cdl | 12 +--
 .../IGESSelect_ChangeLevelNumber.cdl          | 12 +--
 src/IGESSelect/IGESSelect_ComputeStatus.cdl   |  4 +-
 .../IGESSelect_CounterOfLevelNumber.cdl       |  2 +-
 src/IGESSelect/IGESSelect_DispPerDrawing.cdl  |  2 +-
 .../IGESSelect_DispPerSingleView.cdl          |  2 +-
 src/IGESSelect/IGESSelect_Dumper.cdl          |  4 +-
 src/IGESSelect/IGESSelect_EditDirPart.cdl     |  2 +-
 src/IGESSelect/IGESSelect_EditHeader.cdl      |  2 +-
 src/IGESSelect/IGESSelect_FloatFormat.cdl     |  2 +-
 src/IGESSelect/IGESSelect_IGESName.cdl        |  2 +-
 src/IGESSelect/IGESSelect_IGESTypeForm.cdl    |  2 +-
 src/IGESSelect/IGESSelect_RebuildDrawings.cdl |  4 +-
 src/IGESSelect/IGESSelect_RebuildGroups.cdl   |  4 +-
 src/IGESSelect/IGESSelect_RemoveCurves.cdl    |  4 +-
 src/IGESSelect/IGESSelect_SelectBasicGeom.cdl |  2 +-
 .../IGESSelect_SelectBypassGroup.cdl          |  2 +-
 .../IGESSelect_SelectBypassSubfigure.cdl      |  2 +-
 .../IGESSelect_SelectDrawingFrom.cdl          |  2 +-
 src/IGESSelect/IGESSelect_SelectFaces.cdl     |  2 +-
 .../IGESSelect_SelectFromDrawing.cdl          |  2 +-
 .../IGESSelect_SelectFromSingleView.cdl       |  2 +-
 .../IGESSelect_SelectLevelNumber.cdl          |  6 +-
 src/IGESSelect/IGESSelect_SelectName.cdl      |  2 +-
 src/IGESSelect/IGESSelect_SelectPCurves.cdl   |  2 +-
 .../IGESSelect_SelectSingleViewFrom.cdl       |  2 +-
 .../IGESSelect_SelectSubordinate.cdl          |  2 +-
 .../IGESSelect_SelectVisibleStatus.cdl        |  2 +-
 .../IGESSelect_SetGlobalParameter.cdl         |  8 +-
 src/IGESSelect/IGESSelect_SetLabel.cdl        |  2 +-
 src/IGESSelect/IGESSelect_SetVersion5.cdl     |  4 +-
 src/IGESSelect/IGESSelect_SignLevelNumber.cdl |  2 +-
 src/IGESSelect/IGESSelect_SignStatus.cdl      |  2 +-
 src/IGESSelect/IGESSelect_SplineToBSpline.cdl |  6 +-
 .../IGESSelect_UpdateCreationDate.cdl         |  4 +-
 src/IGESSelect/IGESSelect_UpdateFileName.cdl  |  4 +-
 .../IGESSelect_UpdateLastChange.cdl           |  4 +-
 src/IGESSelect/IGESSelect_ViewSorter.cdl      |  2 +-
 src/IGESSelect/IGESSelect_WorkLibrary.cdl     |  4 +-
 src/IGESSolid/IGESSolid_Block.cdl             |  2 +-
 src/IGESSolid/IGESSolid_BooleanTree.cdl       |  2 +-
 src/IGESSolid/IGESSolid_ConeFrustum.cdl       |  2 +-
 src/IGESSolid/IGESSolid_ConicalSurface.cdl    |  2 +-
 src/IGESSolid/IGESSolid_Cylinder.cdl          |  2 +-
 .../IGESSolid_CylindricalSurface.cdl          |  2 +-
 src/IGESSolid/IGESSolid_EdgeList.cdl          |  2 +-
 src/IGESSolid/IGESSolid_Ellipsoid.cdl         |  2 +-
 src/IGESSolid/IGESSolid_Face.cdl              |  2 +-
 src/IGESSolid/IGESSolid_GeneralModule.cdl     |  6 +-
 src/IGESSolid/IGESSolid_Loop.cdl              |  2 +-
 src/IGESSolid/IGESSolid_ManifoldSolid.cdl     |  2 +-
 src/IGESSolid/IGESSolid_PlaneSurface.cdl      |  2 +-
 src/IGESSolid/IGESSolid_Protocol.cdl          |  2 +-
 src/IGESSolid/IGESSolid_ReadWriteModule.cdl   |  4 +-
 src/IGESSolid/IGESSolid_RightAngularWedge.cdl |  2 +-
 src/IGESSolid/IGESSolid_SelectedComponent.cdl |  2 +-
 src/IGESSolid/IGESSolid_Shell.cdl             |  2 +-
 src/IGESSolid/IGESSolid_SolidAssembly.cdl     |  2 +-
 src/IGESSolid/IGESSolid_SolidInstance.cdl     |  2 +-
 .../IGESSolid_SolidOfLinearExtrusion.cdl      |  2 +-
 src/IGESSolid/IGESSolid_SolidOfRevolution.cdl |  2 +-
 src/IGESSolid/IGESSolid_SpecificModule.cdl    |  2 +-
 src/IGESSolid/IGESSolid_Sphere.cdl            |  2 +-
 src/IGESSolid/IGESSolid_SphericalSurface.cdl  |  2 +-
 src/IGESSolid/IGESSolid_ToolBlock.cdl         |  4 +-
 src/IGESSolid/IGESSolid_ToolBooleanTree.cdl   |  4 +-
 src/IGESSolid/IGESSolid_ToolConeFrustum.cdl   |  4 +-
 .../IGESSolid_ToolConicalSurface.cdl          |  4 +-
 src/IGESSolid/IGESSolid_ToolCylinder.cdl      |  4 +-
 .../IGESSolid_ToolCylindricalSurface.cdl      |  4 +-
 src/IGESSolid/IGESSolid_ToolEdgeList.cdl      |  4 +-
 src/IGESSolid/IGESSolid_ToolEllipsoid.cdl     |  4 +-
 src/IGESSolid/IGESSolid_ToolFace.cdl          |  4 +-
 src/IGESSolid/IGESSolid_ToolLoop.cdl          |  4 +-
 src/IGESSolid/IGESSolid_ToolManifoldSolid.cdl |  4 +-
 src/IGESSolid/IGESSolid_ToolPlaneSurface.cdl  |  4 +-
 .../IGESSolid_ToolRightAngularWedge.cdl       |  4 +-
 .../IGESSolid_ToolSelectedComponent.cdl       |  4 +-
 src/IGESSolid/IGESSolid_ToolShell.cdl         |  4 +-
 src/IGESSolid/IGESSolid_ToolSolidAssembly.cdl |  4 +-
 src/IGESSolid/IGESSolid_ToolSolidInstance.cdl |  4 +-
 .../IGESSolid_ToolSolidOfLinearExtrusion.cdl  |  4 +-
 .../IGESSolid_ToolSolidOfRevolution.cdl       |  4 +-
 src/IGESSolid/IGESSolid_ToolSphere.cdl        |  4 +-
 .../IGESSolid_ToolSphericalSurface.cdl        |  4 +-
 .../IGESSolid_ToolToroidalSurface.cdl         |  4 +-
 src/IGESSolid/IGESSolid_ToolTorus.cdl         |  4 +-
 src/IGESSolid/IGESSolid_ToolVertexList.cdl    |  4 +-
 src/IGESSolid/IGESSolid_TopoBuilder.cdl       | 16 ++--
 src/IGESSolid/IGESSolid_ToroidalSurface.cdl   |  2 +-
 src/IGESSolid/IGESSolid_Torus.cdl             |  2 +-
 src/IGESSolid/IGESSolid_VertexList.cdl        |  2 +-
 src/IGESToBRep/IGESToBRep_Actor.cdl           |  6 +-
 src/IGESToBRep/IGESToBRep_AlgoContainer.cdl   |  2 +-
 src/IGESToBRep/IGESToBRep_BasicCurve.cdl      | 30 +++----
 src/IGESToBRep/IGESToBRep_BasicSurface.cdl    | 16 ++--
 src/IGESToBRep/IGESToBRep_IGESBoundary.cdl    |  4 +-
 src/IGESToBRep/IGESToBRep_Reader.cdl          |  2 +-
 src/IGESToBRep/IGESToBRep_ToolContainer.cdl   |  2 +-
 src/IntPatch/IntPatch_ALine.cdl               |  6 +-
 src/IntPatch/IntPatch_GLine.cdl               | 30 +++----
 src/IntPatch/IntPatch_RLine.cdl               |  6 +-
 src/IntPatch/IntPatch_WLine.cdl               |  6 +-
 src/IntSurf/IntSurf_LineOn2S.cdl              |  4 +-
 src/IntTools/IntTools_TopolTool.cdl           |  4 +-
 src/IntWalk/IntWalk_IWLine.cdl                |  4 +-
 src/IntWalk/IntWalk_IWalking.cdl              |  6 +-
 src/IntWalk/IntWalk_PWalking.cdl              |  2 +-
 src/Interface/Interface_BitMap.cdl            |  4 +-
 src/Interface/Interface_CopyControl.cdl       |  4 +-
 src/Interface/Interface_CopyMap.cdl           |  6 +-
 src/Interface/Interface_CopyTool.cdl          | 20 ++---
 src/Interface/Interface_EntityCluster.cdl     | 12 +--
 src/Interface/Interface_FileReaderData.cdl    |  6 +-
 src/Interface/Interface_FileReaderTool.cdl    | 26 +++---
 src/Interface/Interface_GTool.cdl             |  6 +-
 src/Interface/Interface_GeneralModule.cdl     | 12 +--
 src/Interface/Interface_HGraph.cdl            | 10 +--
 src/Interface/Interface_IntList.cdl           |  2 +-
 src/Interface/Interface_IntVal.cdl            |  2 +-
 src/Interface/Interface_InterfaceModel.cdl    | 24 +++---
 src/Interface/Interface_JaggedArray.cdl       |  2 +-
 src/Interface/Interface_LineBuffer.cdl        |  4 +-
 src/Interface/Interface_ParamSet.cdl          |  2 +-
 src/Interface/Interface_Protocol.cdl          |  4 +-
 src/Interface/Interface_ReaderModule.cdl      |  4 +-
 src/Interface/Interface_Recognizer.cdl        |  8 +-
 src/Interface/Interface_ReportEntity.cdl      | 12 +--
 src/Interface/Interface_SignLabel.cdl         |  2 +-
 src/Interface/Interface_Static.cdl            |  6 +-
 src/Interface/Interface_TypedValue.cdl        |  2 +-
 src/Interface/Interface_UndefinedContent.cdl  | 12 +--
 src/Law/Law.cdl                               |  6 +-
 src/Law/Law_BSpFunc.cdl                       |  6 +-
 src/Law/Law_BSpline.cdl                       |  6 +-
 src/Law/Law_Composite.cdl                     |  6 +-
 src/Law/Law_Constant.cdl                      |  2 +-
 src/Law/Law_Interpol.cdl                      |  2 +-
 src/Law/Law_Linear.cdl                        |  2 +-
 src/Law/Law_S.cdl                             |  2 +-
 src/LibCtl/LibCtl_Library.cdl                 |  6 +-
 src/LocOpe/LocOpe_GluedShape.cdl              |  4 +-
 src/LocOpe/LocOpe_HBuilder.cdl                |  2 +-
 src/LocOpe/LocOpe_WiresOnShape.cdl            |  2 +-
 src/MAT/MAT_Arc.cdl                           |  6 +-
 src/MAT/MAT_BasicElt.cdl                      |  2 +-
 src/MAT/MAT_Bisector.cdl                      |  2 +-
 src/MAT/MAT_Edge.cdl                          |  2 +-
 src/MAT/MAT_Graph.cdl                         |  8 +-
 src/MAT/MAT_Node.cdl                          |  2 +-
 src/MAT/MAT_TList.cdl                         | 14 +--
 src/MAT/MAT_Zone.cdl                          |  4 +-
 src/MAT2d/MAT2d_Circuit.cdl                   |  4 +-
 src/MAT2d/MAT2d_Connexion.cdl                 |  6 +-
 src/MAT2d/MAT2d_Mat2d.cdl                     |  4 +-
 src/MAT2d/MAT2d_MiniPath.cdl                  |  4 +-
 src/MAT2d/MAT2d_Tool2d.cdl                    | 10 +--
 src/MDF/MDF_ARDriver.cdl                      |  4 +-
 src/MDF/MDF_ASDriver.cdl                      |  4 +-
 src/MDF/MDF_DriverTable.cdl                   |  2 +-
 src/MDF/MDF_ReferenceRetrievalDriver.cdl      |  6 +-
 src/MDF/MDF_ReferenceStorageDriver.cdl        |  6 +-
 src/MDF/MDF_RelocationTable.cdl               |  6 +-
 src/MDF/MDF_TagSourceRetrievalDriver.cdl      |  6 +-
 src/MDF/MDF_TagSourceStorageDriver.cdl        |  6 +-
 .../MDataStd_AsciiStringRetrievalDriver.cdl   |  6 +-
 .../MDataStd_AsciiStringStorageDriver.cdl     |  6 +-
 .../MDataStd_BooleanArrayRetrievalDriver.cdl  |  6 +-
 .../MDataStd_BooleanArrayStorageDriver.cdl    |  6 +-
 .../MDataStd_BooleanListRetrievalDriver.cdl   |  6 +-
 .../MDataStd_BooleanListStorageDriver.cdl     |  6 +-
 .../MDataStd_ByteArrayRetrievalDriver.cdl     |  6 +-
 .../MDataStd_ByteArrayRetrievalDriver_1.cdl   |  6 +-
 .../MDataStd_ByteArrayStorageDriver.cdl       |  6 +-
 .../MDataStd_CommentRetrievalDriver.cdl       |  6 +-
 .../MDataStd_CommentStorageDriver.cdl         |  6 +-
 .../MDataStd_DirectoryRetrievalDriver.cdl     |  6 +-
 .../MDataStd_DirectoryStorageDriver.cdl       |  6 +-
 .../MDataStd_ExpressionRetrievalDriver.cdl    |  6 +-
 .../MDataStd_ExpressionStorageDriver.cdl      |  6 +-
 ...MDataStd_ExtStringArrayRetrievalDriver.cdl |  6 +-
 ...ataStd_ExtStringArrayRetrievalDriver_1.cdl |  6 +-
 .../MDataStd_ExtStringArrayStorageDriver.cdl  |  6 +-
 .../MDataStd_ExtStringListRetrievalDriver.cdl |  6 +-
 .../MDataStd_ExtStringListStorageDriver.cdl   |  6 +-
 .../MDataStd_IntPackedMapRetrievalDriver.cdl  |  6 +-
 ...MDataStd_IntPackedMapRetrievalDriver_1.cdl |  6 +-
 .../MDataStd_IntPackedMapStorageDriver.cdl    |  6 +-
 .../MDataStd_IntegerArrayRetrievalDriver.cdl  |  6 +-
 ...MDataStd_IntegerArrayRetrievalDriver_1.cdl |  6 +-
 .../MDataStd_IntegerArrayStorageDriver.cdl    |  6 +-
 .../MDataStd_IntegerListRetrievalDriver.cdl   |  6 +-
 .../MDataStd_IntegerListStorageDriver.cdl     |  6 +-
 .../MDataStd_IntegerRetrievalDriver.cdl       |  6 +-
 .../MDataStd_IntegerStorageDriver.cdl         |  6 +-
 src/MDataStd/MDataStd_NameRetrievalDriver.cdl |  6 +-
 src/MDataStd/MDataStd_NameStorageDriver.cdl   |  6 +-
 .../MDataStd_NamedDataRetrievalDriver.cdl     |  6 +-
 .../MDataStd_NamedDataStorageDriver.cdl       |  6 +-
 .../MDataStd_NoteBookRetrievalDriver.cdl      |  6 +-
 .../MDataStd_NoteBookStorageDriver.cdl        |  6 +-
 .../MDataStd_RealArrayRetrievalDriver.cdl     |  6 +-
 .../MDataStd_RealArrayRetrievalDriver_1.cdl   |  6 +-
 .../MDataStd_RealArrayStorageDriver.cdl       |  6 +-
 .../MDataStd_RealListRetrievalDriver.cdl      |  6 +-
 .../MDataStd_RealListStorageDriver.cdl        |  6 +-
 src/MDataStd/MDataStd_RealRetrievalDriver.cdl |  6 +-
 src/MDataStd/MDataStd_RealStorageDriver.cdl   |  6 +-
 ...MDataStd_ReferenceArrayRetrievalDriver.cdl |  6 +-
 .../MDataStd_ReferenceArrayStorageDriver.cdl  |  6 +-
 .../MDataStd_ReferenceListRetrievalDriver.cdl |  6 +-
 .../MDataStd_ReferenceListStorageDriver.cdl   |  6 +-
 .../MDataStd_RelationRetrievalDriver.cdl      |  6 +-
 .../MDataStd_RelationStorageDriver.cdl        |  6 +-
 src/MDataStd/MDataStd_TickRetrievalDriver.cdl |  6 +-
 src/MDataStd/MDataStd_TickStorageDriver.cdl   |  6 +-
 .../MDataStd_TreeNodeRetrievalDriver.cdl      |  6 +-
 .../MDataStd_TreeNodeStorageDriver.cdl        |  6 +-
 .../MDataStd_UAttributeRetrievalDriver.cdl    |  6 +-
 .../MDataStd_UAttributeStorageDriver.cdl      |  6 +-
 .../MDataStd_VariableRetrievalDriver.cdl      |  6 +-
 .../MDataStd_VariableStorageDriver.cdl        |  6 +-
 src/MDataXtd/MDataXtd_AxisRetrievalDriver.cdl |  6 +-
 src/MDataXtd/MDataXtd_AxisStorageDriver.cdl   |  6 +-
 .../MDataXtd_ConstraintRetrievalDriver.cdl    |  6 +-
 .../MDataXtd_ConstraintStorageDriver.cdl      |  6 +-
 .../MDataXtd_GeometryRetrievalDriver.cdl      |  6 +-
 .../MDataXtd_GeometryStorageDriver.cdl        |  6 +-
 .../MDataXtd_PatternStdRetrievalDriver.cdl    |  6 +-
 .../MDataXtd_PatternStdStorageDriver.cdl      |  6 +-
 .../MDataXtd_PlacementRetrievalDriver.cdl     |  6 +-
 .../MDataXtd_PlacementStorageDriver.cdl       |  6 +-
 .../MDataXtd_PlaneRetrievalDriver.cdl         |  6 +-
 src/MDataXtd/MDataXtd_PlaneStorageDriver.cdl  |  6 +-
 .../MDataXtd_PointRetrievalDriver.cdl         |  6 +-
 src/MDataXtd/MDataXtd_PointStorageDriver.cdl  |  6 +-
 .../MDataXtd_ShapeRetrievalDriver.cdl         |  6 +-
 src/MDataXtd/MDataXtd_ShapeStorageDriver.cdl  |  6 +-
 .../MDocStd_DocumentRetrievalDriver.cdl       |  4 +-
 src/MDocStd/MDocStd_DocumentStorageDriver.cdl |  2 +-
 src/MDocStd/MDocStd_XLinkRetrievalDriver.cdl  |  6 +-
 src/MDocStd/MDocStd_XLinkStorageDriver.cdl    |  6 +-
 .../MFunction_FunctionRetrievalDriver.cdl     |  6 +-
 .../MFunction_FunctionStorageDriver.cdl       |  6 +-
 .../MNaming_NamedShapeRetrievalDriver.cdl     |  6 +-
 .../MNaming_NamedShapeStorageDriver.cdl       |  6 +-
 src/MNaming/MNaming_NamingRetrievalDriver.cdl |  6 +-
 .../MNaming_NamingRetrievalDriver_1.cdl       |  6 +-
 .../MNaming_NamingRetrievalDriver_2.cdl       |  6 +-
 src/MNaming/MNaming_NamingStorageDriver.cdl   |  6 +-
 ...MPrsStd_AISPresentationRetrievalDriver.cdl |  6 +-
 ...rsStd_AISPresentationRetrievalDriver_1.cdl |  6 +-
 .../MPrsStd_AISPresentationStorageDriver.cdl  |  6 +-
 .../MPrsStd_PositionRetrievalDriver.cdl       |  6 +-
 src/MPrsStd/MPrsStd_PositionStorageDriver.cdl |  6 +-
 src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cdl |  8 +-
 src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cdl   |  8 +-
 .../MXCAFDoc_CentroidRetrievalDriver.cdl      |  8 +-
 .../MXCAFDoc_CentroidStorageDriver.cdl        |  8 +-
 .../MXCAFDoc_ColorRetrievalDriver.cdl         |  8 +-
 src/MXCAFDoc/MXCAFDoc_ColorStorageDriver.cdl  |  8 +-
 .../MXCAFDoc_ColorToolRetrievalDriver.cdl     |  8 +-
 .../MXCAFDoc_ColorToolStorageDriver.cdl       |  8 +-
 .../MXCAFDoc_DatumRetrievalDriver.cdl         |  6 +-
 src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cdl  |  6 +-
 .../MXCAFDoc_DimTolRetrievalDriver.cdl        |  6 +-
 src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cdl |  6 +-
 .../MXCAFDoc_DimTolToolRetrievalDriver.cdl    |  8 +-
 .../MXCAFDoc_DimTolToolStorageDriver.cdl      |  8 +-
 .../MXCAFDoc_DocumentToolRetrievalDriver.cdl  |  8 +-
 .../MXCAFDoc_DocumentToolStorageDriver.cdl    |  8 +-
 .../MXCAFDoc_GraphNodeRetrievalDriver.cdl     |  8 +-
 .../MXCAFDoc_GraphNodeStorageDriver.cdl       |  8 +-
 .../MXCAFDoc_LayerToolRetrievalDriver.cdl     |  8 +-
 .../MXCAFDoc_LayerToolStorageDriver.cdl       |  8 +-
 .../MXCAFDoc_LocationRetrievalDriver.cdl      |  8 +-
 .../MXCAFDoc_LocationStorageDriver.cdl        |  8 +-
 .../MXCAFDoc_MaterialRetrievalDriver.cdl      |  6 +-
 .../MXCAFDoc_MaterialStorageDriver.cdl        |  6 +-
 .../MXCAFDoc_MaterialToolRetrievalDriver.cdl  |  8 +-
 .../MXCAFDoc_MaterialToolStorageDriver.cdl    |  8 +-
 .../MXCAFDoc_ShapeToolRetrievalDriver.cdl     |  8 +-
 .../MXCAFDoc_ShapeToolStorageDriver.cdl       |  8 +-
 .../MXCAFDoc_VolumeRetrievalDriver.cdl        |  8 +-
 src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cdl |  8 +-
 src/MeshTest/MeshTest_DrawableMesh.cdl        | 10 +--
 src/MeshVS/MeshVS_DeformedDataSource.cdl      |  2 +-
 src/MeshVS/MeshVS_DummySensitiveEntity.cdl    |  2 +-
 .../MeshVS_ElementalColorPrsBuilder.cdl       |  2 +-
 src/MeshVS/MeshVS_Mesh.cdl                    |  2 +-
 src/MeshVS/MeshVS_MeshEntityOwner.cdl         |  2 +-
 src/MeshVS/MeshVS_MeshOwner.cdl               |  2 +-
 src/MeshVS/MeshVS_MeshPrsBuilder.cdl          |  2 +-
 src/MeshVS/MeshVS_NodalColorPrsBuilder.cdl    |  2 +-
 src/MeshVS/MeshVS_SensitiveFace.cdl           |  2 +-
 src/MeshVS/MeshVS_SensitiveMesh.cdl           |  2 +-
 src/MeshVS/MeshVS_SensitivePolyhedron.cdl     |  2 +-
 src/MeshVS/MeshVS_SensitiveSegment.cdl        |  2 +-
 src/MeshVS/MeshVS_TextPrsBuilder.cdl          |  2 +-
 src/MeshVS/MeshVS_VectorPrsBuilder.cdl        |  2 +-
 src/Message/Message_ProgressIndicator.cdl     |  2 +-
 src/MgtBRep/MgtBRep_TranslateTool.cdl         | 24 +++---
 src/MgtTopoDS/MgtTopoDS_TranslateTool.cdl     | 34 ++++----
 src/MoniTool/MoniTool_AttrList.cdl            |  2 +-
 src/MoniTool/MoniTool_IntVal.cdl              |  2 +-
 src/MoniTool/MoniTool_Option.cdl              |  6 +-
 src/MoniTool/MoniTool_RealVal.cdl             |  2 +-
 src/MoniTool/MoniTool_SignShape.cdl           |  2 +-
 src/MoniTool/MoniTool_TransientElem.cdl       |  2 +-
 src/MoniTool/MoniTool_TypedValue.cdl          |  8 +-
 src/NLPlate/NLPlate_HPG0Constraint.cdl        |  2 +-
 src/NLPlate/NLPlate_HPG0G1Constraint.cdl      |  2 +-
 src/NLPlate/NLPlate_HPG0G2Constraint.cdl      |  2 +-
 src/NLPlate/NLPlate_HPG0G3Constraint.cdl      |  2 +-
 src/NLPlate/NLPlate_HPG1Constraint.cdl        |  2 +-
 src/NLPlate/NLPlate_HPG2Constraint.cdl        |  2 +-
 src/NLPlate/NLPlate_HPG3Constraint.cdl        |  2 +-
 src/PBRep/PBRep_Curve3D.cdl                   |  2 +-
 src/PBRep/PBRep_CurveOn2Surfaces.cdl          |  2 +-
 src/PBRep/PBRep_CurveOnClosedSurface.cdl      |  2 +-
 src/PBRep/PBRep_CurveOnSurface.cdl            |  2 +-
 src/PBRep/PBRep_PointOnCurve.cdl              |  2 +-
 src/PBRep/PBRep_PointOnCurveOnSurface.cdl     |  2 +-
 src/PBRep/PBRep_PointOnSurface.cdl            |  2 +-
 src/PBRep/PBRep_Polygon3D.cdl                 |  2 +-
 src/PBRep/PBRep_PolygonOnClosedSurface.cdl    |  2 +-
 .../PBRep_PolygonOnClosedTriangulation.cdl    |  2 +-
 src/PBRep/PBRep_PolygonOnSurface.cdl          |  2 +-
 src/PBRep/PBRep_PolygonOnTriangulation.cdl    |  2 +-
 src/PBRep/PBRep_TEdge.cdl                     |  2 +-
 src/PBRep/PBRep_TEdge1.cdl                    |  2 +-
 src/PBRep/PBRep_TFace.cdl                     |  2 +-
 src/PBRep/PBRep_TFace1.cdl                    |  2 +-
 src/PBRep/PBRep_TVertex.cdl                   |  2 +-
 src/PBRep/PBRep_TVertex1.cdl                  |  2 +-
 src/PCDM/PCDM_ReadWriter.cdl                  | 10 +--
 src/PCDM/PCDM_ReadWriter_1.cdl                | 10 +--
 src/PCDM/PCDM_Reader.cdl                      |  2 +-
 src/PCDM/PCDM_ReferenceIterator.cdl           |  2 +-
 src/PCDM/PCDM_RetrievalDriver.cdl             |  4 +-
 src/PCDMShape/PCDMShape_Document.cdl          |  4 +-
 src/PCollection/PCollection_HArray1.cdl       |  4 +-
 src/PCollection/PCollection_HArray2.cdl       |  4 +-
 src/PCollection/PCollection_HAsciiString.cdl  | 20 ++---
 .../PCollection_HExtendedString.cdl           | 14 +--
 src/PCollection/PCollection_HSequence.cdl     | 16 ++--
 src/PDF/PDF_Data.cdl                          |  4 +-
 src/PDF/PDF_Reference.cdl                     |  4 +-
 src/PDF/PDF_TagSource.cdl                     |  4 +-
 src/PDataStd/PDataStd_AsciiString.cdl         |  4 +-
 src/PDataStd/PDataStd_BooleanArray.cdl        |  2 +-
 src/PDataStd/PDataStd_BooleanList.cdl         |  2 +-
 src/PDataStd/PDataStd_ByteArray.cdl           |  2 +-
 src/PDataStd/PDataStd_ByteArray_1.cdl         |  2 +-
 src/PDataStd/PDataStd_Comment.cdl             |  4 +-
 src/PDataStd/PDataStd_Directory.cdl           |  2 +-
 src/PDataStd/PDataStd_Expression.cdl          |  4 +-
 src/PDataStd/PDataStd_ExtStringArray.cdl      |  2 +-
 src/PDataStd/PDataStd_ExtStringArray_1.cdl    |  2 +-
 src/PDataStd/PDataStd_ExtStringList.cdl       |  2 +-
 src/PDataStd/PDataStd_IntPackedMap.cdl        |  2 +-
 src/PDataStd/PDataStd_IntPackedMap_1.cdl      |  2 +-
 src/PDataStd/PDataStd_Integer.cdl             |  4 +-
 src/PDataStd/PDataStd_IntegerArray.cdl        |  2 +-
 src/PDataStd/PDataStd_IntegerArray_1.cdl      |  2 +-
 src/PDataStd/PDataStd_IntegerList.cdl         |  2 +-
 src/PDataStd/PDataStd_Name.cdl                |  4 +-
 src/PDataStd/PDataStd_NamedData.cdl           |  2 +-
 src/PDataStd/PDataStd_NoteBook.cdl            |  2 +-
 src/PDataStd/PDataStd_Real.cdl                |  4 +-
 src/PDataStd/PDataStd_RealArray.cdl           |  2 +-
 src/PDataStd/PDataStd_RealArray_1.cdl         |  2 +-
 src/PDataStd/PDataStd_RealList.cdl            |  2 +-
 src/PDataStd/PDataStd_ReferenceArray.cdl      |  2 +-
 src/PDataStd/PDataStd_ReferenceList.cdl       |  2 +-
 src/PDataStd/PDataStd_Relation.cdl            |  4 +-
 src/PDataStd/PDataStd_Tick.cdl                |  2 +-
 src/PDataStd/PDataStd_TreeNode.cdl            |  2 +-
 src/PDataStd/PDataStd_UAttribute.cdl          |  2 +-
 src/PDataStd/PDataStd_Variable.cdl            |  4 +-
 src/PDataXtd/PDataXtd_Axis.cdl                |  2 +-
 src/PDataXtd/PDataXtd_Constraint.cdl          |  4 +-
 src/PDataXtd/PDataXtd_Geometry.cdl            |  4 +-
 src/PDataXtd/PDataXtd_PatternStd.cdl          |  2 +-
 src/PDataXtd/PDataXtd_Placement.cdl           |  2 +-
 src/PDataXtd/PDataXtd_Plane.cdl               |  2 +-
 src/PDataXtd/PDataXtd_Point.cdl               |  2 +-
 src/PDataXtd/PDataXtd_Shape.cdl               |  2 +-
 src/PFunction/PFunction_Function.cdl          |  2 +-
 src/PGeom/PGeom_Axis1Placement.cdl            |  4 +-
 src/PGeom/PGeom_Axis2Placement.cdl            |  4 +-
 src/PGeom/PGeom_BSplineCurve.cdl              |  4 +-
 src/PGeom/PGeom_BSplineSurface.cdl            |  4 +-
 src/PGeom/PGeom_BezierCurve.cdl               |  4 +-
 src/PGeom/PGeom_BezierSurface.cdl             |  4 +-
 src/PGeom/PGeom_CartesianPoint.cdl            |  4 +-
 src/PGeom/PGeom_Circle.cdl                    |  4 +-
 src/PGeom/PGeom_ConicalSurface.cdl            |  4 +-
 src/PGeom/PGeom_CylindricalSurface.cdl        |  4 +-
 src/PGeom/PGeom_Direction.cdl                 |  4 +-
 src/PGeom/PGeom_Ellipse.cdl                   |  4 +-
 src/PGeom/PGeom_Hyperbola.cdl                 |  4 +-
 src/PGeom/PGeom_Line.cdl                      |  4 +-
 src/PGeom/PGeom_OffsetCurve.cdl               |  4 +-
 src/PGeom/PGeom_OffsetSurface.cdl             |  4 +-
 src/PGeom/PGeom_Parabola.cdl                  |  4 +-
 src/PGeom/PGeom_Plane.cdl                     |  4 +-
 src/PGeom/PGeom_RectangularTrimmedSurface.cdl |  4 +-
 src/PGeom/PGeom_SphericalSurface.cdl          |  4 +-
 src/PGeom/PGeom_SurfaceOfLinearExtrusion.cdl  |  4 +-
 src/PGeom/PGeom_SurfaceOfRevolution.cdl       |  4 +-
 src/PGeom/PGeom_ToroidalSurface.cdl           |  4 +-
 src/PGeom/PGeom_Transformation.cdl            |  4 +-
 src/PGeom/PGeom_TrimmedCurve.cdl              |  4 +-
 src/PGeom/PGeom_VectorWithMagnitude.cdl       |  4 +-
 src/PGeom2d/PGeom2d_AxisPlacement.cdl         |  4 +-
 src/PGeom2d/PGeom2d_BSplineCurve.cdl          |  4 +-
 src/PGeom2d/PGeom2d_BezierCurve.cdl           |  4 +-
 src/PGeom2d/PGeom2d_CartesianPoint.cdl        |  4 +-
 src/PGeom2d/PGeom2d_Circle.cdl                |  4 +-
 src/PGeom2d/PGeom2d_Direction.cdl             |  4 +-
 src/PGeom2d/PGeom2d_Ellipse.cdl               |  4 +-
 src/PGeom2d/PGeom2d_Hyperbola.cdl             |  4 +-
 src/PGeom2d/PGeom2d_Line.cdl                  |  4 +-
 src/PGeom2d/PGeom2d_OffsetCurve.cdl           |  4 +-
 src/PGeom2d/PGeom2d_Parabola.cdl              |  4 +-
 src/PGeom2d/PGeom2d_Transformation.cdl        |  4 +-
 src/PGeom2d/PGeom2d_TrimmedCurve.cdl          |  4 +-
 src/PGeom2d/PGeom2d_VectorWithMagnitude.cdl   |  4 +-
 src/PNaming/PNaming_Name.cdl                  |  2 +-
 src/PNaming/PNaming_Name_1.cdl                |  2 +-
 src/PNaming/PNaming_Name_2.cdl                |  2 +-
 src/PNaming/PNaming_NamedShape.cdl            |  2 +-
 src/PNaming/PNaming_Naming.cdl                |  2 +-
 src/PNaming/PNaming_Naming_1.cdl              |  2 +-
 src/PNaming/PNaming_Naming_2.cdl              |  2 +-
 src/PPoly/PPoly_Polygon2D.cdl                 |  2 +-
 src/PPoly/PPoly_Polygon3D.cdl                 |  4 +-
 src/PPoly/PPoly_PolygonOnTriangulation.cdl    |  6 +-
 src/PPoly/PPoly_Triangulation.cdl             |  4 +-
 src/PPrsStd/PPrsStd_AISPresentation.cdl       |  2 +-
 src/PPrsStd/PPrsStd_AISPresentation_1.cdl     |  2 +-
 src/PStandard/PStandard_ArrayNode.cdl         |  2 +-
 src/PTopLoc/PTopLoc_Datum3D.cdl               |  2 +-
 src/PTopLoc/PTopLoc_ItemLocation.cdl          |  2 +-
 src/PTopoDS/PTopoDS_CompSolid.cdl             |  2 +-
 src/PTopoDS/PTopoDS_Compound.cdl              |  2 +-
 src/PTopoDS/PTopoDS_Edge.cdl                  |  2 +-
 src/PTopoDS/PTopoDS_Face.cdl                  |  2 +-
 src/PTopoDS/PTopoDS_HShape.cdl                |  2 +-
 src/PTopoDS/PTopoDS_Shell.cdl                 |  2 +-
 src/PTopoDS/PTopoDS_Solid.cdl                 |  2 +-
 src/PTopoDS/PTopoDS_TCompSolid.cdl            |  2 +-
 src/PTopoDS/PTopoDS_TCompSolid1.cdl           |  2 +-
 src/PTopoDS/PTopoDS_TCompound.cdl             |  2 +-
 src/PTopoDS/PTopoDS_TCompound1.cdl            |  2 +-
 src/PTopoDS/PTopoDS_TFace.cdl                 |  2 +-
 src/PTopoDS/PTopoDS_TFace1.cdl                |  2 +-
 src/PTopoDS/PTopoDS_TShell.cdl                |  2 +-
 src/PTopoDS/PTopoDS_TShell1.cdl               |  2 +-
 src/PTopoDS/PTopoDS_TSolid.cdl                |  2 +-
 src/PTopoDS/PTopoDS_TSolid1.cdl               |  2 +-
 src/PTopoDS/PTopoDS_TWire.cdl                 |  2 +-
 src/PTopoDS/PTopoDS_TWire1.cdl                |  2 +-
 src/PTopoDS/PTopoDS_Vertex.cdl                |  2 +-
 src/PTopoDS/PTopoDS_Wire.cdl                  |  2 +-
 src/PXCAFDoc/PXCAFDoc_Area.cdl                |  4 +-
 src/PXCAFDoc/PXCAFDoc_Centroid.cdl            |  4 +-
 src/PXCAFDoc/PXCAFDoc_Color.cdl               |  4 +-
 src/PXCAFDoc/PXCAFDoc_Datum.cdl               |  4 +-
 src/PXCAFDoc/PXCAFDoc_DimTol.cdl              |  4 +-
 src/PXCAFDoc/PXCAFDoc_GraphNode.cdl           |  2 +-
 src/PXCAFDoc/PXCAFDoc_Location.cdl            |  4 +-
 src/PXCAFDoc/PXCAFDoc_Material.cdl            |  4 +-
 src/PXCAFDoc/PXCAFDoc_Volume.cdl              |  4 +-
 src/Poly/Poly_Polygon2D.cdl                   |  2 +-
 src/Poly/Poly_Polygon3D.cdl                   |  4 +-
 src/Poly/Poly_PolygonOnTriangulation.cdl      |  4 +-
 src/Poly/Poly_Triangulation.cdl               |  6 +-
 src/Prs3d/Prs3d_ArrowAspect.cdl               |  4 +-
 src/Prs3d/Prs3d_DatumAspect.cdl               |  8 +-
 src/Prs3d/Prs3d_DimensionAspect.cdl           |  8 +-
 src/Prs3d/Prs3d_Drawer.cdl                    | 38 ++++----
 src/Prs3d/Prs3d_IsoAspect.cdl                 |  4 +-
 src/Prs3d/Prs3d_LineAspect.cdl                |  4 +-
 src/Prs3d/Prs3d_PlaneAspect.cdl               |  8 +-
 src/Prs3d/Prs3d_PlaneSet.cdl                  |  2 +-
 src/Prs3d/Prs3d_PointAspect.cdl               |  6 +-
 src/Prs3d/Prs3d_Presentation.cdl              |  6 +-
 src/Prs3d/Prs3d_Projector.cdl                 |  4 +-
 src/Prs3d/Prs3d_ShadingAspect.cdl             |  2 +-
 src/Prs3d/Prs3d_TextAspect.cdl                |  2 +-
 src/PrsMgr/PrsMgr_PresentableObject.cdl       | 10 +--
 src/PrsMgr/PrsMgr_Presentation.cdl            |  6 +-
 src/PrsMgr/PrsMgr_PresentationManager.cdl     | 16 ++--
 src/PrsMgr/PrsMgr_Prs.cdl                     |  2 +-
 src/QABugs/QABugs_MyText.cdl                  |  8 +-
 src/QABugs/QABugs_PresentableObject.cdl       |  6 +-
 .../QANewModTopOpe_ReShaper.cdl               |  6 +-
 .../RWHeaderSection_GeneralModule.cdl         |  6 +-
 .../RWHeaderSection_RWFileDescription.cdl     |  2 +-
 .../RWHeaderSection_RWFileName.cdl            |  2 +-
 .../RWHeaderSection_RWFileSchema.cdl          |  2 +-
 .../RWHeaderSection_ReadWriteModule.cdl       |  4 +-
 src/RWStepAP214/RWStepAP214_GeneralModule.cdl |  6 +-
 ...WStepAP214_RWAppliedApprovalAssignment.cdl |  2 +-
 ...epAP214_RWAppliedDateAndTimeAssignment.cdl |  2 +-
 .../RWStepAP214_RWAppliedDateAssignment.cdl   |  2 +-
 ...RWStepAP214_RWAppliedDocumentReference.cdl |  2 +-
 ...pAP214_RWAppliedOrganizationAssignment.cdl |  2 +-
 ...AppliedPersonAndOrganizationAssignment.cdl |  2 +-
 .../RWStepAP214_RWAppliedPresentedItem.cdl    |  2 +-
 ...ppliedSecurityClassificationAssignment.cdl |  2 +-
 ...WAutoDesignActualDateAndTimeAssignment.cdl |  2 +-
 ...AP214_RWAutoDesignActualDateAssignment.cdl |  2 +-
 ...epAP214_RWAutoDesignApprovalAssignment.cdl |  2 +-
 ...14_RWAutoDesignDateAndPersonAssignment.cdl |  2 +-
 ...tepAP214_RWAutoDesignDocumentReference.cdl |  2 +-
 ...WStepAP214_RWAutoDesignGroupAssignment.cdl |  2 +-
 ...AutoDesignNominalDateAndTimeAssignment.cdl |  2 +-
 ...P214_RWAutoDesignNominalDateAssignment.cdl |  2 +-
 ...214_RWAutoDesignOrganizationAssignment.cdl |  2 +-
 ...oDesignPersonAndOrganizationAssignment.cdl |  2 +-
 .../RWStepAP214_RWAutoDesignPresentedItem.cdl |  2 +-
 ...DesignSecurityClassificationAssignment.cdl |  2 +-
 .../RWStepAP214_ReadWriteModule.cdl           |  4 +-
 src/RWStepBasic/RWStepBasic_RWAddress.cdl     |  2 +-
 .../RWStepBasic_RWApplicationContext.cdl      |  2 +-
 ...WStepBasic_RWApplicationContextElement.cdl |  2 +-
 ...pBasic_RWApplicationProtocolDefinition.cdl |  2 +-
 src/RWStepBasic/RWStepBasic_RWApproval.cdl    |  2 +-
 .../RWStepBasic_RWApprovalDateTime.cdl        |  2 +-
 ...StepBasic_RWApprovalPersonOrganization.cdl |  2 +-
 .../RWStepBasic_RWApprovalRelationship.cdl    |  2 +-
 .../RWStepBasic_RWApprovalRole.cdl            |  2 +-
 .../RWStepBasic_RWApprovalStatus.cdl          |  2 +-
 .../RWStepBasic_RWCalendarDate.cdl            |  2 +-
 .../RWStepBasic_RWConversionBasedUnit.cdl     |  2 +-
 ...Basic_RWConversionBasedUnitAndAreaUnit.cdl |  2 +-
 ...sic_RWConversionBasedUnitAndLengthUnit.cdl |  2 +-
 ...Basic_RWConversionBasedUnitAndMassUnit.cdl |  2 +-
 ...RWConversionBasedUnitAndPlaneAngleUnit.cdl |  2 +-
 ...asic_RWConversionBasedUnitAndRatioUnit.cdl |  2 +-
 ...RWConversionBasedUnitAndSolidAngleUnit.cdl |  2 +-
 ...Basic_RWConversionBasedUnitAndTimeUnit.cdl |  2 +-
 ...sic_RWConversionBasedUnitAndVolumeUnit.cdl |  2 +-
 ...Basic_RWCoordinatedUniversalTimeOffset.cdl |  2 +-
 src/RWStepBasic/RWStepBasic_RWDate.cdl        |  2 +-
 src/RWStepBasic/RWStepBasic_RWDateAndTime.cdl |  2 +-
 src/RWStepBasic/RWStepBasic_RWDateRole.cdl    |  2 +-
 .../RWStepBasic_RWDateTimeRole.cdl            |  2 +-
 src/RWStepBasic/RWStepBasic_RWDerivedUnit.cdl |  2 +-
 .../RWStepBasic_RWDerivedUnitElement.cdl      |  2 +-
 .../RWStepBasic_RWDimensionalExponents.cdl    |  2 +-
 .../RWStepBasic_RWDocumentRelationship.cdl    |  2 +-
 .../RWStepBasic_RWDocumentType.cdl            |  2 +-
 .../RWStepBasic_RWDocumentUsageConstraint.cdl |  2 +-
 src/RWStepBasic/RWStepBasic_RWEffectivity.cdl |  2 +-
 .../RWStepBasic_RWLengthMeasureWithUnit.cdl   |  2 +-
 src/RWStepBasic/RWStepBasic_RWLengthUnit.cdl  |  2 +-
 src/RWStepBasic/RWStepBasic_RWLocalTime.cdl   |  2 +-
 .../RWStepBasic_RWMassMeasureWithUnit.cdl     |  2 +-
 .../RWStepBasic_RWMeasureWithUnit.cdl         |  2 +-
 .../RWStepBasic_RWMechanicalContext.cdl       |  2 +-
 src/RWStepBasic/RWStepBasic_RWNamedUnit.cdl   |  2 +-
 src/RWStepBasic/RWStepBasic_RWOrdinalDate.cdl |  2 +-
 .../RWStepBasic_RWOrganization.cdl            |  2 +-
 .../RWStepBasic_RWOrganizationRole.cdl        |  2 +-
 .../RWStepBasic_RWOrganizationalAddress.cdl   |  2 +-
 src/RWStepBasic/RWStepBasic_RWPerson.cdl      |  2 +-
 .../RWStepBasic_RWPersonAndOrganization.cdl   |  2 +-
 ...WStepBasic_RWPersonAndOrganizationRole.cdl |  2 +-
 .../RWStepBasic_RWPersonalAddress.cdl         |  2 +-
 ...WStepBasic_RWPlaneAngleMeasureWithUnit.cdl |  2 +-
 .../RWStepBasic_RWPlaneAngleUnit.cdl          |  2 +-
 src/RWStepBasic/RWStepBasic_RWProduct.cdl     |  2 +-
 .../RWStepBasic_RWProductCategory.cdl         |  2 +-
 .../RWStepBasic_RWProductContext.cdl          |  2 +-
 .../RWStepBasic_RWProductDefinition.cdl       |  2 +-
 ...RWStepBasic_RWProductDefinitionContext.cdl |  2 +-
 ...epBasic_RWProductDefinitionEffectivity.cdl |  2 +-
 ...StepBasic_RWProductDefinitionFormation.cdl |  2 +-
 ...DefinitionFormationWithSpecifiedSource.cdl |  2 +-
 ...oductDefinitionWithAssociatedDocuments.cdl |  2 +-
 ...pBasic_RWProductRelatedProductCategory.cdl |  2 +-
 src/RWStepBasic/RWStepBasic_RWProductType.cdl |  2 +-
 .../RWStepBasic_RWRatioMeasureWithUnit.cdl    |  2 +-
 .../RWStepBasic_RWSecurityClassification.cdl  |  2 +-
 ...tepBasic_RWSecurityClassificationLevel.cdl |  2 +-
 src/RWStepBasic/RWStepBasic_RWSiUnit.cdl      |  2 +-
 .../RWStepBasic_RWSiUnitAndAreaUnit.cdl       |  2 +-
 .../RWStepBasic_RWSiUnitAndLengthUnit.cdl     |  2 +-
 .../RWStepBasic_RWSiUnitAndMassUnit.cdl       |  2 +-
 .../RWStepBasic_RWSiUnitAndPlaneAngleUnit.cdl |  2 +-
 .../RWStepBasic_RWSiUnitAndRatioUnit.cdl      |  2 +-
 .../RWStepBasic_RWSiUnitAndSolidAngleUnit.cdl |  2 +-
 ...WSiUnitAndThermodynamicTemperatureUnit.cdl |  2 +-
 .../RWStepBasic_RWSiUnitAndTimeUnit.cdl       |  2 +-
 .../RWStepBasic_RWSiUnitAndVolumeUnit.cdl     |  2 +-
 ...WStepBasic_RWSolidAngleMeasureWithUnit.cdl |  2 +-
 .../RWStepBasic_RWSolidAngleUnit.cdl          |  2 +-
 ...StepBasic_RWUncertaintyMeasureWithUnit.cdl |  2 +-
 .../RWStepBasic_RWWeekOfYearAndDayDate.cdl    |  2 +-
 ...ndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl |  2 +-
 .../RWStepGeom_RWAxis1Placement.cdl           |  2 +-
 .../RWStepGeom_RWAxis2Placement2d.cdl         |  2 +-
 .../RWStepGeom_RWAxis2Placement3d.cdl         |  2 +-
 src/RWStepGeom/RWStepGeom_RWBSplineCurve.cdl  |  2 +-
 .../RWStepGeom_RWBSplineCurveWithKnots.cdl    |  2 +-
 ...eCurveWithKnotsAndRationalBSplineCurve.cdl |  2 +-
 .../RWStepGeom_RWBSplineSurface.cdl           |  2 +-
 .../RWStepGeom_RWBSplineSurfaceWithKnots.cdl  |  2 +-
 ...faceWithKnotsAndRationalBSplineSurface.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWBezierCurve.cdl   |  2 +-
 ...m_RWBezierCurveAndRationalBSplineCurve.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWBezierSurface.cdl |  2 +-
 ...BezierSurfaceAndRationalBSplineSurface.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWBoundedCurve.cdl  |  2 +-
 .../RWStepGeom_RWBoundedSurface.cdl           |  2 +-
 .../RWStepGeom_RWCartesianPoint.cdl           |  2 +-
 ...Geom_RWCartesianTransformationOperator.cdl |  2 +-
 ...om_RWCartesianTransformationOperator3d.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWCircle.cdl        |  2 +-
 .../RWStepGeom_RWCompositeCurve.cdl           |  2 +-
 .../RWStepGeom_RWCompositeCurveOnSurface.cdl  |  2 +-
 .../RWStepGeom_RWCompositeCurveSegment.cdl    |  2 +-
 src/RWStepGeom/RWStepGeom_RWConic.cdl         |  2 +-
 .../RWStepGeom_RWConicalSurface.cdl           |  2 +-
 src/RWStepGeom/RWStepGeom_RWCurve.cdl         |  2 +-
 src/RWStepGeom/RWStepGeom_RWCurveReplica.cdl  |  2 +-
 .../RWStepGeom_RWCylindricalSurface.cdl       |  2 +-
 .../RWStepGeom_RWDegeneratePcurve.cdl         |  2 +-
 ...RWStepGeom_RWDegenerateToroidalSurface.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWDirection.cdl     |  2 +-
 .../RWStepGeom_RWElementarySurface.cdl        |  2 +-
 src/RWStepGeom/RWStepGeom_RWEllipse.cdl       |  2 +-
 ...RWStepGeom_RWEvaluatedDegeneratePcurve.cdl |  2 +-
 ...GlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl |  2 +-
 ...pGeom_RWGeometricRepresentationContext.cdl |  2 +-
 ...ionContextAndGlobalUnitAssignedContext.cdl |  2 +-
 ...textAndParametricRepresentationContext.cdl |  2 +-
 ...StepGeom_RWGeometricRepresentationItem.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWHyperbola.cdl     |  2 +-
 .../RWStepGeom_RWIntersectionCurve.cdl        |  2 +-
 src/RWStepGeom/RWStepGeom_RWLine.cdl          |  2 +-
 src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWOffsetSurface.cdl |  2 +-
 .../RWStepGeom_RWOuterBoundaryCurve.cdl       |  2 +-
 src/RWStepGeom/RWStepGeom_RWParabola.cdl      |  2 +-
 src/RWStepGeom/RWStepGeom_RWPcurve.cdl        |  2 +-
 src/RWStepGeom/RWStepGeom_RWPlacement.cdl     |  2 +-
 src/RWStepGeom/RWStepGeom_RWPlane.cdl         |  2 +-
 src/RWStepGeom/RWStepGeom_RWPoint.cdl         |  2 +-
 src/RWStepGeom/RWStepGeom_RWPointOnCurve.cdl  |  2 +-
 .../RWStepGeom_RWPointOnSurface.cdl           |  2 +-
 src/RWStepGeom/RWStepGeom_RWPointReplica.cdl  |  2 +-
 src/RWStepGeom/RWStepGeom_RWPolyline.cdl      |  2 +-
 .../RWStepGeom_RWQuasiUniformCurve.cdl        |  2 +-
 ...asiUniformCurveAndRationalBSplineCurve.cdl |  2 +-
 .../RWStepGeom_RWQuasiUniformSurface.cdl      |  2 +-
 ...niformSurfaceAndRationalBSplineSurface.cdl |  2 +-
 .../RWStepGeom_RWRationalBSplineCurve.cdl     |  2 +-
 .../RWStepGeom_RWRationalBSplineSurface.cdl   |  2 +-
 ...StepGeom_RWRectangularCompositeSurface.cdl |  2 +-
 ...RWStepGeom_RWRectangularTrimmedSurface.cdl |  2 +-
 ..._RWReparametrisedCompositeCurveSegment.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWSeamCurve.cdl     |  2 +-
 .../RWStepGeom_RWSphericalSurface.cdl         |  2 +-
 src/RWStepGeom/RWStepGeom_RWSurface.cdl       |  2 +-
 src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cdl  |  2 +-
 ...StepGeom_RWSurfaceCurveAndBoundedCurve.cdl |  2 +-
 .../RWStepGeom_RWSurfaceOfLinearExtrusion.cdl |  2 +-
 .../RWStepGeom_RWSurfaceOfRevolution.cdl      |  2 +-
 src/RWStepGeom/RWStepGeom_RWSurfacePatch.cdl  |  2 +-
 .../RWStepGeom_RWSurfaceReplica.cdl           |  2 +-
 src/RWStepGeom/RWStepGeom_RWSweptSurface.cdl  |  2 +-
 .../RWStepGeom_RWToroidalSurface.cdl          |  2 +-
 src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cdl  |  2 +-
 src/RWStepGeom/RWStepGeom_RWUniformCurve.cdl  |  2 +-
 ..._RWUniformCurveAndRationalBSplineCurve.cdl |  2 +-
 .../RWStepGeom_RWUniformSurface.cdl           |  2 +-
 ...niformSurfaceAndRationalBSplineSurface.cdl |  2 +-
 src/RWStepGeom/RWStepGeom_RWVector.cdl        |  2 +-
 ...epr_RWAssemblyComponentUsageSubstitute.cdl |  2 +-
 ...WStepRepr_RWCompoundRepresentationItem.cdl |  2 +-
 ...WStepRepr_RWDefinitionalRepresentation.cdl |  2 +-
 ...epRepr_RWDescriptiveRepresentationItem.cdl |  2 +-
 ...pr_RWFunctionallyDefinedTransformation.cdl |  2 +-
 ...epr_RWGlobalUncertaintyAssignedContext.cdl |  2 +-
 ...RWStepRepr_RWGlobalUnitAssignedContext.cdl |  2 +-
 ...RWStepRepr_RWItemDefinedTransformation.cdl |  2 +-
 src/RWStepRepr/RWStepRepr_RWMappedItem.cdl    |  2 +-
 .../RWStepRepr_RWMaterialDesignation.cdl      |  2 +-
 ...RWStepRepr_RWMeasureRepresentationItem.cdl |  2 +-
 ...Repr_RWParametricRepresentationContext.cdl |  2 +-
 ...epr_RWReprItemAndLengthMeasureWithUnit.cdl |  2 +-
 .../RWStepRepr_RWRepresentation.cdl           |  2 +-
 .../RWStepRepr_RWRepresentationContext.cdl    |  2 +-
 .../RWStepRepr_RWRepresentationItem.cdl       |  2 +-
 .../RWStepRepr_RWRepresentationMap.cdl        |  2 +-
 ...WStepRepr_RWRepresentationRelationship.cdl |  2 +-
 ...entationRelationshipWithTransformation.cdl |  2 +-
 src/RWStepRepr/RWStepRepr_RWShapeAspect.cdl   |  2 +-
 ...entationRelationshipWithTransformation.cdl |  2 +-
 ...hape_RWAdvancedBrepShapeRepresentation.cdl |  2 +-
 .../RWStepShape_RWAdvancedFace.cdl            |  2 +-
 src/RWStepShape/RWStepShape_RWBlock.cdl       |  2 +-
 .../RWStepShape_RWBooleanResult.cdl           |  2 +-
 src/RWStepShape/RWStepShape_RWBoxDomain.cdl   |  2 +-
 .../RWStepShape_RWBoxedHalfSpace.cdl          |  2 +-
 .../RWStepShape_RWBrepWithVoids.cdl           |  2 +-
 src/RWStepShape/RWStepShape_RWClosedShell.cdl |  2 +-
 .../RWStepShape_RWConnectedFaceSet.cdl        |  2 +-
 ..._RWContextDependentShapeRepresentation.cdl |  2 +-
 .../RWStepShape_RWCsgShapeRepresentation.cdl  |  2 +-
 src/RWStepShape/RWStepShape_RWCsgSolid.cdl    |  2 +-
 ...alRepresentationAndShapeRepresentation.cdl |  2 +-
 src/RWStepShape/RWStepShape_RWEdge.cdl        |  2 +-
 src/RWStepShape/RWStepShape_RWEdgeCurve.cdl   |  2 +-
 src/RWStepShape/RWStepShape_RWEdgeLoop.cdl    |  2 +-
 .../RWStepShape_RWExtrudedAreaSolid.cdl       |  2 +-
 .../RWStepShape_RWExtrudedFaceSolid.cdl       |  2 +-
 src/RWStepShape/RWStepShape_RWFace.cdl        |  2 +-
 src/RWStepShape/RWStepShape_RWFaceBound.cdl   |  2 +-
 .../RWStepShape_RWFaceOuterBound.cdl          |  2 +-
 src/RWStepShape/RWStepShape_RWFaceSurface.cdl |  2 +-
 src/RWStepShape/RWStepShape_RWFacetedBrep.cdl |  2 +-
 ...tepShape_RWFacetedBrepAndBrepWithVoids.cdl |  2 +-
 ...Shape_RWFacetedBrepShapeRepresentation.cdl |  2 +-
 .../RWStepShape_RWGeometricCurveSet.cdl       |  2 +-
 .../RWStepShape_RWGeometricSet.cdl            |  2 +-
 ...callyBoundedSurfaceShapeRepresentation.cdl |  2 +-
 ...llyBoundedWireframeShapeRepresentation.cdl |  2 +-
 .../RWStepShape_RWHalfSpaceSolid.cdl          |  2 +-
 .../RWStepShape_RWLimitsAndFits.cdl           |  2 +-
 src/RWStepShape/RWStepShape_RWLoop.cdl        |  2 +-
 src/RWStepShape/RWStepShape_RWLoopAndPath.cdl |  2 +-
 .../RWStepShape_RWManifoldSolidBrep.cdl       |  2 +-
 ...e_RWManifoldSurfaceShapeRepresentation.cdl |  2 +-
 .../RWStepShape_RWMeasureQualification.cdl    |  2 +-
 ...tionItemAndQualifiedRepresentationItem.cdl |  2 +-
 src/RWStepShape/RWStepShape_RWOpenShell.cdl   |  2 +-
 .../RWStepShape_RWOrientedClosedShell.cdl     |  2 +-
 .../RWStepShape_RWOrientedEdge.cdl            |  2 +-
 .../RWStepShape_RWOrientedFace.cdl            |  2 +-
 .../RWStepShape_RWOrientedOpenShell.cdl       |  2 +-
 .../RWStepShape_RWOrientedPath.cdl            |  2 +-
 src/RWStepShape/RWStepShape_RWPath.cdl        |  2 +-
 .../RWStepShape_RWPlusMinusTolerance.cdl      |  2 +-
 src/RWStepShape/RWStepShape_RWPolyLoop.cdl    |  2 +-
 .../RWStepShape_RWPrecisionQualifier.cdl      |  2 +-
 ...tepShape_RWQualifiedRepresentationItem.cdl |  2 +-
 .../RWStepShape_RWRevolvedAreaSolid.cdl       |  2 +-
 .../RWStepShape_RWRevolvedFaceSolid.cdl       |  2 +-
 .../RWStepShape_RWRightAngularWedge.cdl       |  2 +-
 .../RWStepShape_RWRightCircularCone.cdl       |  2 +-
 .../RWStepShape_RWRightCircularCylinder.cdl   |  2 +-
 .../RWStepShape_RWShapeRepresentation.cdl     |  2 +-
 .../RWStepShape_RWShellBasedSurfaceModel.cdl  |  2 +-
 src/RWStepShape/RWStepShape_RWSolidModel.cdl  |  2 +-
 .../RWStepShape_RWSolidReplica.cdl            |  2 +-
 src/RWStepShape/RWStepShape_RWSphere.cdl      |  2 +-
 .../RWStepShape_RWSweptAreaSolid.cdl          |  2 +-
 .../RWStepShape_RWSweptFaceSolid.cdl          |  2 +-
 .../RWStepShape_RWToleranceValue.cdl          |  2 +-
 ...pShape_RWTopologicalRepresentationItem.cdl |  2 +-
 src/RWStepShape/RWStepShape_RWTorus.cdl       |  2 +-
 ...hape_RWTransitionalShapeRepresentation.cdl |  2 +-
 .../RWStepShape_RWTypeQualifier.cdl           |  2 +-
 src/RWStepShape/RWStepShape_RWVertex.cdl      |  2 +-
 src/RWStepShape/RWStepShape_RWVertexLoop.cdl  |  2 +-
 src/RWStepShape/RWStepShape_RWVertexPoint.cdl |  2 +-
 src/RWStepVisual/RWStepVisual_RWAreaInSet.cdl |  2 +-
 .../RWStepVisual_RWBackgroundColour.cdl       |  2 +-
 .../RWStepVisual_RWCameraImage.cdl            |  2 +-
 .../RWStepVisual_RWCameraModel.cdl            |  2 +-
 .../RWStepVisual_RWCameraModelD2.cdl          |  2 +-
 .../RWStepVisual_RWCameraModelD3.cdl          |  2 +-
 .../RWStepVisual_RWCameraUsage.cdl            |  2 +-
 src/RWStepVisual/RWStepVisual_RWColour.cdl    |  2 +-
 src/RWStepVisual/RWStepVisual_RWColourRgb.cdl |  2 +-
 .../RWStepVisual_RWColourSpecification.cdl    |  2 +-
 .../RWStepVisual_RWCompositeText.cdl          |  2 +-
 ...RWStepVisual_RWCompositeTextWithExtent.cdl |  2 +-
 ...pVisual_RWContextDependentInvisibility.cdl |  2 +-
 ...RWContextDependentOverRidingStyledItem.cdl |  2 +-
 .../RWStepVisual_RWCurveStyle.cdl             |  2 +-
 .../RWStepVisual_RWCurveStyleFont.cdl         |  2 +-
 .../RWStepVisual_RWCurveStyleFontPattern.cdl  |  2 +-
 ...tepVisual_RWDraughtingPreDefinedColour.cdl |  2 +-
 ...Visual_RWDraughtingPreDefinedCurveFont.cdl |  2 +-
 .../RWStepVisual_RWFillAreaStyle.cdl          |  2 +-
 .../RWStepVisual_RWFillAreaStyleColour.cdl    |  2 +-
 .../RWStepVisual_RWInvisibility.cdl           |  2 +-
 ...hanicalDesignGeometricPresentationArea.cdl |  2 +-
 ...ignGeometricPresentationRepresentation.cdl |  2 +-
 .../RWStepVisual_RWOverRidingStyledItem.cdl   |  2 +-
 src/RWStepVisual/RWStepVisual_RWPlanarBox.cdl |  2 +-
 .../RWStepVisual_RWPlanarExtent.cdl           |  2 +-
 .../RWStepVisual_RWPointStyle.cdl             |  2 +-
 .../RWStepVisual_RWPreDefinedColour.cdl       |  2 +-
 .../RWStepVisual_RWPreDefinedCurveFont.cdl    |  2 +-
 .../RWStepVisual_RWPreDefinedItem.cdl         |  2 +-
 .../RWStepVisual_RWPresentationArea.cdl       |  2 +-
 ...epVisual_RWPresentationLayerAssignment.cdl |  2 +-
 .../RWStepVisual_RWPresentationLayerUsage.cdl |  2 +-
 ...tepVisual_RWPresentationRepresentation.cdl |  2 +-
 .../RWStepVisual_RWPresentationSet.cdl        |  2 +-
 .../RWStepVisual_RWPresentationSize.cdl       |  2 +-
 ...epVisual_RWPresentationStyleAssignment.cdl |  2 +-
 ...tepVisual_RWPresentationStyleByContext.cdl |  2 +-
 .../RWStepVisual_RWPresentationView.cdl       |  2 +-
 ...epVisual_RWPresentedItemRepresentation.cdl |  2 +-
 .../RWStepVisual_RWStyledItem.cdl             |  2 +-
 .../RWStepVisual_RWSurfaceSideStyle.cdl       |  2 +-
 .../RWStepVisual_RWSurfaceStyleBoundary.cdl   |  2 +-
 ...RWStepVisual_RWSurfaceStyleControlGrid.cdl |  2 +-
 .../RWStepVisual_RWSurfaceStyleFillArea.cdl   |  2 +-
 ...StepVisual_RWSurfaceStyleParameterLine.cdl |  2 +-
 ...Visual_RWSurfaceStyleSegmentationCurve.cdl |  2 +-
 .../RWStepVisual_RWSurfaceStyleSilhouette.cdl |  2 +-
 .../RWStepVisual_RWSurfaceStyleUsage.cdl      |  2 +-
 src/RWStepVisual/RWStepVisual_RWTemplate.cdl  |  2 +-
 .../RWStepVisual_RWTemplateInstance.cdl       |  2 +-
 .../RWStepVisual_RWTextLiteral.cdl            |  2 +-
 src/RWStepVisual/RWStepVisual_RWTextStyle.cdl |  2 +-
 ...RWStepVisual_RWTextStyleForDefinedFont.cdl |  2 +-
 ...sual_RWTextStyleWithBoxCharacteristics.cdl |  2 +-
 .../RWStepVisual_RWViewVolume.cdl             |  2 +-
 src/Resource/Resource_Manager.cdl             |  4 +-
 .../STEPCAFControl_ActorWrite.cdl             |  2 +-
 .../STEPCAFControl_Controller.cdl             |  2 +-
 src/STEPCAFControl/STEPCAFControl_Reader.cdl  |  4 +-
 src/STEPCAFControl/STEPCAFControl_Writer.cdl  |  4 +-
 src/STEPControl/STEPControl_ActorRead.cdl     | 40 ++++-----
 src/STEPControl/STEPControl_ActorWrite.cdl    | 22 ++---
 src/STEPControl/STEPControl_Controller.cdl    | 10 +--
 src/STEPControl/STEPControl_Reader.cdl        |  2 +-
 src/STEPControl/STEPControl_Writer.cdl        |  4 +-
 .../STEPSelections_AssemblyComponent.cdl      |  4 +-
 .../STEPSelections_AssemblyLink.cdl           |  4 +-
 .../STEPSelections_SelectAssembly.cdl         |  2 +-
 .../STEPSelections_SelectDerived.cdl          |  2 +-
 .../STEPSelections_SelectFaces.cdl            |  2 +-
 .../STEPSelections_SelectForTransfer.cdl      |  4 +-
 .../STEPSelections_SelectGSCurves.cdl         |  2 +-
 .../STEPSelections_SelectInstances.cdl        |  2 +-
 src/Select3D/Select3D_SensitiveBox.cdl        |  4 +-
 src/Select3D/Select3D_SensitiveCircle.cdl     |  8 +-
 src/Select3D/Select3D_SensitiveCurve.cdl      |  6 +-
 src/Select3D/Select3D_SensitiveFace.cdl       |  4 +-
 src/Select3D/Select3D_SensitiveGroup.cdl      |  4 +-
 src/Select3D/Select3D_SensitivePoint.cdl      |  2 +-
 src/Select3D/Select3D_SensitivePoly.cdl       |  6 +-
 src/Select3D/Select3D_SensitiveSegment.cdl    |  2 +-
 src/Select3D/Select3D_SensitiveTriangle.cdl   |  2 +-
 .../Select3D_SensitiveTriangulation.cdl       |  4 +-
 src/Select3D/Select3D_SensitiveWire.cdl       |  2 +-
 src/SelectMgr/SelectMgr_AndFilter.cdl         |  2 +-
 src/SelectMgr/SelectMgr_EntityOwner.cdl       |  4 +-
 src/SelectMgr/SelectMgr_OrFilter.cdl          |  2 +-
 src/SelectMgr/SelectMgr_SelectableObject.cdl  |  4 +-
 src/SelectMgr/SelectMgr_Selection.cdl         |  2 +-
 src/SelectMgr/SelectMgr_SelectionManager.cdl  |  2 +-
 src/SelectMgr/SelectMgr_ViewerSelector.cdl    |  2 +-
 src/ShapeAlgo/ShapeAlgo_AlgoContainer.cdl     |  2 +-
 src/ShapeAlgo/ShapeAlgo_ToolContainer.cdl     |  2 +-
 .../ShapeAnalysis_FreeBoundData.cdl           |  4 +-
 src/ShapeAnalysis/ShapeAnalysis_Surface.cdl   |  2 +-
 .../ShapeAnalysis_TransferParameters.cdl      |  4 +-
 .../ShapeAnalysis_TransferParametersProj.cdl  |  4 +-
 src/ShapeBuild/ShapeBuild_ReShape.cdl         |  2 +-
 .../ShapeCustom_BSplineRestriction.cdl        |  6 +-
 .../ShapeCustom_ConvertToBSpline.cdl          |  2 +-
 .../ShapeCustom_ConvertToRevolution.cdl       |  2 +-
 .../ShapeCustom_DirectModification.cdl        |  2 +-
 .../ShapeCustom_RestrictionParameters.cdl     |  2 +-
 .../ShapeCustom_SweptToElementary.cdl         |  2 +-
 .../ShapeCustom_TrsfModification.cdl          |  2 +-
 .../ShapeExtend_BasicMsgRegistrator.cdl       |  2 +-
 src/ShapeExtend/ShapeExtend_ComplexCurve.cdl  |  2 +-
 .../ShapeExtend_CompositeSurface.cdl          | 12 +--
 .../ShapeExtend_MsgRegistrator.cdl            |  2 +-
 src/ShapeExtend/ShapeExtend_WireData.cdl      |  4 +-
 src/ShapeFix/ShapeFix_EdgeProjAux.cdl         |  4 +-
 ...apeUpgrade_ConvertSurfaceToBezierBasis.cdl |  2 +-
 src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cdl  |  2 +-
 src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cdl  |  2 +-
 .../ShapeUpgrade_SplitCurve2d.cdl             |  2 +-
 .../ShapeUpgrade_SplitCurve3d.cdl             |  2 +-
 .../ShapeUpgrade_SplitSurface.cdl             |  2 +-
 .../ShapeUpgrade_SplitSurfaceAngle.cdl        |  2 +-
 .../ShapeUpgrade_SplitSurfaceArea.cdl         |  2 +-
 .../ShapeUpgrade_SplitSurfaceContinuity.cdl   |  2 +-
 src/ShapeUpgrade/ShapeUpgrade_WireDivide.cdl  |  2 +-
 src/Standard/Standard_Failure.cdl             |  8 +-
 src/Standard/Standard_Persistent.cdl          |  2 +-
 src/Standard/Standard_Transient.cdl           |  2 +-
 src/Standard/Standard_Type.cdl                |  8 +-
 .../StdDrivers_DocumentRetrievalDriver.cdl    |  2 +-
 .../StdDrivers_DocumentStorageDriver.cdl      |  2 +-
 .../StdLDrivers_DocumentRetrievalDriver.cdl   |  2 +-
 .../StdLDrivers_DocumentStorageDriver.cdl     |  2 +-
 src/StdSelect/StdSelect.cdl                   |  2 +-
 src/StdSelect/StdSelect_BRepOwner.cdl         |  6 +-
 src/StdSelect/StdSelect_BRepSelectionTool.cdl | 10 +--
 src/StdSelect/StdSelect_EdgeFilter.cdl        |  2 +-
 src/StdSelect/StdSelect_FaceFilter.cdl        |  2 +-
 src/StdSelect/StdSelect_Prs.cdl               |  2 +-
 src/StdSelect/StdSelect_Shape.cdl             |  8 +-
 src/StdSelect/StdSelect_ShapeTypeFilter.cdl   |  2 +-
 src/StdSelect/StdSelect_ViewerSelector3d.cdl  |  6 +-
 .../StepAP214_AppliedApprovalAssignment.cdl   | 12 +--
 ...StepAP214_AppliedDateAndTimeAssignment.cdl | 16 ++--
 .../StepAP214_AppliedDateAssignment.cdl       | 16 ++--
 ...tepAP214_AppliedOrganizationAssignment.cdl | 16 ++--
 ...AppliedPersonAndOrganizationAssignment.cdl | 16 ++--
 .../StepAP214_AppliedPresentedItem.cdl        |  8 +-
 ...ppliedSecurityClassificationAssignment.cdl | 12 +--
 ..._AutoDesignActualDateAndTimeAssignment.cdl | 16 ++--
 ...epAP214_AutoDesignActualDateAssignment.cdl | 16 ++--
 ...StepAP214_AutoDesignApprovalAssignment.cdl | 12 +--
 ...P214_AutoDesignDateAndPersonAssignment.cdl | 16 ++--
 .../StepAP214_AutoDesignGroupAssignment.cdl   | 13 ++-
 .../StepAP214_AutoDesignGroupAssignment.cxx   |  7 --
 ...AutoDesignNominalDateAndTimeAssignment.cdl | 16 ++--
 ...pAP214_AutoDesignNominalDateAssignment.cdl | 16 ++--
 ...AP214_AutoDesignOrganizationAssignment.cdl | 16 ++--
 ...oDesignPersonAndOrganizationAssignment.cdl | 16 ++--
 .../StepAP214_AutoDesignPresentedItem.cdl     |  8 +-
 ...DesignSecurityClassificationAssignment.cdl | 14 +--
 src/StepAP214/StepAP214_Protocol.cdl          |  2 +-
 src/StepBasic/StepBasic_Address.cdl           | 74 ++++++++--------
 .../StepBasic_ApplicationContext.cdl          |  8 +-
 .../StepBasic_ApplicationContextElement.cdl   | 14 +--
 ...tepBasic_ApplicationProtocolDefinition.cdl | 20 ++---
 src/StepBasic/StepBasic_Approval.cdl          | 14 +--
 .../StepBasic_ApprovalAssignment.cdl          |  6 +-
 src/StepBasic/StepBasic_ApprovalDateTime.cdl  |  2 +-
 .../StepBasic_ApprovalPersonOrganization.cdl  | 14 +--
 .../StepBasic_ApprovalRelationship.cdl        | 26 +++---
 src/StepBasic/StepBasic_ApprovalRole.cdl      |  8 +-
 src/StepBasic/StepBasic_ApprovalStatus.cdl    |  8 +-
 src/StepBasic/StepBasic_AreaUnit.cdl          |  2 +-
 src/StepBasic/StepBasic_CalendarDate.cdl      |  2 +-
 .../StepBasic_ConversionBasedUnit.cdl         | 18 ++--
 ...epBasic_ConversionBasedUnitAndAreaUnit.cdl |  6 +-
 ...Basic_ConversionBasedUnitAndLengthUnit.cdl | 14 +--
 ...epBasic_ConversionBasedUnitAndMassUnit.cdl | 14 +--
 ...c_ConversionBasedUnitAndPlaneAngleUnit.cdl | 14 +--
 ...pBasic_ConversionBasedUnitAndRatioUnit.cdl | 14 +--
 ...c_ConversionBasedUnitAndSolidAngleUnit.cdl | 14 +--
 ...epBasic_ConversionBasedUnitAndTimeUnit.cdl | 14 +--
 ...Basic_ConversionBasedUnitAndVolumeUnit.cdl |  6 +-
 ...epBasic_CoordinatedUniversalTimeOffset.cdl |  2 +-
 src/StepBasic/StepBasic_Date.cdl              |  2 +-
 src/StepBasic/StepBasic_DateAndTime.cdl       | 14 +--
 .../StepBasic_DateAndTimeAssignment.cdl       | 12 +--
 src/StepBasic/StepBasic_DateAssignment.cdl    | 12 +--
 src/StepBasic/StepBasic_DateRole.cdl          |  8 +-
 src/StepBasic/StepBasic_DateTimeRole.cdl      |  8 +-
 src/StepBasic/StepBasic_DerivedUnit.cdl       |  2 +-
 .../StepBasic_DerivedUnitElement.cdl          |  2 +-
 src/StepBasic/StepBasic_DesignContext.cdl     |  2 +-
 src/StepBasic/StepBasic_DigitalDocument.cdl   |  2 +-
 .../StepBasic_DimensionalExponents.cdl        |  2 +-
 .../StepBasic_DocumentRelationship.cdl        |  2 +-
 src/StepBasic/StepBasic_DocumentType.cdl      |  2 +-
 .../StepBasic_DocumentUsageConstraint.cdl     |  2 +-
 src/StepBasic/StepBasic_Effectivity.cdl       |  2 +-
 .../StepBasic_LengthMeasureWithUnit.cdl       |  2 +-
 src/StepBasic/StepBasic_LengthUnit.cdl        |  2 +-
 src/StepBasic/StepBasic_LocalTime.cdl         |  8 +-
 .../StepBasic_MassMeasureWithUnit.cdl         |  2 +-
 .../StepBasic_MeasureValueMember.cdl          |  2 +-
 src/StepBasic/StepBasic_MeasureWithUnit.cdl   |  2 +-
 src/StepBasic/StepBasic_MechanicalContext.cdl |  2 +-
 src/StepBasic/StepBasic_NamedUnit.cdl         |  8 +-
 src/StepBasic/StepBasic_OrdinalDate.cdl       |  2 +-
 src/StepBasic/StepBasic_Organization.cdl      | 20 ++---
 .../StepBasic_OrganizationAssignment.cdl      | 12 +--
 src/StepBasic/StepBasic_OrganizationRole.cdl  |  8 +-
 .../StepBasic_OrganizationalAddress.cdl       | 64 +++++++-------
 src/StepBasic/StepBasic_Person.cdl            | 44 +++++-----
 .../StepBasic_PersonAndOrganization.cdl       | 14 +--
 ...pBasic_PersonAndOrganizationAssignment.cdl | 12 +--
 .../StepBasic_PersonAndOrganizationRole.cdl   |  8 +-
 src/StepBasic/StepBasic_PersonalAddress.cdl   | 64 +++++++-------
 .../StepBasic_PlaneAngleMeasureWithUnit.cdl   |  2 +-
 src/StepBasic/StepBasic_PlaneAngleUnit.cdl    |  2 +-
 src/StepBasic/StepBasic_Product.cdl           | 28 +++---
 src/StepBasic/StepBasic_ProductCategory.cdl   | 14 +--
 src/StepBasic/StepBasic_ProductContext.cdl    | 16 ++--
 src/StepBasic/StepBasic_ProductDefinition.cdl | 26 +++---
 .../StepBasic_ProductDefinitionContext.cdl    | 16 ++--
 ...StepBasic_ProductDefinitionEffectivity.cdl |  2 +-
 .../StepBasic_ProductDefinitionFormation.cdl  | 20 ++---
 ...DefinitionFormationWithSpecifiedSource.cdl | 14 +--
 ...tepBasic_ProductRelatedProductCategory.cdl | 18 ++--
 src/StepBasic/StepBasic_ProductType.cdl       |  2 +-
 .../StepBasic_RatioMeasureWithUnit.cdl        |  2 +-
 src/StepBasic/StepBasic_RatioUnit.cdl         |  2 +-
 .../StepBasic_SecurityClassification.cdl      | 20 ++---
 ...Basic_SecurityClassificationAssignment.cdl |  6 +-
 .../StepBasic_SecurityClassificationLevel.cdl |  8 +-
 src/StepBasic/StepBasic_SiUnit.cdl            |  8 +-
 src/StepBasic/StepBasic_SiUnitAndAreaUnit.cdl | 10 +--
 .../StepBasic_SiUnitAndLengthUnit.cdl         |  8 +-
 src/StepBasic/StepBasic_SiUnitAndMassUnit.cdl |  8 +-
 .../StepBasic_SiUnitAndPlaneAngleUnit.cdl     |  8 +-
 .../StepBasic_SiUnitAndRatioUnit.cdl          |  8 +-
 .../StepBasic_SiUnitAndSolidAngleUnit.cdl     |  8 +-
 ..._SiUnitAndThermodynamicTemperatureUnit.cdl |  8 +-
 src/StepBasic/StepBasic_SiUnitAndTimeUnit.cdl |  8 +-
 .../StepBasic_SiUnitAndVolumeUnit.cdl         | 10 +--
 src/StepBasic/StepBasic_SizeMember.cdl        |  2 +-
 .../StepBasic_SolidAngleMeasureWithUnit.cdl   |  2 +-
 src/StepBasic/StepBasic_SolidAngleUnit.cdl    |  2 +-
 .../StepBasic_TimeMeasureWithUnit.cdl         |  2 +-
 src/StepBasic/StepBasic_TimeUnit.cdl          |  2 +-
 .../StepBasic_UncertaintyMeasureWithUnit.cdl  |  2 +-
 src/StepBasic/StepBasic_VolumeUnit.cdl        |  2 +-
 .../StepBasic_WeekOfYearAndDayDate.cdl        |  2 +-
 src/StepData/StepData_DefaultGeneral.cdl      |  6 +-
 src/StepData/StepData_DescrGeneral.cdl        |  4 +-
 src/StepData/StepData_DescrProtocol.cdl       |  2 +-
 src/StepData/StepData_DescrReadWrite.cdl      |  2 +-
 src/StepData/StepData_Described.cdl           |  2 +-
 src/StepData/StepData_ECDescr.cdl             |  4 +-
 src/StepData/StepData_EDescr.cdl              |  2 +-
 src/StepData/StepData_ESDescr.cdl             |  4 +-
 src/StepData/StepData_FileProtocol.cdl        |  2 +-
 src/StepData/StepData_FreeFormEntity.cdl      |  4 +-
 src/StepData/StepData_GeneralModule.cdl       |  4 +-
 src/StepData/StepData_HeaderTool.cdl          |  2 +-
 src/StepData/StepData_Plex.cdl                |  4 +-
 src/StepData/StepData_Protocol.cdl            |  6 +-
 src/StepData/StepData_ReadWriteModule.cdl     |  4 +-
 src/StepData/StepData_SelectArrReal.cdl       |  2 +-
 src/StepData/StepData_SelectInt.cdl           |  2 +-
 src/StepData/StepData_SelectMember.cdl        |  2 +-
 src/StepData/StepData_SelectNamed.cdl         |  2 +-
 src/StepData/StepData_SelectReal.cdl          |  2 +-
 src/StepData/StepData_Simple.cdl              |  4 +-
 src/StepData/StepData_StepModel.cdl           |  8 +-
 src/StepData/StepData_StepReaderData.cdl      | 10 +--
 src/StepData/StepData_StepReaderTool.cdl      | 14 +--
 src/StepData/StepData_UndefinedEntity.cdl     | 10 +--
 ...ndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl |  8 +-
 src/StepGeom/StepGeom_Axis1Placement.cdl      | 16 ++--
 src/StepGeom/StepGeom_Axis2Placement2d.cdl    | 16 ++--
 src/StepGeom/StepGeom_Axis2Placement3d.cdl    | 22 ++---
 src/StepGeom/StepGeom_BSplineCurve.cdl        | 14 +--
 .../StepGeom_BSplineCurveWithKnots.cdl        | 22 ++---
 ...eCurveWithKnotsAndRationalBSplineCurve.cdl | 44 +++++-----
 src/StepGeom/StepGeom_BSplineSurface.cdl      | 14 +--
 .../StepGeom_BSplineSurfaceWithKnots.cdl      | 34 ++++----
 ...faceWithKnotsAndRationalBSplineSurface.cdl | 56 ++++++------
 src/StepGeom/StepGeom_BezierCurve.cdl         |  2 +-
 ...eom_BezierCurveAndRationalBSplineCurve.cdl | 32 +++----
 src/StepGeom/StepGeom_BezierSurface.cdl       |  2 +-
 ...BezierSurfaceAndRationalBSplineSurface.cdl | 32 +++----
 src/StepGeom/StepGeom_BoundaryCurve.cdl       |  2 +-
 src/StepGeom/StepGeom_BoundedCurve.cdl        |  2 +-
 src/StepGeom/StepGeom_BoundedSurface.cdl      |  2 +-
 src/StepGeom/StepGeom_CartesianPoint.cdl      | 16 ++--
 ...epGeom_CartesianTransformationOperator.cdl | 24 +++---
 ...Geom_CartesianTransformationOperator2d.cdl |  2 +-
 ...Geom_CartesianTransformationOperator3d.cdl | 24 +++---
 src/StepGeom/StepGeom_Circle.cdl              |  6 +-
 src/StepGeom/StepGeom_CompositeCurve.cdl      | 14 +--
 .../StepGeom_CompositeCurveOnSurface.cdl      |  2 +-
 .../StepGeom_CompositeCurveSegment.cdl        |  8 +-
 src/StepGeom/StepGeom_Conic.cdl               |  6 +-
 src/StepGeom/StepGeom_ConicalSurface.cdl      | 10 +--
 src/StepGeom/StepGeom_Curve.cdl               |  2 +-
 src/StepGeom/StepGeom_CurveReplica.cdl        | 18 ++--
 src/StepGeom/StepGeom_CylindricalSurface.cdl  | 10 +--
 src/StepGeom/StepGeom_DegeneratePcurve.cdl    | 18 ++--
 .../StepGeom_DegenerateToroidalSurface.cdl    | 10 +--
 src/StepGeom/StepGeom_Direction.cdl           | 12 +--
 src/StepGeom/StepGeom_ElementarySurface.cdl   | 12 +--
 src/StepGeom/StepGeom_Ellipse.cdl             |  6 +-
 .../StepGeom_EvaluatedDegeneratePcurve.cdl    | 20 ++---
 ...GlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl | 44 +++++-----
 ...tepGeom_GeometricRepresentationContext.cdl | 10 +--
 ...ionContextAndGlobalUnitAssignedContext.cdl | 34 ++++----
 ...textAndParametricRepresentationContext.cdl | 26 +++---
 .../StepGeom_GeometricRepresentationItem.cdl  |  2 +-
 src/StepGeom/StepGeom_Hyperbola.cdl           |  6 +-
 src/StepGeom/StepGeom_IntersectionCurve.cdl   |  2 +-
 src/StepGeom/StepGeom_Line.cdl                | 18 ++--
 src/StepGeom/StepGeom_OffsetCurve3d.cdl       | 18 ++--
 src/StepGeom/StepGeom_OffsetSurface.cdl       | 12 +--
 src/StepGeom/StepGeom_OuterBoundaryCurve.cdl  |  2 +-
 src/StepGeom/StepGeom_Parabola.cdl            |  6 +-
 src/StepGeom/StepGeom_Pcurve.cdl              | 18 ++--
 src/StepGeom/StepGeom_Placement.cdl           | 12 +--
 src/StepGeom/StepGeom_Plane.cdl               |  2 +-
 src/StepGeom/StepGeom_Point.cdl               |  2 +-
 src/StepGeom/StepGeom_PointOnCurve.cdl        | 12 +--
 src/StepGeom/StepGeom_PointOnSurface.cdl      | 12 +--
 src/StepGeom/StepGeom_PointReplica.cdl        | 18 ++--
 src/StepGeom/StepGeom_Polyline.cdl            | 14 +--
 src/StepGeom/StepGeom_QuasiUniformCurve.cdl   |  2 +-
 ...asiUniformCurveAndRationalBSplineCurve.cdl | 32 +++----
 src/StepGeom/StepGeom_QuasiUniformSurface.cdl |  2 +-
 ...niformSurfaceAndRationalBSplineSurface.cdl | 32 +++----
 .../StepGeom_RationalBSplineCurve.cdl         | 16 ++--
 .../StepGeom_RationalBSplineSurface.cdl       | 16 ++--
 .../StepGeom_RectangularCompositeSurface.cdl  | 14 +--
 .../StepGeom_RectangularTrimmedSurface.cdl    | 12 +--
 ...om_ReparametrisedCompositeCurveSegment.cdl |  6 +-
 src/StepGeom/StepGeom_SeamCurve.cdl           |  2 +-
 src/StepGeom/StepGeom_SphericalSurface.cdl    | 10 +--
 src/StepGeom/StepGeom_Surface.cdl             |  2 +-
 src/StepGeom/StepGeom_SurfaceCurve.cdl        | 18 ++--
 .../StepGeom_SurfaceCurveAndBoundedCurve.cdl  |  4 +-
 .../StepGeom_SurfaceOfLinearExtrusion.cdl     | 16 ++--
 src/StepGeom/StepGeom_SurfaceOfRevolution.cdl | 16 ++--
 src/StepGeom/StepGeom_SurfacePatch.cdl        |  8 +-
 src/StepGeom/StepGeom_SurfaceReplica.cdl      | 18 ++--
 src/StepGeom/StepGeom_SweptSurface.cdl        | 12 +--
 src/StepGeom/StepGeom_ToroidalSurface.cdl     | 10 +--
 src/StepGeom/StepGeom_TrimmedCurve.cdl        | 24 +++---
 src/StepGeom/StepGeom_TrimmingMember.cdl      |  2 +-
 src/StepGeom/StepGeom_UniformCurve.cdl        |  2 +-
 ...om_UniformCurveAndRationalBSplineCurve.cdl | 32 +++----
 src/StepGeom/StepGeom_UniformSurface.cdl      |  2 +-
 ...niformSurfaceAndRationalBSplineSurface.cdl | 32 +++----
 src/StepGeom/StepGeom_Vector.cdl              | 12 +--
 ...pRepr_AssemblyComponentUsageSubstitute.cdl |  2 +-
 .../StepRepr_CompositeShapeAspect.cdl         |  2 +-
 .../StepRepr_CompoundRepresentationItem.cdl   |  2 +-
 .../StepRepr_DefinitionalRepresentation.cdl   |  2 +-
 src/StepRepr/StepRepr_DerivedShapeAspect.cdl  |  2 +-
 ...StepRepr_DescriptiveRepresentationItem.cdl | 12 +--
 src/StepRepr/StepRepr_Extension.cdl           |  2 +-
 ...epRepr_ExternallyDefinedRepresentation.cdl |  2 +-
 ...Repr_FunctionallyDefinedTransformation.cdl | 14 +--
 ...pRepr_GlobalUncertaintyAssignedContext.cdl | 18 ++--
 .../StepRepr_GlobalUnitAssignedContext.cdl    | 18 ++--
 .../StepRepr_ItemDefinedTransformation.cdl    |  2 +-
 src/StepRepr/StepRepr_MappedItem.cdl          | 18 ++--
 src/StepRepr/StepRepr_MaterialDesignation.cdl |  8 +-
 .../StepRepr_MeasureRepresentationItem.cdl    |  4 +-
 ...epRepr_ParametricRepresentationContext.cdl |  2 +-
 .../StepRepr_PromissoryUsageOccurrence.cdl    |  2 +-
 ...pRepr_ReprItemAndLengthMeasureWithUnit.cdl | 16 ++--
 src/StepRepr/StepRepr_Representation.cdl      | 22 ++---
 .../StepRepr_RepresentationContext.cdl        | 14 +--
 src/StepRepr/StepRepr_RepresentationItem.cdl  |  8 +-
 src/StepRepr/StepRepr_RepresentationMap.cdl   | 14 +--
 .../StepRepr_RepresentationRelationship.cdl   | 26 +++---
 ...entationRelationshipWithTransformation.cdl | 10 +--
 src/StepRepr/StepRepr_ShapeAspect.cdl         | 20 ++---
 ...epRepr_ShapeAspectDerivingRelationship.cdl |  2 +-
 ...epRepr_ShapeRepresentationRelationship.cdl |  2 +-
 ...entationRelationshipWithTransformation.cdl |  2 +-
 .../StepRepr_SuppliedPartRelationship.cdl     |  2 +-
 src/StepRepr/StepRepr_ValueRange.cdl          |  2 +-
 src/StepSelect/StepSelect_Activator.cdl       |  4 +-
 src/StepSelect/StepSelect_FloatFormat.cdl     |  2 +-
 src/StepSelect/StepSelect_StepType.cdl        |  2 +-
 src/StepSelect/StepSelect_WorkLibrary.cdl     |  6 +-
 ...pShape_AdvancedBrepShapeRepresentation.cdl |  2 +-
 src/StepShape/StepShape_AdvancedFace.cdl      |  2 +-
 src/StepShape/StepShape_Block.cdl             | 12 +--
 src/StepShape/StepShape_BooleanResult.cdl     |  6 +-
 src/StepShape/StepShape_BoxDomain.cdl         |  8 +-
 src/StepShape/StepShape_BoxedHalfSpace.cdl    | 16 ++--
 src/StepShape/StepShape_BrepWithVoids.cdl     | 18 ++--
 src/StepShape/StepShape_ClosedShell.cdl       |  2 +-
 src/StepShape/StepShape_ConnectedFaceSet.cdl  | 14 +--
 ...pe_ContextDependentShapeRepresentation.cdl |  2 +-
 .../StepShape_CsgShapeRepresentation.cdl      |  2 +-
 src/StepShape/StepShape_CsgSolid.cdl          |  6 +-
 src/StepShape/StepShape_Edge.cdl              | 18 ++--
 src/StepShape/StepShape_EdgeCurve.cdl         | 20 ++---
 src/StepShape/StepShape_EdgeLoop.cdl          | 14 +--
 src/StepShape/StepShape_ExtrudedAreaSolid.cdl | 16 ++--
 src/StepShape/StepShape_ExtrudedFaceSolid.cdl | 16 ++--
 src/StepShape/StepShape_Face.cdl              | 14 +--
 src/StepShape/StepShape_FaceBound.cdl         | 12 +--
 src/StepShape/StepShape_FaceOuterBound.cdl    |  2 +-
 src/StepShape/StepShape_FaceSurface.cdl       | 16 ++--
 src/StepShape/StepShape_FacetedBrep.cdl       |  2 +-
 .../StepShape_FacetedBrepAndBrepWithVoids.cdl | 34 ++++----
 ...epShape_FacetedBrepShapeRepresentation.cdl |  2 +-
 src/StepShape/StepShape_GeometricCurveSet.cdl |  2 +-
 src/StepShape/StepShape_GeometricSet.cdl      | 12 +--
 ...callyBoundedSurfaceShapeRepresentation.cdl |  2 +-
 ...llyBoundedWireframeShapeRepresentation.cdl |  2 +-
 src/StepShape/StepShape_HalfSpaceSolid.cdl    | 12 +--
 src/StepShape/StepShape_LimitsAndFits.cdl     |  2 +-
 src/StepShape/StepShape_Loop.cdl              |  2 +-
 src/StepShape/StepShape_LoopAndPath.cdl       | 28 +++---
 src/StepShape/StepShape_ManifoldSolidBrep.cdl | 12 +--
 ...ape_ManifoldSurfaceShapeRepresentation.cdl |  2 +-
 .../StepShape_MeasureQualification.cdl        |  2 +-
 ...tionItemAndQualifiedRepresentationItem.cdl |  4 +-
 src/StepShape/StepShape_OpenShell.cdl         |  2 +-
 .../StepShape_OrientedClosedShell.cdl         | 20 ++---
 src/StepShape/StepShape_OrientedEdge.cdl      | 18 ++--
 src/StepShape/StepShape_OrientedFace.cdl      | 20 ++---
 src/StepShape/StepShape_OrientedOpenShell.cdl | 20 ++---
 src/StepShape/StepShape_OrientedPath.cdl      | 20 ++---
 src/StepShape/StepShape_Path.cdl              | 14 +--
 .../StepShape_PlusMinusTolerance.cdl          |  2 +-
 src/StepShape/StepShape_PolyLoop.cdl          | 14 +--
 .../StepShape_PrecisionQualifier.cdl          |  2 +-
 .../StepShape_QualifiedRepresentationItem.cdl |  4 +-
 src/StepShape/StepShape_RevolvedAreaSolid.cdl | 16 ++--
 src/StepShape/StepShape_RevolvedFaceSolid.cdl | 16 ++--
 src/StepShape/StepShape_RightAngularWedge.cdl | 12 +--
 src/StepShape/StepShape_RightCircularCone.cdl | 12 +--
 .../StepShape_RightCircularCylinder.cdl       | 12 +--
 .../StepShape_ShapeRepresentation.cdl         |  2 +-
 .../StepShape_ShellBasedSurfaceModel.cdl      | 12 +--
 src/StepShape/StepShape_SolidModel.cdl        |  2 +-
 src/StepShape/StepShape_SolidReplica.cdl      | 18 ++--
 src/StepShape/StepShape_Sphere.cdl            | 12 +--
 src/StepShape/StepShape_SweptAreaSolid.cdl    | 12 +--
 src/StepShape/StepShape_SweptFaceSolid.cdl    | 12 +--
 src/StepShape/StepShape_ToleranceValue.cdl    |  2 +-
 ...tepShape_TopologicalRepresentationItem.cdl |  2 +-
 src/StepShape/StepShape_Torus.cdl             | 12 +--
 ...pShape_TransitionalShapeRepresentation.cdl |  2 +-
 src/StepShape/StepShape_TypeQualifier.cdl     |  2 +-
 src/StepShape/StepShape_Vertex.cdl            |  2 +-
 src/StepShape/StepShape_VertexLoop.cdl        | 12 +--
 src/StepShape/StepShape_VertexPoint.cdl       | 12 +--
 .../StepToTopoDS_MakeTransformed.cdl          |  2 +-
 .../StepVisual_AnnotationOccurrence.cdl       |  2 +-
 src/StepVisual/StepVisual_AnnotationText.cdl  |  2 +-
 .../StepVisual_AnnotationTextOccurrence.cdl   |  2 +-
 src/StepVisual/StepVisual_AreaInSet.cdl       | 14 +--
 .../StepVisual_BackgroundColour.cdl           |  2 +-
 src/StepVisual/StepVisual_CameraImage.cdl     |  2 +-
 .../StepVisual_CameraImage2dWithScale.cdl     |  2 +-
 .../StepVisual_CameraImage3dWithScale.cdl     |  2 +-
 src/StepVisual/StepVisual_CameraModel.cdl     |  2 +-
 src/StepVisual/StepVisual_CameraModelD2.cdl   | 12 +--
 src/StepVisual/StepVisual_CameraModelD3.cdl   | 18 ++--
 src/StepVisual/StepVisual_CameraUsage.cdl     |  2 +-
 src/StepVisual/StepVisual_Colour.cdl          |  2 +-
 src/StepVisual/StepVisual_ColourRgb.cdl       |  6 +-
 .../StepVisual_ColourSpecification.cdl        |  8 +-
 src/StepVisual/StepVisual_CompositeText.cdl   | 12 +--
 .../StepVisual_CompositeTextWithExtent.cdl    | 16 ++--
 ...tepVisual_ContextDependentInvisibility.cdl |  6 +-
 ...l_ContextDependentOverRidingStyledItem.cdl | 24 +++---
 src/StepVisual/StepVisual_CurveStyle.cdl      | 14 +--
 src/StepVisual/StepVisual_CurveStyleFont.cdl  | 16 ++--
 .../StepVisual_CurveStyleFontPattern.cdl      |  2 +-
 ...pVisual_DraughtingAnnotationOccurrence.cdl |  2 +-
 .../StepVisual_DraughtingPreDefinedColour.cdl |  2 +-
 ...epVisual_DraughtingPreDefinedCurveFont.cdl |  2 +-
 src/StepVisual/StepVisual_FillAreaStyle.cdl   | 14 +--
 .../StepVisual_FillAreaStyleColour.cdl        | 14 +--
 src/StepVisual/StepVisual_Invisibility.cdl    |  8 +-
 src/StepVisual/StepVisual_MarkerMember.cdl    |  2 +-
 ...hanicalDesignGeometricPresentationArea.cdl |  2 +-
 ...ignGeometricPresentationRepresentation.cdl |  2 +-
 .../StepVisual_OverRidingStyledItem.cdl       | 20 ++---
 src/StepVisual/StepVisual_PlanarBox.cdl       |  6 +-
 src/StepVisual/StepVisual_PlanarExtent.cdl    |  6 +-
 src/StepVisual/StepVisual_PointStyle.cdl      | 14 +--
 .../StepVisual_PreDefinedColour.cdl           |  2 +-
 .../StepVisual_PreDefinedCurveFont.cdl        |  2 +-
 src/StepVisual/StepVisual_PreDefinedItem.cdl  |  8 +-
 .../StepVisual_PreDefinedTextFont.cdl         |  2 +-
 .../StepVisual_PresentationArea.cdl           |  2 +-
 ...StepVisual_PresentationLayerAssignment.cdl | 20 ++---
 .../StepVisual_PresentationRepresentation.cdl |  2 +-
 src/StepVisual/StepVisual_PresentationSet.cdl |  2 +-
 .../StepVisual_PresentationSize.cdl           |  8 +-
 ...StepVisual_PresentationStyleAssignment.cdl |  8 +-
 .../StepVisual_PresentationStyleByContext.cdl |  6 +-
 .../StepVisual_PresentationView.cdl           |  2 +-
 ...StepVisual_PresentedItemRepresentation.cdl |  2 +-
 src/StepVisual/StepVisual_StyledItem.cdl      | 20 ++---
 .../StepVisual_SurfaceSideStyle.cdl           | 14 +--
 .../StepVisual_SurfaceStyleBoundary.cdl       |  8 +-
 .../StepVisual_SurfaceStyleControlGrid.cdl    |  8 +-
 .../StepVisual_SurfaceStyleFillArea.cdl       |  8 +-
 .../StepVisual_SurfaceStyleParameterLine.cdl  |  8 +-
 ...epVisual_SurfaceStyleSegmentationCurve.cdl |  8 +-
 .../StepVisual_SurfaceStyleSilhouette.cdl     |  8 +-
 .../StepVisual_SurfaceStyleUsage.cdl          |  8 +-
 src/StepVisual/StepVisual_Template.cdl        |  2 +-
 .../StepVisual_TemplateInstance.cdl           |  2 +-
 src/StepVisual/StepVisual_TextLiteral.cdl     | 18 ++--
 src/StepVisual/StepVisual_TextStyle.cdl       | 14 +--
 .../StepVisual_TextStyleForDefinedFont.cdl    |  8 +-
 ...Visual_TextStyleWithBoxCharacteristics.cdl | 10 +--
 src/StepVisual/StepVisual_ViewVolume.cdl      | 14 +--
 src/StlMesh/StlMesh_Mesh.cdl                  |  2 +-
 src/StlMesh/StlMesh_MeshDomain.cdl            |  4 +-
 src/StlMesh/StlMesh_MeshTriangle.cdl          |  4 +-
 src/Storage/Storage_CallBack.cdl              |  4 +-
 src/Storage/Storage_Data.cdl                  | 16 ++--
 src/Storage/Storage_DefaultCallBack.cdl       |  4 +-
 src/Storage/Storage_HeaderData.cdl            |  2 +-
 src/Storage/Storage_InternalData.cdl          |  2 +-
 src/Storage/Storage_Root.cdl                  |  6 +-
 src/Storage/Storage_RootData.cdl              |  8 +-
 src/Storage/Storage_Schema.cdl                | 20 ++---
 src/Storage/Storage_TypeData.cdl              |  2 +-
 src/Storage/Storage_TypedCallBack.cdl         |  4 +-
 src/TColStd/TColStd_HPackedMapOfInteger.cdl   |  4 +-
 src/TCollection/TCollection_HArray1.cdl       |  4 +-
 src/TCollection/TCollection_HArray2.cdl       |  4 +-
 src/TCollection/TCollection_HAsciiString.cdl  | 28 +++---
 .../TCollection_HExtendedString.cdl           | 22 ++---
 src/TCollection/TCollection_HSequence.cdl     |  6 +-
 src/TDF/TDF_Attribute.cdl                     | 10 +--
 src/TDF/TDF_ClosureTool.cdl                   |  4 +-
 src/TDF/TDF_ComparisonTool.cdl                | 10 +--
 src/TDF/TDF_CopyTool.cdl                      |  6 +-
 src/TDF/TDF_Data.cdl                          |  2 +-
 src/TDF/TDF_DataSet.cdl                       |  2 +-
 src/TDF/TDF_DeltaOnAddition.cdl               |  2 +-
 src/TDF/TDF_DeltaOnForget.cdl                 |  2 +-
 src/TDF/TDF_DeltaOnModification.cdl           |  2 +-
 src/TDF/TDF_DeltaOnResume.cdl                 |  2 +-
 src/TDF/TDF_Reference.cdl                     |  8 +-
 src/TDF/TDF_RelocationTable.cdl               |  6 +-
 src/TDF/TDF_TagSource.cdl                     |  8 +-
 src/TDataStd/TDataStd_AsciiString.cdl         |  8 +-
 src/TDataStd/TDataStd_BooleanArray.cdl        |  8 +-
 src/TDataStd/TDataStd_BooleanList.cdl         |  8 +-
 src/TDataStd/TDataStd_ByteArray.cdl           |  8 +-
 src/TDataStd/TDataStd_Comment.cdl             |  8 +-
 src/TDataStd/TDataStd_Current.cdl             |  8 +-
 ...DataStd_DeltaOnModificationOfByteArray.cdl |  2 +-
 ...td_DeltaOnModificationOfExtStringArray.cdl |  2 +-
 ...TDataStd_DeltaOnModificationOfIntArray.cdl |  2 +-
 ...aStd_DeltaOnModificationOfIntPackedMap.cdl |  2 +-
 ...DataStd_DeltaOnModificationOfRealArray.cdl |  2 +-
 src/TDataStd/TDataStd_Directory.cdl           |  8 +-
 src/TDataStd/TDataStd_Expression.cdl          |  8 +-
 src/TDataStd/TDataStd_ExtStringArray.cdl      |  8 +-
 src/TDataStd/TDataStd_ExtStringList.cdl       |  8 +-
 .../TDataStd_HDataMapOfStringByte.cdl         |  4 +-
 ...taStd_HDataMapOfStringHArray1OfInteger.cdl |  4 +-
 ...TDataStd_HDataMapOfStringHArray1OfReal.cdl |  4 +-
 .../TDataStd_HDataMapOfStringInteger.cdl      |  4 +-
 .../TDataStd_HDataMapOfStringReal.cdl         |  4 +-
 .../TDataStd_HDataMapOfStringString.cdl       |  4 +-
 src/TDataStd/TDataStd_IntPackedMap.cdl        |  8 +-
 src/TDataStd/TDataStd_Integer.cdl             |  8 +-
 src/TDataStd/TDataStd_IntegerArray.cdl        |  8 +-
 src/TDataStd/TDataStd_IntegerList.cdl         |  8 +-
 src/TDataStd/TDataStd_Name.cdl                |  8 +-
 src/TDataStd/TDataStd_NamedData.cdl           |  8 +-
 src/TDataStd/TDataStd_NoteBook.cdl            |  8 +-
 src/TDataStd/TDataStd_Real.cdl                |  8 +-
 src/TDataStd/TDataStd_RealArray.cdl           |  8 +-
 src/TDataStd/TDataStd_RealList.cdl            |  8 +-
 src/TDataStd/TDataStd_ReferenceArray.cdl      |  8 +-
 src/TDataStd/TDataStd_ReferenceList.cdl       |  8 +-
 src/TDataStd/TDataStd_Relation.cdl            |  8 +-
 src/TDataStd/TDataStd_Tick.cdl                |  8 +-
 src/TDataStd/TDataStd_TreeNode.cdl            |  8 +-
 src/TDataStd/TDataStd_UAttribute.cdl          |  8 +-
 src/TDataStd/TDataStd_Variable.cdl            |  8 +-
 src/TDataXtd/TDataXtd_Axis.cdl                |  8 +-
 src/TDataXtd/TDataXtd_Constraint.cdl          |  8 +-
 src/TDataXtd/TDataXtd_Geometry.cdl            |  8 +-
 src/TDataXtd/TDataXtd_PatternStd.cdl          |  8 +-
 src/TDataXtd/TDataXtd_Placement.cdl           |  8 +-
 src/TDataXtd/TDataXtd_Plane.cdl               |  8 +-
 src/TDataXtd/TDataXtd_Point.cdl               |  8 +-
 src/TDataXtd/TDataXtd_Position.cdl            |  8 +-
 src/TDataXtd/TDataXtd_Shape.cdl               |  8 +-
 src/TDocStd/TDocStd_Document.cdl              |  2 +-
 src/TDocStd/TDocStd_Modified.cdl              |  8 +-
 src/TDocStd/TDocStd_Owner.cdl                 |  8 +-
 src/TDocStd/TDocStd_XLink.cdl                 | 12 +--
 src/TDocStd/TDocStd_XLinkRoot.cdl             | 10 +--
 src/TFunction/TFunction_Driver.cdl            |  2 +-
 src/TFunction/TFunction_DriverTable.cdl       |  4 +-
 src/TFunction/TFunction_Function.cdl          |  8 +-
 src/TFunction/TFunction_GraphNode.cdl         |  8 +-
 src/TFunction/TFunction_Scope.cdl             |  8 +-
 src/TNaming/TNaming_DeltaOnModification.cdl   |  2 +-
 src/TNaming/TNaming_DeltaOnRemoval.cdl        |  2 +-
 src/TNaming/TNaming_Name.cdl                  |  2 +-
 src/TNaming/TNaming_NamedShape.cdl            | 10 +--
 src/TNaming/TNaming_Naming.cdl                |  8 +-
 src/TNaming/TNaming_UsedShapes.cdl            | 10 +--
 src/TPrsStd/TPrsStd_AISPresentation.cdl       | 10 +--
 src/TPrsStd/TPrsStd_AISViewer.cdl             |  8 +-
 src/TPrsStd/TPrsStd_AxisDriver.cdl            |  2 +-
 src/TPrsStd/TPrsStd_ConstraintDriver.cdl      |  2 +-
 src/TPrsStd/TPrsStd_DriverTable.cdl           |  4 +-
 src/TPrsStd/TPrsStd_GeometryDriver.cdl        |  2 +-
 src/TPrsStd/TPrsStd_NamedShapeDriver.cdl      |  2 +-
 src/TPrsStd/TPrsStd_PlaneDriver.cdl           |  2 +-
 src/TPrsStd/TPrsStd_PointDriver.cdl           |  2 +-
 .../TestTopOpeDraw_DrawableC2D.cdl            |  6 +-
 .../TestTopOpeDraw_DrawableC3D.cdl            |  6 +-
 .../TestTopOpeDraw_DrawableMesure.cdl         |  2 +-
 .../TestTopOpeDraw_DrawableP2D.cdl            |  8 +-
 .../TestTopOpeDraw_DrawableP3D.cdl            |  8 +-
 .../TestTopOpeDraw_DrawableSHA.cdl            |  2 +-
 .../TestTopOpeDraw_DrawableSUR.cdl            |  6 +-
 src/TopLoc/TopLoc_Datum3D.cdl                 |  4 +-
 src/TopLoc/TopLoc_SListNodeOfItemLocation.cdl |  2 +-
 src/TopOpeBRep/TopOpeBRep_FFDumper.cdl        |  2 +-
 src/TopOpeBRep/TopOpeBRep_Hctxee2d.cdl        |  2 +-
 src/TopOpeBRep/TopOpeBRep_Hctxff2d.cdl        |  2 +-
 .../TopOpeBRepBuild_Builder.cdl               | 14 +--
 .../TopOpeBRepBuild_Builder1.cdl              |  2 +-
 .../TopOpeBRepBuild_HBuilder.cdl              |  6 +-
 src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cdl  |  4 +-
 src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cdl  |  2 +-
 src/TopOpeBRepDS/TopOpeBRepDS_Association.cdl |  2 +-
 src/TopOpeBRepDS/TopOpeBRepDS_Check.cdl       |  2 +-
 .../TopOpeBRepDS_CurvePointInterference.cdl   |  2 +-
 .../TopOpeBRepDS_Edge3dInterferenceTool.cdl   |  2 +-
 .../TopOpeBRepDS_EdgeInterferenceTool.cdl     |  2 +-
 .../TopOpeBRepDS_EdgeVertexInterference.cdl   |  4 +-
 .../TopOpeBRepDS_FaceEdgeInterference.cdl     |  2 +-
 .../TopOpeBRepDS_FaceInterferenceTool.cdl     |  2 +-
 src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cdl     |  8 +-
 .../TopOpeBRepDS_HDataStructure.cdl           |  2 +-
 .../TopOpeBRepDS_Interference.cdl             |  6 +-
 .../TopOpeBRepDS_InterferenceTool.cdl         |  2 +-
 src/TopOpeBRepDS/TopOpeBRepDS_Marker.cdl      |  2 +-
 .../TopOpeBRepDS_ShapeShapeInterference.cdl   |  2 +-
 .../TopOpeBRepDS_SolidSurfaceInterference.cdl |  2 +-
 .../TopOpeBRepDS_SurfaceCurveInterference.cdl |  6 +-
 .../TopOpeBRepTool_HBoxTool.cdl               |  2 +-
 src/TopoDS/TopoDS_Builder.cdl                 |  2 +-
 src/TopoDS/TopoDS_HShape.cdl                  |  4 +-
 src/TopoDS/TopoDS_TCompSolid.cdl              |  4 +-
 src/TopoDS/TopoDS_TCompound.cdl               |  4 +-
 src/TopoDS/TopoDS_TFace.cdl                   |  4 +-
 src/TopoDS/TopoDS_TShape.cdl                  |  2 +-
 src/TopoDS/TopoDS_TShell.cdl                  |  4 +-
 src/TopoDS/TopoDS_TSolid.cdl                  |  4 +-
 src/TopoDS/TopoDS_TWire.cdl                   |  4 +-
 src/TopoDSToStep/TopoDSToStep_Builder.cdl     |  4 +-
 .../TopoDSToStep_MakeBrepWithVoids.cdl        |  2 +-
 .../TopoDSToStep_MakeFacetedBrep.cdl          |  4 +-
 ...ToStep_MakeFacetedBrepAndBrepWithVoids.cdl |  2 +-
 .../TopoDSToStep_MakeGeometricCurveSet.cdl    |  2 +-
 .../TopoDSToStep_MakeManifoldSolidBrep.cdl    |  4 +-
 ...opoDSToStep_MakeShellBasedSurfaceModel.cdl |  6 +-
 .../TopoDSToStep_MakeStepEdge.cdl             |  4 +-
 .../TopoDSToStep_MakeStepFace.cdl             |  4 +-
 .../TopoDSToStep_MakeStepVertex.cdl           |  4 +-
 .../TopoDSToStep_MakeStepWire.cdl             |  4 +-
 .../TopoDSToStep_WireframeBuilder.cdl         |  4 +-
 src/Transfer/Transfer_ActorDispatch.cdl       | 12 +--
 .../Transfer_ActorOfFinderProcess.cdl         | 14 +--
 .../Transfer_ActorOfTransientProcess.cdl      | 14 +--
 .../Transfer_BinderOfTransientInteger.cdl     |  2 +-
 src/Transfer/Transfer_DispatchControl.cdl     | 10 +--
 src/Transfer/Transfer_Finder.cdl              |  2 +-
 src/Transfer/Transfer_FinderProcess.cdl       |  2 +-
 src/Transfer/Transfer_MapContainer.cdl        |  2 +-
 src/Transfer/Transfer_Mapper.cdl              |  2 +-
 src/Transfer/Transfer_MultipleBinder.cdl      |  8 +-
 src/Transfer/Transfer_ResultFromModel.cdl     |  4 +-
 src/Transfer/Transfer_ResultFromTransient.cdl |  8 +-
 .../Transfer_SimpleBinderOfTransient.cdl      |  2 +-
 src/Transfer/Transfer_TransferDispatch.cdl    |  4 +-
 src/Transfer/Transfer_TransferInput.cdl       |  8 +-
 src/Transfer/Transfer_TransferOutput.cdl      |  8 +-
 src/Transfer/Transfer_TransferProcess.cdl     | 46 +++++-----
 src/Transfer/Transfer_TransientListBinder.cdl |  6 +-
 src/Transfer/Transfer_TransientProcess.cdl    |  2 +-
 src/Transfer/Transfer_VoidBinder.cdl          |  2 +-
 src/TransferBRep/TransferBRep.cdl             |  2 +-
 .../TransferBRep_BinderOfShape.cdl            |  4 +-
 src/TransferBRep/TransferBRep_ShapeBinder.cdl |  4 +-
 .../TransferBRep_ShapeListBinder.cdl          |  6 +-
 src/UTL/UTL.cdl                               |  2 +-
 src/Units/Units_Dimensions.cdl                |  8 +-
 src/Units/Units_Lexicon.cdl                   |  2 +-
 src/Units/Units_Quantity.cdl                  |  2 +-
 src/Units/Units_Sentence.cdl                  |  2 +-
 src/Units/Units_ShiftedToken.cdl              |  4 +-
 src/Units/Units_ShiftedUnit.cdl               |  8 +-
 src/Units/Units_Token.cdl                     | 30 +++----
 src/Units/Units_Unit.cdl                      |  8 +-
 src/Units/Units_UnitsDictionary.cdl           |  2 +-
 src/Units/Units_UnitsLexicon.cdl              |  2 +-
 src/Units/Units_UnitsSystem.cdl               |  4 +-
 src/V3d/V3d.cdl                               |  4 +-
 src/V3d/V3d_AmbientLight.cdl                  |  4 +-
 src/V3d/V3d_CircularGrid.cdl                  |  2 +-
 src/V3d/V3d_DirectionalLight.cdl              | 10 +--
 src/V3d/V3d_LayerMgr.cdl                      |  8 +-
 src/V3d/V3d_Light.cdl                         |  4 +-
 src/V3d/V3d_PositionLight.cdl                 |  4 +-
 src/V3d/V3d_PositionalLight.cdl               | 10 +--
 src/V3d/V3d_RectangularGrid.cdl               |  2 +-
 src/V3d/V3d_SpotLight.cdl                     | 10 +--
 src/V3d/V3d_View.cdl                          | 12 +--
 src/V3d/V3d_Viewer.cdl                        | 14 +--
 src/ViewerTest/ViewerTest_EventManager.cdl    |  2 +-
 src/Visual3d/Visual3d_Layer.cdl               |  2 +-
 src/Visual3d/Visual3d_Light.cdl               | 10 +--
 src/Visual3d/Visual3d_View.cdl                |  4 +-
 src/Visual3d/Visual3d_ViewManager.cdl         |  2 +-
 src/Voxel/Voxel_Prs.cdl                       |  6 +-
 src/Vrml/Vrml_AsciiText.cdl                   |  4 +-
 src/Vrml/Vrml_Coordinate3.cdl                 |  4 +-
 src/Vrml/Vrml_IndexedFaceSet.cdl              |  4 +-
 src/Vrml/Vrml_IndexedLineSet.cdl              |  4 +-
 src/Vrml/Vrml_LOD.cdl                         |  4 +-
 src/Vrml/Vrml_Material.cdl                    |  4 +-
 src/Vrml/Vrml_Normal.cdl                      |  4 +-
 src/Vrml/Vrml_SFImage.cdl                     |  4 +-
 src/Vrml/Vrml_TextureCoordinate2.cdl          |  4 +-
 src/VrmlConverter/VrmlConverter_Drawer.cdl    | 22 ++---
 src/VrmlConverter/VrmlConverter_IsoAspect.cdl |  4 +-
 .../VrmlConverter_LineAspect.cdl              |  8 +-
 .../VrmlConverter_PointAspect.cdl             |  6 +-
 src/VrmlConverter/VrmlConverter_Projector.cdl |  2 +-
 .../VrmlConverter_ShadingAspect.cdl           |  4 +-
 src/WNT/WNT_WClass.cdl                        |  2 +-
 src/WNT/WNT_Window.cdl                        |  6 +-
 src/XCAFApp/XCAFApp_Application.cdl           |  2 +-
 src/XCAFDoc/XCAFDoc_Area.cdl                  |  6 +-
 src/XCAFDoc/XCAFDoc_Centroid.cdl              |  6 +-
 src/XCAFDoc/XCAFDoc_Color.cdl                 |  6 +-
 src/XCAFDoc/XCAFDoc_ColorTool.cdl             |  6 +-
 src/XCAFDoc/XCAFDoc_Datum.cdl                 |  6 +-
 src/XCAFDoc/XCAFDoc_DimTol.cdl                |  6 +-
 src/XCAFDoc/XCAFDoc_DimTolTool.cdl            |  6 +-
 src/XCAFDoc/XCAFDoc_DocumentTool.cdl          |  8 +-
 src/XCAFDoc/XCAFDoc_GraphNode.cdl             |  8 +-
 src/XCAFDoc/XCAFDoc_LayerTool.cdl             |  6 +-
 src/XCAFDoc/XCAFDoc_Location.cdl              |  6 +-
 src/XCAFDoc/XCAFDoc_Material.cdl              |  6 +-
 src/XCAFDoc/XCAFDoc_MaterialTool.cdl          |  6 +-
 src/XCAFDoc/XCAFDoc_ShapeMapTool.cdl          |  6 +-
 src/XCAFDoc/XCAFDoc_ShapeTool.cdl             |  6 +-
 src/XCAFDoc/XCAFDoc_Volume.cdl                |  6 +-
 .../XCAFDrivers_DocumentRetrievalDriver.cdl   |  2 +-
 .../XCAFDrivers_DocumentStorageDriver.cdl     |  2 +-
 src/XCAFPrs/XCAFPrs_AISObject.cdl             |  4 +-
 src/XSAlgo/XSAlgo_AlgoContainer.cdl           |  2 +-
 src/XSAlgo/XSAlgo_ToolContainer.cdl           |  2 +-
 src/XSControl/XSControl_Controller.cdl        | 20 ++---
 src/XSControl/XSControl_FuncShape.cdl         |  2 +-
 src/XSControl/XSControl_Reader.cdl            |  4 +-
 src/XSControl/XSControl_SelectForTransfer.cdl |  6 +-
 .../XSControl_SignTransferStatus.cdl          |  4 +-
 src/XSControl/XSControl_TransferReader.cdl    | 14 +--
 src/XSControl/XSControl_TransferWriter.cdl    | 10 +--
 src/XSControl/XSControl_Utils.cdl             | 28 +++---
 src/XSControl/XSControl_Vars.cdl              |  2 +-
 src/XSControl/XSControl_WorkSession.cdl       | 24 +++---
 src/XSControl/XSControl_Writer.cdl            |  4 +-
 src/XSDRAW/XSDRAW.cdl                         | 12 +--
 src/XSDRAW/XSDRAW_Vars.cdl                    |  2 +-
 .../XSDRAWSTLVRML_DataSource.cdl              |  2 +-
 .../XSDRAWSTLVRML_DrawableMesh.cdl            |  2 +-
 .../XmlDrivers_DocumentRetrievalDriver.cdl    |  2 +-
 .../XmlDrivers_DocumentStorageDriver.cdl      |  2 +-
 .../XmlLDrivers_DocumentRetrievalDriver.cdl   |  2 +-
 .../XmlLDrivers_DocumentStorageDriver.cdl     |  2 +-
 src/XmlMDF/XmlMDF_ADriver.cdl                 |  4 +-
 src/XmlMDF/XmlMDF_ADriverTable.cdl            |  2 +-
 src/XmlMDF/XmlMDF_ReferenceDriver.cdl         |  6 +-
 src/XmlMDF/XmlMDF_TagSourceDriver.cdl         |  6 +-
 .../XmlMDataStd_AsciiStringDriver.cdl         |  6 +-
 .../XmlMDataStd_BooleanArrayDriver.cdl        |  6 +-
 .../XmlMDataStd_BooleanListDriver.cdl         |  6 +-
 .../XmlMDataStd_ByteArrayDriver.cdl           |  6 +-
 src/XmlMDataStd/XmlMDataStd_CommentDriver.cdl |  6 +-
 .../XmlMDataStd_DirectoryDriver.cdl           |  6 +-
 .../XmlMDataStd_ExpressionDriver.cdl          |  6 +-
 .../XmlMDataStd_ExtStringArrayDriver.cdl      |  6 +-
 .../XmlMDataStd_ExtStringListDriver.cdl       |  6 +-
 .../XmlMDataStd_IntPackedMapDriver.cdl        |  6 +-
 .../XmlMDataStd_IntegerArrayDriver.cdl        |  6 +-
 src/XmlMDataStd/XmlMDataStd_IntegerDriver.cdl |  6 +-
 .../XmlMDataStd_IntegerListDriver.cdl         |  6 +-
 src/XmlMDataStd/XmlMDataStd_NameDriver.cdl    |  6 +-
 .../XmlMDataStd_NamedDataDriver.cdl           |  6 +-
 .../XmlMDataStd_NoteBookDriver.cdl            |  6 +-
 .../XmlMDataStd_RealArrayDriver.cdl           |  6 +-
 src/XmlMDataStd/XmlMDataStd_RealDriver.cdl    |  6 +-
 .../XmlMDataStd_RealListDriver.cdl            |  6 +-
 .../XmlMDataStd_ReferenceArrayDriver.cdl      |  6 +-
 .../XmlMDataStd_ReferenceListDriver.cdl       |  6 +-
 .../XmlMDataStd_RelationDriver.cdl            |  6 +-
 src/XmlMDataStd/XmlMDataStd_TickDriver.cdl    |  6 +-
 .../XmlMDataStd_TreeNodeDriver.cdl            |  6 +-
 .../XmlMDataStd_UAttributeDriver.cdl          |  6 +-
 .../XmlMDataStd_VariableDriver.cdl            |  6 +-
 src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cdl    |  6 +-
 .../XmlMDataXtd_ConstraintDriver.cdl          |  6 +-
 .../XmlMDataXtd_GeometryDriver.cdl            |  6 +-
 .../XmlMDataXtd_PatternStdDriver.cdl          |  6 +-
 .../XmlMDataXtd_PlacementDriver.cdl           |  6 +-
 src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cdl   |  6 +-
 src/XmlMDataXtd/XmlMDataXtd_PointDriver.cdl   |  6 +-
 src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cdl   |  6 +-
 src/XmlMDocStd/XmlMDocStd_XLinkDriver.cdl     |  6 +-
 .../XmlMFunction_FunctionDriver.cdl           |  6 +-
 .../XmlMFunction_GraphNodeDriver.cdl          |  6 +-
 src/XmlMFunction/XmlMFunction_ScopeDriver.cdl |  6 +-
 .../XmlMNaming_NamedShapeDriver.cdl           |  6 +-
 src/XmlMNaming/XmlMNaming_NamingDriver.cdl    |  6 +-
 .../XmlMPrsStd_AISPresentationDriver.cdl      |  6 +-
 src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cdl  |  6 +-
 src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cdl    |  6 +-
 .../XmlMXCAFDoc_CentroidDriver.cdl            |  6 +-
 src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cdl   |  6 +-
 .../XmlMXCAFDoc_ColorToolDriver.cdl           |  6 +-
 src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cdl   |  6 +-
 src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cdl  |  6 +-
 .../XmlMXCAFDoc_DimTolToolDriver.cdl          |  6 +-
 .../XmlMXCAFDoc_DocumentToolDriver.cdl        |  6 +-
 .../XmlMXCAFDoc_GraphNodeDriver.cdl           |  6 +-
 .../XmlMXCAFDoc_LayerToolDriver.cdl           |  6 +-
 .../XmlMXCAFDoc_LocationDriver.cdl            |  6 +-
 .../XmlMXCAFDoc_MaterialDriver.cdl            |  6 +-
 .../XmlMXCAFDoc_MaterialToolDriver.cdl        |  6 +-
 .../XmlMXCAFDoc_ShapeToolDriver.cdl           |  6 +-
 src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cdl  |  6 +-
 ...XmlXCAFDrivers_DocumentRetrievalDriver.cdl |  2 +-
 .../XmlXCAFDrivers_DocumentStorageDriver.cdl  |  2 +-
 2421 files changed, 6557 insertions(+), 6604 deletions(-)

diff --git a/src/AIS/AIS.cdl b/src/AIS/AIS.cdl
index 75098fd7d4..1340559f41 100644
--- a/src/AIS/AIS.cdl
+++ b/src/AIS/AIS.cdl
@@ -682,8 +682,8 @@ is
     ---Purpose:  computes  length  of  ellipse  arc  in  parametric  units   
      
     
-    ComputeProjEdgePresentation(aPres    : mutable Presentation from Prs3d; 
-    	    	    	    	aDrawer  : mutable Drawer       from AIS;        
+    ComputeProjEdgePresentation(aPres    : Presentation from Prs3d; 
+    	    	    	    	aDrawer  : Drawer       from AIS;        
 			   	anEdge   : Edge                 from TopoDS;
 			    	ProjCurve: Curve                from Geom;
 			    	FirstP   : Pnt                  from gp;
@@ -693,8 +693,8 @@ is
     	    	    	    	aProjTOL : TypeOfLine           from Aspect   = Aspect_TOL_DASH;
 			    	aCallTOL : TypeOfLine           from Aspect   = Aspect_TOL_DOT);
     
-    ComputeProjVertexPresentation(aPres    : mutable Presentation from Prs3d; 
-             	    	    	  aDrawer  : mutable Drawer       from AIS;        
+    ComputeProjVertexPresentation(aPres    : Presentation from Prs3d; 
+             	    	    	  aDrawer  : Drawer       from AIS;        
 			   	  aVertex  : Vertex               from TopoDS;
 			    	  ProjPoint: Pnt                  from gp;
        			    	  aColor   : NameOfColor          from Quantity = Quantity_NOC_PURPLE;
diff --git a/src/AIS/AIS_AttributeFilter.cdl b/src/AIS/AIS_AttributeFilter.cdl
index 2a23a8a483..eac4333224 100644
--- a/src/AIS/AIS_AttributeFilter.cdl
+++ b/src/AIS/AIS_AttributeFilter.cdl
@@ -34,19 +34,19 @@ uses
 
 is
 
-    Create returns mutable AttributeFilter from AIS;
+    Create returns AttributeFilter from AIS;
     	---Purpose:
     	-- Constructs an empty attribute filter object.
     	-- This filter object determines whether selectable
     	-- interactive objects have a non-null owner.   
     
     Create (aCol: NameOfColor from Quantity)
-    returns mutable AttributeFilter from AIS;
+    returns AttributeFilter from AIS;
     	---Purpose:
     	-- Constructs an attribute filter object defined by the
     	-- color attribute aCol.    
     Create (aWidth : Real from Standard)
-    returns mutable AttributeFilter from AIS;
+    returns AttributeFilter from AIS;
     	---Purpose:
     	-- Constructs an attribute filter object defined by the line
     	-- width attribute aWidth.
diff --git a/src/AIS/AIS_Axis.cdl b/src/AIS/AIS_Axis.cdl
index 7e77e60745..5b2f9fc314 100644
--- a/src/AIS/AIS_Axis.cdl
+++ b/src/AIS/AIS_Axis.cdl
@@ -45,17 +45,17 @@ uses
 
 is
     Create(aComponent : Line from Geom) 
-    returns mutable Axis from AIS;
+    returns Axis from AIS;
     	--- Purpose: Initializes the line aComponent   
     
     Create( aComponent : Axis2Placement from Geom;
     	    anAxisType: TypeOfAxis from AIS)
         ---Purpose: initializes the axis2 position
     	--   aComponent. The coordinate system used is right-handed.
-    returns mutable Axis from AIS;
+    returns Axis from AIS;
 
     Create(anAxis : Axis1Placement from Geom)
-    returns mutable Axis from AIS;
+    returns Axis from AIS;
     	---Purpose: Initializes the axis1 position anAxis.
     
     Component(me)
@@ -121,19 +121,19 @@ is
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard = 0) 
     is redefined static  private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;
 
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
             aTrsf         : Transformation from Geom;
-            aPresentation : mutable Presentation from Prs3d)
+            aPresentation : Presentation from Prs3d)
     is redefined;
 	 ---Purpose: computes the presentation according to a point of view
 	 --          given by <aProjector>.
@@ -146,7 +146,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
 
diff --git a/src/AIS/AIS_BadEdgeFilter.cdl b/src/AIS/AIS_BadEdgeFilter.cdl
index 0a2a5ab37a..d14c60f637 100644
--- a/src/AIS/AIS_BadEdgeFilter.cdl
+++ b/src/AIS/AIS_BadEdgeFilter.cdl
@@ -27,7 +27,7 @@ uses
     
 is
     Create
-    returns mutable BadEdgeFilter from AIS;
+    returns BadEdgeFilter from AIS;
     	--- Purpose: Constructs an empty filter object for bad edges.   
     ActsOn( me; aType : ShapeEnum from TopAbs )
     returns Boolean from Standard
diff --git a/src/AIS/AIS_C0RegularityFilter.cdl b/src/AIS/AIS_C0RegularityFilter.cdl
index 5467093d36..38c61332cc 100644
--- a/src/AIS/AIS_C0RegularityFilter.cdl
+++ b/src/AIS/AIS_C0RegularityFilter.cdl
@@ -26,7 +26,7 @@ uses
 
 is
     Create( aShape : Shape from TopoDS )
-    returns mutable C0RegularityFilter from AIS;
+    returns C0RegularityFilter from AIS;
     
     ActsOn( me; aType : ShapeEnum from TopAbs )
     returns Boolean from Standard
diff --git a/src/AIS/AIS_Chamf2dDimension.cdl b/src/AIS/AIS_Chamf2dDimension.cdl
index 6d55d7a732..cadc7ef2e3 100644
--- a/src/AIS/AIS_Chamf2dDimension.cdl
+++ b/src/AIS/AIS_Chamf2dDimension.cdl
@@ -46,7 +46,7 @@ is
     	-- This object is defined by the face aFShape, the
     	-- dimension aVal, the plane aPlane and the text aText.
         
-    returns mutable Chamf2dDimension from AIS;
+    returns Chamf2dDimension from AIS;
 
     Create (aFShape     : Shape          from TopoDS;
             aPlane        : Plane        from Geom;
@@ -60,7 +60,7 @@ is
     	-- aPlane, the dimension aVal, the position aPosition,
     	-- the type of arrow aSymbolPrs with the size
     	-- anArrowSize, and the text aText.
-    returns mutable Chamf2dDimension from AIS;
+    returns Chamf2dDimension from AIS;
 
     KindOfDimension(me) 
 	---Purpose: Indicates that we are concerned with a 2d length.
@@ -77,19 +77,19 @@ is
     
     Compute(me            : mutable;
   	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
 	 ---Purpose: computes the presentation according to a point of view
 	 --          given by <aProjector>. 
@@ -100,7 +100,7 @@ is
 	 --          to the object to display before computation  !!!
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)
     is redefined private;
     
diff --git a/src/AIS/AIS_Chamf3dDimension.cdl b/src/AIS/AIS_Chamf3dDimension.cdl
index b58d42767f..dec2f896d6 100644
--- a/src/AIS/AIS_Chamf3dDimension.cdl
+++ b/src/AIS/AIS_Chamf3dDimension.cdl
@@ -43,7 +43,7 @@ is
 	 ---Purpose:  Constructs a display object for 3D chamfers.
     	 -- This object is defined by the shape aFShape, the
     	 -- dimension aVal and the text aText.
-    returns mutable Chamf3dDimension from AIS;
+    returns Chamf3dDimension from AIS;
 
     Create (aFShape     : Shape          from TopoDS;
 	    aVal        : Real           from Standard;
@@ -56,7 +56,7 @@ is
     	 -- dimension aVal, the text aText, the point of origin of
     	 -- the chamfer aPosition, the type of arrow aSymbolPrs
     	 -- with the size anArrowSize.
-    returns mutable Chamf3dDimension from AIS;
+    returns Chamf3dDimension from AIS;
 
     KindOfDimension(me) 
 	 ---Purpose: Indicates that we are concerned with a 3d length.
@@ -73,19 +73,19 @@ is
     
     Compute(me            : mutable;
   	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
 	 ---Purpose: computes the presentation according to a point of view
 	 --          given by <aProjector>. 
@@ -96,7 +96,7 @@ is
    	 --           to the object to display before computation  !!!
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)
     is redefined private;
     
diff --git a/src/AIS/AIS_Circle.cdl b/src/AIS/AIS_Circle.cdl
index da2fe94dca..e501fd82ae 100644
--- a/src/AIS/AIS_Circle.cdl
+++ b/src/AIS/AIS_Circle.cdl
@@ -38,14 +38,14 @@ uses
 
 is
     Create(aCircle : Circle from Geom) 
-    returns mutable Circle from AIS;
+    returns Circle from AIS;
     	---Purpose: Initializes this algorithm for constructing AIS circle
     	-- datums initializes the circle aCircle
     Create(theCircle : Circle from Geom;
            theUStart : Real from Standard;
            theUEnd   : Real from Standard;
            theIsFilledCircleSens : Boolean from Standard = Standard_False) 
-    returns mutable Circle from AIS;
+    returns Circle from AIS;
     ---Purpose: Initializes this algorithm for constructing AIS circle datums.    
     -- Initializes the circle theCircle, the arc
     --   starting point theUStart, the arc ending point theUEnd,
@@ -53,19 +53,19 @@ is
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard = 0) 
     is redefined static  private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
             aTrsf         : Transformation from Geom;
-            aPresentation : mutable Presentation from Prs3d)
+            aPresentation : Presentation from Prs3d)
     is redefined;
 	 ---Purpose: computes the presentation according to a point of view
     	 --          given by <aProjector>.
@@ -78,7 +78,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
  
@@ -143,19 +143,19 @@ is
     -- then the whole circle will be detectable, otherwise only the boundary of the circle.
 
     ComputeCircle(me: mutable;
-                  aPresentation : mutable Presentation from Prs3d)
+                  aPresentation : Presentation from Prs3d)
     is private;
      
     ComputeArc(me: mutable;
-               aPresentation : mutable Presentation from Prs3d)
+               aPresentation : Presentation from Prs3d)
     is private;
 
     ComputeCircleSelection(me: mutable;
-                           aSelection : mutable Selection from SelectMgr)
+                           aSelection : Selection from SelectMgr)
     is private;
      
     ComputeArcSelection(me: mutable;
-                        aSelection : mutable Selection from SelectMgr)
+                        aSelection : Selection from SelectMgr)
     is private;
 
 fields
diff --git a/src/AIS/AIS_ConcentricRelation.cdl b/src/AIS/AIS_ConcentricRelation.cdl
index 59b9b01e98..57f9569a45 100644
--- a/src/AIS/AIS_ConcentricRelation.cdl
+++ b/src/AIS/AIS_ConcentricRelation.cdl
@@ -44,25 +44,25 @@ is
     	 -- and aSShape and the plane aPlane.
     	 -- aPlane is provided to create an axis along which the
     	 -- relation of concentricity can be extended. 
-    returns mutable ConcentricRelation from AIS;
+    returns ConcentricRelation from AIS;
 
     -- Methods from PresentableObject
     
     Compute(me            : mutable;
   	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
     
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
 	 ---Purpose: computes the presentation according to a point of view
 	 --          given by <aProjector>. 
@@ -87,7 +87,7 @@ is
     -- Methods from SelectableObject
    
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)
     is redefined private;
     
diff --git a/src/AIS/AIS_ConnectedInteractive.cdl b/src/AIS/AIS_ConnectedInteractive.cdl
index af1e8bd047..595878d7f1 100644
--- a/src/AIS/AIS_ConnectedInteractive.cdl
+++ b/src/AIS/AIS_ConnectedInteractive.cdl
@@ -54,7 +54,7 @@ raises
 is
 
     Create (aTypeOfPresentation3d: TypeOfPresentation3d from PrsMgr = PrsMgr_TOP_AllView) 
-    returns  mutable  ConnectedInteractive  from  AIS;
+    returns  ConnectedInteractive  from  AIS;
     	---Purpose:
     	-- Disconnects the previous view and sets highlight
     	-- mode to 0. This highlights the wireframe presentation
@@ -105,7 +105,7 @@ is
 
     Compute(me                   : mutable;
             aPresentationManager : PresentationManager3d from PrsMgr;
-            aPresentation        : mutable Presentation from Prs3d;
+            aPresentation        : Presentation from Prs3d;
             aMode                : Integer from Standard = 0)
 	---Level: Public 
 	---Purpose: Calculates the view aPresentation and its updates.
@@ -122,7 +122,7 @@ is
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
 	---Purpose: Computes the presentation according to a point of view
 	--          given by <aProjector>. 
@@ -135,10 +135,10 @@ is
 
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined;     
     
-    ComputeSelection(me:mutable; aSelection :mutable Selection from SelectMgr;
+    ComputeSelection(me:mutable; aSelection : Selection from SelectMgr;
                                  aMode      : Integer) is redefined virtual private;
 	---Level: Public 
 	---Purpose: Generates sensitive entities by copying 
@@ -157,7 +157,7 @@ is
 	--           compute   &     computeSelection  methods.  So     the
 	--        UpdateLocation Methods are redefined to do nothing else
 
---   UpdateLocation(me:mutable;P : mutable Presentation from Prs3d) is redefined virtual;
+--   UpdateLocation(me:mutable;P : Presentation from Prs3d) is redefined virtual;
     
 fields
 
diff --git a/src/AIS/AIS_ConnectedShape.cdl b/src/AIS/AIS_ConnectedShape.cdl
index 173e4c0edb..ee75a3350d 100644
--- a/src/AIS/AIS_ConnectedShape.cdl
+++ b/src/AIS/AIS_ConnectedShape.cdl
@@ -50,19 +50,19 @@ is
 
     Create (aTypeOfPresentation : TypeOfPresentation3d from PrsMgr 
     	    	    	    	  =PrsMgr_TOP_ProjectorDependant) 
-    returns mutable  ConnectedShape  from  AIS;
+    returns  ConnectedShape  from  AIS;
     	---Purpose: Initializes the type of 3d presentation aTypeOfPresentation
         
     Create (aInteractiveShape   : Shape from AIS;
     	    aTypeOfPresentation : TypeOfPresentation3d from PrsMgr 
     	    	    	    	  =PrsMgr_TOP_ProjectorDependant)  
-    returns  mutable  ConnectedShape  from  AIS;
+    returns  ConnectedShape  from  AIS;
     	---Purpose: Initializes the entity aInteractiveShape and the type of 3d presentation aTypeOfPresentation.
 
     Create(aConnectedShape     : ConnectedShape from AIS;
      	   aTypeOfPresentation : TypeOfPresentation3d from PrsMgr 
     	    	    	    	=PrsMgr_TOP_ProjectorDependant)  
-    returns  mutable  ConnectedShape  from  AIS;
+    returns  ConnectedShape  from  AIS;
     	---Purpose: Initializes the entity aConnectedShape and the type of 3d presentation aTypeOfPresentation.
     
     ---Category:  Redefined methods...
@@ -98,16 +98,16 @@ is
 
     Compute(me:mutable;
     	        aProjector   :         Projector    from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined virtual private;
  
     Compute(me                   : mutable;
     	    aProjector           : Projector from Prs3d;
 	    aTrsf                : Transformation from Geom;
-	    aPresentation        : mutable Presentation from Prs3d)
+	    aPresentation        : Presentation from Prs3d)
     is redefined virtual private;
 
-    ComputeSelection(me:mutable; aSelection :mutable Selection from SelectMgr;
+    ComputeSelection(me:mutable; aSelection : Selection from SelectMgr;
                                  aMode      :        Integer   from Standard)
     is redefined virtual private;
     	---Purpose: Generates sensitive entities by copying 
@@ -127,7 +127,7 @@ is
     
     Compute(me:mutable;
     	        aProjector   :         Projector    from Prs3d;
-                aPresentation: mutable Presentation from Prs3d;
+                aPresentation: Presentation from Prs3d;
     	    	aShape       :         Shape from TopoDS)
     is  private;
 
diff --git a/src/AIS/AIS_DimensionOwner.cdl b/src/AIS/AIS_DimensionOwner.cdl
index 955cec518c..77eafebf2e 100644
--- a/src/AIS/AIS_DimensionOwner.cdl
+++ b/src/AIS/AIS_DimensionOwner.cdl
@@ -41,7 +41,7 @@ is
     Create (theSelObject  : SelectableObject;
             theSelMode    : DimensionSelectionMode from AIS;
             thePriority   : Integer from Standard = 0)
-    returns mutable DimensionOwner from AIS;
+    returns DimensionOwner from AIS;
       ---Purpose:
       -- Initializes the dimension owner, theSO, and attributes it
       -- the priority, thePriority.
diff --git a/src/AIS/AIS_Drawer.cdl b/src/AIS/AIS_Drawer.cdl
index 0e5aacd859..bb17178866 100644
--- a/src/AIS/AIS_Drawer.cdl
+++ b/src/AIS/AIS_Drawer.cdl
@@ -64,7 +64,7 @@ uses
     Ax2 from gp
 
 is
-    Create returns mutable Drawer from AIS;
+    Create returns Drawer from AIS;
     	 ---Purpose:
     	 -- Constructs an empty attribute management framework.   
     TypeOfDeflection(me) returns TypeOfDeflection from Aspect
@@ -247,7 +247,7 @@ is
 -- 
 -- Attributes for the U Isoparametric lines of patches.
 --    
-    UIsoAspect (me:mutable) returns mutable IsoAspect from Prs3d
+    UIsoAspect (me:mutable) returns IsoAspect from Prs3d
 	 ---Purpose: Defines the attributes which are used when drawing an 
 	 --          U isoparametric curve of a face. Defines the number
 	 --          of U isoparametric curves to be drawn for a single face.
@@ -268,7 +268,7 @@ is
 -- Attributes for the V Isoparametric line of patches.
 
 
-    VIsoAspect (me:mutable) returns mutable IsoAspect from Prs3d
+    VIsoAspect (me:mutable) returns IsoAspect from Prs3d
 	 ---Purpose: Defines the attributes which are used when drawing an 
 	 --          V isoparametric curve of a face. Defines the number
 	 --          of V isoparametric curves to be drawn for a single face.
@@ -286,7 +286,7 @@ is
 
 -- Attributes for the free boundaries
 
-    FreeBoundaryAspect (me:mutable) returns mutable LineAspect from Prs3d
+    FreeBoundaryAspect (me:mutable) returns LineAspect from Prs3d
 	 ---Purpose: Returns a link with
     	 -- Prs3d_Drawer_FreeBoundaryAspect. Stores the
     	 -- values for presentation of free boundaries, in other
@@ -305,7 +305,7 @@ is
 
 -- Attributes for the wires
 
-    WireAspect (me:mutable) returns mutable LineAspect from Prs3d
+    WireAspect (me:mutable) returns LineAspect from Prs3d
 	 ---Purpose: Returns a link with Prs3d_Drawer_WireAspect.
     	 -- This method provides wire aspect settings.
     	 -- The LineAspect for wires can be edited. The default values are:
@@ -336,7 +336,7 @@ is
 
 -- Attributes for the unfree boundaries
 
-    UnFreeBoundaryAspect (me:mutable) returns mutable LineAspect from Prs3d
+    UnFreeBoundaryAspect (me:mutable) returns LineAspect from Prs3d
     	 ---Purpose: Returns a link with
     	 -- Prs3d_Drawer_UnFreeBoundaryAspect, which
     	 -- provides settings for shared boundary line aspects.
@@ -360,7 +360,7 @@ is
 --  Attributes for the lines.
 -- 
 
-    LineAspect(me:mutable) returns mutable LineAspect from Prs3d
+    LineAspect(me:mutable) returns LineAspect from Prs3d
     	---Purpose:  Returns a link with Prs3d_Drawer_LineAspect,
     	-- which provides settings for line aspects. These
     	-- settings can be edited. The default values are:         
@@ -379,7 +379,7 @@ is
     HasTextAspect(me) returns Boolean from Standard
     is static;      
     	---C++: inline     
-    TextAspect(me:mutable) returns mutable TextAspect from Prs3d
+    TextAspect(me:mutable) returns TextAspect from Prs3d
     --          
     --          Color: Quantity_NOC_YELLOW
     is redefined static;    			    
@@ -389,14 +389,14 @@ is
     	-- each line is enabled. The default setting is False.
     is redefined static;
     
-    ArrowAspect(me:mutable) returns mutable ArrowAspect from Prs3d 
+    ArrowAspect(me:mutable) returns ArrowAspect from Prs3d 
     is redefined static;
     
     
 -- -- 
 --  Attributes for the points
 -- 
-    PointAspect(me:mutable) returns mutable PointAspect from Prs3d
+    PointAspect(me:mutable) returns PointAspect from Prs3d
     	---Purpose:  Returns the point aspect setting. The default values
     	-- are:        Color: Quantity_NOC_YELLOW
 	--          Type of marker: Aspect_TOM_PLUS
@@ -413,7 +413,7 @@ is
     
 --  Attributes for the faces:
 --  
-    ShadingAspect (me:mutable) returns mutable ShadingAspect from Prs3d
+    ShadingAspect (me:mutable) returns ShadingAspect from Prs3d
     	---Purpose:
     	-- Returns a link with Prs3d_Drawer_ShadingAspect,
     	-- which provides settings for shading aspects.
@@ -443,7 +443,7 @@ is
 	--          By default the hidden lines are not drawn.
     is redefined static;
     
-    HiddenLineAspect(me:mutable) returns mutable LineAspect from Prs3d
+    HiddenLineAspect(me:mutable) returns LineAspect from Prs3d
 	---Purpose: Returns a link with
     	-- Prs3d_Drawer_HiddenLineAspect, which provides
     	-- settings for hidden line aspects.
@@ -454,7 +454,7 @@ is
     is redefined static;
 
     
-    SeenLineAspect(me:mutable) returns mutable LineAspect from Prs3d
+    SeenLineAspect(me:mutable) returns LineAspect from Prs3d
     	---Purpose: Returns a link with
     	-- Prs3d_Drawer_SeenLineAspect, which provides
     	-- settings for seen line aspects.
@@ -468,14 +468,14 @@ is
     HasPlaneAspect(me) returns Boolean from Standard;
     	---C++: inline
 
-    PlaneAspect(me:mutable) returns mutable PlaneAspect from Prs3d
+    PlaneAspect(me:mutable) returns PlaneAspect from Prs3d
     is redefined static;
     	---Purpose:
     	-- Returns a link with Prs3d_Drawer_PlaneAspect.
     	-- This method provides settings for the appearance of planes.
 
 
-    VectorAspect(me:mutable) returns mutable LineAspect from Prs3d
+    VectorAspect(me:mutable) returns LineAspect from Prs3d
     	---Purpose: Returns a link with Prs3d_Drawer_VectorAspect,
     	-- which provides settings for the appearance of vectors.
     	-- These settings can be edited. The default values are:
@@ -504,7 +504,7 @@ is
         -- visualization instead of the one set in link.
         -- theAspect is the line aspect that determines the look of the face boundaries.
 
-    FaceBoundaryAspect (me : mutable) returns mutable LineAspect from Prs3d
+    FaceBoundaryAspect (me : mutable) returns LineAspect from Prs3d
     is redefined static;
         ---Purpose: Returns line aspect of face boundaries.
 
@@ -526,7 +526,7 @@ is
     HasDatumAspect(me) returns Boolean from Standard;
     	---C++: inline 
 
-    DatumAspect(me:mutable) returns mutable DatumAspect from Prs3d
+    DatumAspect(me:mutable) returns DatumAspect from Prs3d
     	---Purpose: Returns a link with Prs3d_Drawer_DatumAspect,
     	-- which provides settings for the appearance of datums.
     	-- These settings can be edited. The default values for
@@ -539,7 +539,7 @@ is
 --  Attributes for the presentation of a dimensions.
 --  
 
-    DimensionAspect (me : mutable) returns mutable DimensionAspect from Prs3d is redefined static;
+    DimensionAspect (me : mutable) returns DimensionAspect from Prs3d is redefined static;
     ---Purpose: Returns a link with Prs3d_Drawer_DimensionAspect,
     -- which provides settings for the appearance of dimensions.
 
@@ -577,7 +577,7 @@ is
 
 -- Attributes for the sections
 
-    SectionAspect (me:mutable) returns mutable LineAspect from Prs3d
+    SectionAspect (me:mutable) returns LineAspect from Prs3d
     	---Purpose: Returns a link with Prs3d_Drawer_SectionAspect,
     	-- which provides settings for wires which highlight sections.
     	-- The LineAspect for the wire can be edited.
diff --git a/src/AIS/AIS_EqualDistanceRelation.cdl b/src/AIS/AIS_EqualDistanceRelation.cdl
index edc49df6a4..823aa8cd75 100644
--- a/src/AIS/AIS_EqualDistanceRelation.cdl
+++ b/src/AIS/AIS_EqualDistanceRelation.cdl
@@ -51,7 +51,7 @@ is
     	-- aShape3, aShape4 and the plane aPlane.
     	-- The distance is the length of a projection from the
     	-- shape to the plane.
-    returns mutable EqualDistanceRelation from AIS;
+    returns EqualDistanceRelation from AIS;
 
     SetShape3( me: mutable; aShape : Shape from TopoDS )
     is static;
@@ -87,19 +87,19 @@ is
 
     Compute( me            : mutable;
   	     aPresentationManager: PresentationManager3d from PrsMgr;
-    	     aPresentation : mutable Presentation from Prs3d;
+    	     aPresentation : Presentation from Prs3d;
     	     aMode         : Integer from Standard= 0 ) 
     is redefined static private;
     
     Compute( me            : mutable;
     	     aProjector    : Projector from Prs3d;
-             aPresentation : mutable Presentation from Prs3d )
+             aPresentation : Presentation from Prs3d )
     is redefined static private;
     
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: Computes the presentation according to a point of view
     	--          given by <aProjector>. 
@@ -112,12 +112,12 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection( me         : mutable;
-    	    	      aSelection : mutable Selection from SelectMgr;
+    	    	      aSelection : Selection from SelectMgr;
     	    	      aMode      : Integer from Standard)
     is private;
 -- ota -- begin
     ComputeTwoEdgesLength (myclass;
-    	    	    	   aPresentation : mutable Presentation   from Prs3d; 
+    	    	    	   aPresentation : Presentation   from Prs3d; 
 			   aDrawer       :         Drawer         from AIS; 
 			   ArrowSize     :         Real           from Standard;
 			   FirstEdge     :         Edge           from TopoDS;
@@ -137,7 +137,7 @@ is
 			   --          are the returned extreme points of the interval.
 			            
     ComputeTwoVerticesLength(myclass; 
-    	    	    	     aPresentation : mutable Presentation   from Prs3d;
+    	    	    	     aPresentation : Presentation   from Prs3d;
 			     aDrawer       :         Drawer         from AIS; 
 			     ArrowSize     :         Real           from Standard;
 			     FirstVertex   :         Vertex         from TopoDS;
@@ -157,7 +157,7 @@ is
     --          SecondAttach are the returned extreme points of the interval.
 			            
     ComputeOneEdgeOneVertexLength(myclass; 
-    	    	    	          aPresentation : mutable Presentation   from Prs3d;
+    	    	    	          aPresentation : Presentation   from Prs3d;
 			          aDrawer       :         Drawer         from AIS; 
 			          ArrowSize     :         Real           from Standard;
 			          FirstShape    :         Shape          from TopoDS;
diff --git a/src/AIS/AIS_EqualRadiusRelation.cdl b/src/AIS/AIS_EqualRadiusRelation.cdl
index f05bb3124e..4e1aaac7a6 100644
--- a/src/AIS/AIS_EqualRadiusRelation.cdl
+++ b/src/AIS/AIS_EqualRadiusRelation.cdl
@@ -35,25 +35,25 @@ is
 	    ---Purpose: Creates equal relation of two arc's radiuses.
 	    --          If one of edges is not in the given plane,
     	    --	        the presentation method projects it onto the plane.
-    returns mutable EqualRadiusRelation from AIS;
+    returns EqualRadiusRelation from AIS;
    
 -- Methods from PresentableObject
 
     Compute( me            : mutable;
   	     aPresentationManager: PresentationManager3d from PrsMgr;
-    	     aPresentation : mutable Presentation from Prs3d;
+    	     aPresentation : Presentation from Prs3d;
     	     aMode         : Integer from Standard= 0 ) 
     is redefined static private;
     
     Compute( me            : mutable;
     	     aProjector    : Projector from Prs3d;
-             aPresentation : mutable Presentation from Prs3d )
+             aPresentation : Presentation from Prs3d )
     is redefined static private;
     
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>. 
@@ -66,7 +66,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection( me         : mutable;
-    	    	      aSelection : mutable Selection from SelectMgr;
+    	    	      aSelection : Selection from SelectMgr;
     	    	      aMode      : Integer from Standard)
     is private;
     
diff --git a/src/AIS/AIS_ExclusionFilter.cdl b/src/AIS/AIS_ExclusionFilter.cdl
index b4493fc21c..3f9ee45aed 100644
--- a/src/AIS/AIS_ExclusionFilter.cdl
+++ b/src/AIS/AIS_ExclusionFilter.cdl
@@ -40,14 +40,14 @@ uses
 is
     
     Create(ExclusionFlagOn:Boolean from Standard = Standard_True)
-    returns mutable ExclusionFilter from AIS;
+    returns ExclusionFilter from AIS;
     	---Purpose: Constructs an empty exclusion filter object defined by
     	-- the flag setting ExclusionFlagOn.
     	-- By default, the flag is set to true.
     
     Create(TypeToExclude : KindOfInteractive from AIS;
 	   ExclusionFlagOn : Boolean from Standard = Standard_True)
-    returns  mutable ExclusionFilter from AIS;
+    returns ExclusionFilter from AIS;
     	---Purpose: All the AIS objects of <TypeToExclude>
     	--          Will be rejected by the IsOk Method.
     
@@ -55,7 +55,7 @@ is
     Create(TypeToExclude : KindOfInteractive from AIS;
     	   SignatureInType :Integer from Standard ;
 	   ExclusionFlagOn : Boolean from Standard = Standard_True)
-    returns  mutable ExclusionFilter from AIS;
+    returns ExclusionFilter from AIS;
     	---Purpose: Constructs an exclusion filter object defined by the
     	-- enumeration value TypeToExclude, the signature
     	-- SignatureInType, and the flag setting ExclusionFlagOn.
diff --git a/src/AIS/AIS_FixRelation.cdl b/src/AIS/AIS_FixRelation.cdl
index 182ae36c7c..8c57a13642 100644
--- a/src/AIS/AIS_FixRelation.cdl
+++ b/src/AIS/AIS_FixRelation.cdl
@@ -49,7 +49,7 @@ is
 	---Purpose:  initializes the vertex aShape, the
     	--   plane aPlane and the wire aWire, which connects
     	--   the two vertices in a fixed relation.
-    returns mutable FixRelation from AIS;
+    returns FixRelation from AIS;
 
     Create (aShape      : Shape          from TopoDS;
 	    aPlane      : Plane          from Geom;
@@ -60,11 +60,11 @@ is
     	--   plane aPlane and the wire aWire, the position
     	--   aPosition, the arrow size anArrowSize and the
     	-- wire aWire, which connects the two vertices in a fixed relation.
-    returns mutable FixRelation from AIS;
+    returns FixRelation from AIS;
     Create (aShape      : Shape          from TopoDS;
 	    aPlane      : Plane          from Geom)
 	---Purpose:  initializes the edge aShape and the plane aPlane.
-    returns mutable FixRelation from AIS;
+    returns FixRelation from AIS;
 
     Create (aShape      : Shape          from TopoDS;
 	    aPlane      : Plane          from Geom;
@@ -74,7 +74,7 @@ is
     	--   plane aPlane, the position aPosition and the arrow
     	--   size anArrowSize.
         
-    returns mutable FixRelation from AIS;
+    returns FixRelation from AIS;
 
     Wire(me: mutable) returns Wire from TopoDS 
     is static;
@@ -95,19 +95,19 @@ is
     
     Compute(me            : mutable;
   	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>. 
@@ -120,7 +120,7 @@ is
     -- Methods from SelectableObject
    
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)
     is redefined private;
     
diff --git a/src/AIS/AIS_GlobalStatus.cdl b/src/AIS/AIS_GlobalStatus.cdl
index c6771e433c..c36e6b351c 100644
--- a/src/AIS/AIS_GlobalStatus.cdl
+++ b/src/AIS/AIS_GlobalStatus.cdl
@@ -31,14 +31,14 @@ uses
 
 is
 
-    Create returns mutable GlobalStatus from AIS;
+    Create returns GlobalStatus from AIS;
 
     Create (aStat             : DisplayStatus from AIS;
     	    aDispMode,aSelMode: Integer from Standard;
 	    ishilighted       : Boolean from Standard=Standard_False;
 	    TheHiCol          : NameOfColor from Quantity = Quantity_NOC_WHITE;
 	    aLayerIndex       : Integer from Standard = 0)
-	    returns mutable GlobalStatus from AIS;
+	    returns GlobalStatus from AIS;
 
 		    ---Category: Modifications.
 
diff --git a/src/AIS/AIS_IdenticRelation.cdl b/src/AIS/AIS_IdenticRelation.cdl
index d05a893d93..bdd79d4fb0 100644
--- a/src/AIS/AIS_IdenticRelation.cdl
+++ b/src/AIS/AIS_IdenticRelation.cdl
@@ -41,7 +41,7 @@ is
     Create(FirstShape  : Shape from TopoDS;
     	   SecondShape : Shape from TopoDS;
 	   aPlane      : Plane from Geom)
-    returns mutable IdenticRelation from AIS;
+    returns IdenticRelation from AIS;
     	---Purpose:
     	--   Initializes the relation of identity between the two
     	-- entities, FirstShape and SecondShape. The plane
@@ -58,19 +58,19 @@ is
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     ---Purpose: computes the presentation according to a point of view
     --          given by <aProjector>. 
@@ -83,7 +83,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)
     is redefined private;
 
@@ -92,15 +92,15 @@ is
 --
 
     ComputeOneEdgeOVertexPresentation(me: mutable;
-    	    	    	       aPresentation : mutable Presentation from Prs3d)
+    	    	    	       aPresentation : Presentation from Prs3d)
     is private;
 
     ComputeTwoEdgesPresentation(me: mutable;
-    	    	    	       aPresentation : mutable Presentation from Prs3d)
+    	    	    	       aPresentation : Presentation from Prs3d)
     is private;
     
     ComputeTwoLinesPresentation(me: mutable;
-    	    	    	       aPresentation : mutable Presentation from Prs3d; 
+    	    	    	       aPresentation : Presentation from Prs3d; 
 			       aLin    : Line from Geom;
     	    	    	       Pnt1On1 : in out Pnt  from gp;
 			       Pnt2On1 : in out Pnt  from gp;
@@ -111,7 +111,7 @@ is
     is private; 
     
     ComputeTwoCirclesPresentation(me: mutable;
-    	    	    	       aPresentation : mutable Presentation from Prs3d; 
+    	    	    	       aPresentation : Presentation from Prs3d; 
 			       aCircle : Circle from Geom;
     	    	    	       Pnt1On1 : Pnt    from gp;
 			       Pnt2On1 : Pnt    from gp;
@@ -146,7 +146,7 @@ is
     
     -- jfa 10/10/2000
     ComputeTwoEllipsesPresentation(me: mutable;
-    	    	    		   aPrs    : mutable Presentation from Prs3d; 
+    	    	    		   aPrs    : Presentation from Prs3d; 
 			           anEll   : Ellipse from Geom;
     	    	    	           Pnt1On1 : Pnt    from gp;
 			           Pnt2On1 : Pnt    from gp;
@@ -181,7 +181,7 @@ is
     -- jfa 18/10/2000 end
     
     ComputeTwoVerticesPresentation(me: mutable; 
-    	    	    	           aPresentation : mutable Presentation from Prs3d)
+    	    	    	           aPresentation : Presentation from Prs3d)
     is private;    
 
     ComputeSegSize(me)
diff --git a/src/AIS/AIS_InteractiveContext.cdl b/src/AIS/AIS_InteractiveContext.cdl
index 183c40a78d..bcbc176daa 100644
--- a/src/AIS/AIS_InteractiveContext.cdl
+++ b/src/AIS/AIS_InteractiveContext.cdl
@@ -142,7 +142,7 @@ uses
 is
 
     Create(MainViewer:Viewer from V3d) 
-    returns mutable InteractiveContext from  AIS;
+    returns InteractiveContext from  AIS;
     	---Purpose:
     	-- Constructs the interactive context object defined by
     	-- the principal viewer MainViewer.    
@@ -1026,7 +1026,7 @@ is
     --          of myDefaultDrawer ;
     --          anAngle is in radian ; ( 1 deg < angle in deg < 20 deg)
     
-    HiddenLineAspect(me) returns mutable LineAspect from Prs3d
+    HiddenLineAspect(me) returns LineAspect from Prs3d
     ---Purpose: Initializes hidden line aspect in the default drawing tool, or Drawer.
 -- The default values are:
     --          Color: Quantity_NOC_YELLOW
diff --git a/src/AIS/AIS_Line.cdl b/src/AIS/AIS_Line.cdl
index c2370d644c..3e80f2fa80 100644
--- a/src/AIS/AIS_Line.cdl
+++ b/src/AIS/AIS_Line.cdl
@@ -37,30 +37,30 @@ uses
 
 is
     Create(aLine : Line from Geom) 
-    returns mutable Line from AIS;
+    returns Line from AIS;
     	---Purpose: Initializes the line aLine.
         
     Create(aStartPoint : Point from Geom;
     	   aEndPoint : Point from Geom) 
-    returns mutable Line from AIS;
+    returns Line from AIS;
     	---Purpose: Initializes a starting point aStartPoint
     	--   and a finishing point aEndPoint for the line. 
  
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard = 0) 
     is redefined static  private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;
 
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
             aTrsf         : Transformation from Geom;
-            aPresentation : mutable Presentation from Prs3d)
+            aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>.
@@ -73,7 +73,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
  
@@ -127,19 +127,19 @@ is
 
 
     ComputeInfiniteLine(me: mutable;
-                        aPresentation : mutable Presentation from Prs3d)
+                        aPresentation : Presentation from Prs3d)
     is private;
      
     ComputeSegmentLine(me: mutable;
-                       aPresentation : mutable Presentation from Prs3d)
+                       aPresentation : Presentation from Prs3d)
     is private;
 
     ComputeInfiniteLineSelection(me: mutable;
-                                 aSelection : mutable Selection from SelectMgr)
+                                 aSelection : Selection from SelectMgr)
     is private;
      
     ComputeSegmentLineSelection(me: mutable;
-                                aSelection : mutable Selection from SelectMgr)
+                                aSelection : Selection from SelectMgr)
     is private;
 
 fields
diff --git a/src/AIS/AIS_LocalContext.cdl b/src/AIS/AIS_LocalContext.cdl
index 337f1383b8..61d4f160b2 100644
--- a/src/AIS/AIS_LocalContext.cdl
+++ b/src/AIS/AIS_LocalContext.cdl
@@ -81,7 +81,7 @@ uses
 
 is
 
-    Create returns mutable LocalContext from AIS;
+    Create returns LocalContext from AIS;
     
 
     Create (aCtx                : InteractiveContext from AIS;
@@ -90,7 +90,7 @@ is
             AcceptStandardModes : Boolean from Standard=Standard_True;
             AcceptErase         : Boolean from Standard= Standard_False;
             UseBothViewers      : Boolean from Standard= Standard_False)
-            returns mutable LocalContext from AIS;
+            returns LocalContext from AIS;
     ---Purpose: Constructor By Default, the  displayed objects are 
     --          automatically loaded.
 
diff --git a/src/AIS/AIS_LocalStatus.cdl b/src/AIS/AIS_LocalStatus.cdl
index 7ee3bf662c..41c1d61fa1 100644
--- a/src/AIS/AIS_LocalStatus.cdl
+++ b/src/AIS/AIS_LocalStatus.cdl
@@ -29,7 +29,7 @@ is
 	   HilightMode   : Integer from Standard = 0;
     	   SubIntensity  : Boolean from Standard = 0;
     	   TheHiCol      : NameOfColor from Quantity = Quantity_NOC_WHITE)
-     returns mutable LocalStatus from AIS;
+     returns LocalStatus from AIS;
     
 
 
diff --git a/src/AIS/AIS_MaxRadiusDimension.cdl b/src/AIS/AIS_MaxRadiusDimension.cdl
index 1780a3574d..3a4b602275 100644
--- a/src/AIS/AIS_MaxRadiusDimension.cdl
+++ b/src/AIS/AIS_MaxRadiusDimension.cdl
@@ -50,7 +50,7 @@ is
 	    ---Purpose: Max  Ellipse  radius dimension 
 	    --  Shape  can  be  edge  ,  planar  face  or  cylindrical  face 
     	    --  
-    returns mutable MaxRadiusDimension from AIS;
+    returns MaxRadiusDimension from AIS;
 
     Create (aShape      : Shape          from TopoDS;
 	    aVal        : Real           from Standard;
@@ -61,7 +61,7 @@ is
 	    ---Purpose:  Max  Ellipse  radius dimension with  position
 	    --  Shape  can  be  edge  ,  planar  face  or  cylindrical  face 
     	    --   
-    returns mutable MaxRadiusDimension  from AIS;
+    returns MaxRadiusDimension  from AIS;
 
 
 
@@ -70,19 +70,19 @@ is
 
     Compute(me                  : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation       : mutable Presentation from Prs3d;
+    	    aPresentation       : Presentation from Prs3d;
     	    aMode               : Integer from Standard= 0) 
     is redefined private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;
     
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     ---Purpose: computes the presentation according to a point of view
     --          given by <aProjector>. 
@@ -95,7 +95,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)
     is redefined private;
 
@@ -104,11 +104,11 @@ is
 --
 
     ComputeEllipse(me: mutable;
-    	    	     	aPresentation : mutable Presentation from Prs3d)
+    	    	     	aPresentation : Presentation from Prs3d)
     is private; 
      
     ComputeArcOfEllipse(me: mutable;
-    	    	     	aPresentation : mutable Presentation from Prs3d  )
+    	    	     	aPresentation : Presentation from Prs3d  )
     is private; 
 
 fields 
diff --git a/src/AIS/AIS_MidPointRelation.cdl b/src/AIS/AIS_MidPointRelation.cdl
index a7dd3c733b..f6bc2333e2 100644
--- a/src/AIS/AIS_MidPointRelation.cdl
+++ b/src/AIS/AIS_MidPointRelation.cdl
@@ -37,7 +37,7 @@ is
     	   FirstShape  : Shape from TopoDS;
     	   SecondShape : Shape from TopoDS;
 	   aPlane      : Plane from Geom)
-    returns mutable MidPointRelation from AIS;
+    returns MidPointRelation from AIS;
 
     IsMovable(me) returns Boolean from Standard 
     ---C++: inline       
@@ -54,19 +54,19 @@ is
 -- Methods from PresentableObject
     Compute(me: mutable;
   	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation       : mutable Presentation from Prs3d;
+    	    aPresentation       : Presentation from Prs3d;
     	    aMode               : Integer from Standard= 0) 
     is redefined static private;
 
     Compute(me: mutable;
     	    aProjector   : Projector from Prs3d;
-            aPresentation: mutable Presentation from Prs3d)
+            aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
     Compute(me: mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     ---Purpose: Computes the presentation according to a point of view
     --          given by <aProjector>. 
@@ -78,17 +78,17 @@ is
 
 -- Methods from SelectableObject
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
 -- Computation private methods
-    ComputeFaceFromPnt(me: mutable; aprs : mutable Presentation from Prs3d; first : Boolean from Standard)
+    ComputeFaceFromPnt(me: mutable; aprs : Presentation from Prs3d; first : Boolean from Standard)
     is private;
 
-    ComputeEdgeFromPnt(me: mutable; aprs : mutable Presentation from Prs3d; first : Boolean from Standard)
+    ComputeEdgeFromPnt(me: mutable; aprs : Presentation from Prs3d; first : Boolean from Standard)
     is private;
 
-    ComputeVertexFromPnt(me: mutable; aprs : mutable Presentation from Prs3d; first : Boolean from Standard)
+    ComputeVertexFromPnt(me: mutable; aprs : Presentation from Prs3d; first : Boolean from Standard)
     is private;
 
    
diff --git a/src/AIS/AIS_MinRadiusDimension.cdl b/src/AIS/AIS_MinRadiusDimension.cdl
index 0445cf121c..a9a15ab0fe 100644
--- a/src/AIS/AIS_MinRadiusDimension.cdl
+++ b/src/AIS/AIS_MinRadiusDimension.cdl
@@ -51,7 +51,7 @@ is
 	    ---Purpose: Max  Ellipse  radius dimension 
 	    --  Shape  can  be  edge  ,  planar  face  or  cylindrical  face 
     	    --  
-    returns mutable MinRadiusDimension from AIS;
+    returns MinRadiusDimension from AIS;
 
     Create (aShape      : Shape          from TopoDS;
 	    aVal        : Real           from Standard;
@@ -62,7 +62,7 @@ is
 	    ---Purpose:  Max  Ellipse  radius dimension with  position
 	    --  Shape  can  be  edge  ,  planar  face  or  cylindrical  face 
     	    --   
-    returns mutable MinRadiusDimension  from AIS;
+    returns MinRadiusDimension  from AIS;
 
 
 
@@ -71,19 +71,19 @@ is
 
     Compute(me                  : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation       : mutable Presentation from Prs3d;
+    	    aPresentation       : Presentation from Prs3d;
     	    aMode               : Integer from Standard= 0) 
     is redefined private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
     
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     ---Purpose: computes the presentation according to a point of view
     --          given by <aProjector>. 
@@ -96,7 +96,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)
     is redefined private;
 
@@ -105,11 +105,11 @@ is
 --
 
     ComputeEllipse(me: mutable;
-    	    	     	aPresentation : mutable Presentation from Prs3d)
+    	    	     	aPresentation : Presentation from Prs3d)
     is private; 
      
     ComputeArcOfEllipse(me: mutable;
-    	    	     	aPresentation : mutable Presentation from Prs3d  )
+    	    	     	aPresentation : Presentation from Prs3d  )
     is private; 
 
 fields 
diff --git a/src/AIS/AIS_MultipleConnectedInteractive.cdl b/src/AIS/AIS_MultipleConnectedInteractive.cdl
index 0bd6499dff..5ce6b7b167 100644
--- a/src/AIS/AIS_MultipleConnectedInteractive.cdl
+++ b/src/AIS/AIS_MultipleConnectedInteractive.cdl
@@ -43,7 +43,7 @@ is
     
 
     Create (aTypeOfPresentation3d: TypeOfPresentation3d from PrsMgr = PrsMgr_TOP_AllView) 
-    returns  mutable  MultipleConnectedInteractive  from  AIS;
+    returns  MultipleConnectedInteractive  from  AIS;
     ---Purpose: Initializes the Interactive Object with multiple
     -- presentation connections. If aTypeOfPresentation3d
     -- does not have the affectation PrsMgr_TOP_AllView,
@@ -79,7 +79,7 @@ is
     
     Compute(me:mutable;
             aPresentationManager :         PresentationManager3d from PrsMgr;
-            aPresentation        : mutable Presentation          from Prs3d;
+            aPresentation        : Presentation          from Prs3d;
             aMode                :         Integer               from Standard = 0)
     ---Level: Internal 
     ---Purpose: this method is redefined virtual;
@@ -93,7 +93,7 @@ is
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     ---Purpose: computes the presentation according to a point of view
     --          given by <aProjector>. 
@@ -105,10 +105,10 @@ is
 
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined ;     
 
-    ComputeSelection(me:mutable; aSelection :mutable Selection from SelectMgr;
+    ComputeSelection(me:mutable; aSelection : Selection from SelectMgr;
                                  aMode      :        Integer   from Standard)
     is redefined virtual private;
 
diff --git a/src/AIS/AIS_MultipleConnectedShape.cdl b/src/AIS/AIS_MultipleConnectedShape.cdl
index 9b0b6f5ad1..c58a5b17c0 100644
--- a/src/AIS/AIS_MultipleConnectedShape.cdl
+++ b/src/AIS/AIS_MultipleConnectedShape.cdl
@@ -42,7 +42,7 @@ raises
 is
 
     Create (aShape : Shape from TopoDS) 
-    returns  mutable  MultipleConnectedShape  from  AIS;
+    returns  MultipleConnectedShape  from  AIS;
     	---Purpose: Initializes the shape aShape, a multiple connected
     	-- Interactive Object grouping different
     	-- projector-dependent representations of an entity.
@@ -68,16 +68,16 @@ is
 
     Compute(me:mutable;
     	        aProjector   :         Projector    from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined virtual protected;
  
     Compute(me:mutable;
     	        aProjector   :         Projector    from Prs3d;
 		aTrsf        :         Transformation from Geom;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined virtual protected;
  
-    ComputeSelection(me:mutable; aSelection :mutable Selection from SelectMgr;
+    ComputeSelection(me:mutable; aSelection : Selection from SelectMgr;
                                  aMode      :        Integer   from Standard)
     is redefined virtual protected;
     
@@ -85,13 +85,13 @@ is
     
     Compute(me:mutable;
     	        aProjector   :         Projector    from Prs3d;
-                aPresentation: mutable Presentation from Prs3d;
+                aPresentation: Presentation from Prs3d;
     	    	aShape       :         Shape from TopoDS)
     is private;
      
     Compute(me:mutable;
             aPresentationManager :         PresentationManager3d from PrsMgr;
-            aPresentation        : mutable Presentation          from Prs3d;
+            aPresentation        : Presentation          from Prs3d;
             aMode                :         Integer               from Standard = 0)
     	---Level: Internal 
     	---Purpose: this method is redefined virtual;
diff --git a/src/AIS/AIS_OffsetDimension.cdl b/src/AIS/AIS_OffsetDimension.cdl
index b7705e90d7..f8538cea04 100644
--- a/src/AIS/AIS_OffsetDimension.cdl
+++ b/src/AIS/AIS_OffsetDimension.cdl
@@ -39,26 +39,26 @@ is
     Create (FistShape, SecondShape : Shape          from TopoDS;
 	    aVal                   : Real           from Standard;
 	    aText                  : ExtendedString from TCollection)
-    returns mutable OffsetDimension from AIS;
+    returns OffsetDimension from AIS;
     	---Purpose: Constructs the offset display object defined by the
     	-- first shape aFShape, the second shape aSShape, the
     	-- dimension aVal, and the text aText.    
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined private;
 
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
     
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>. 
@@ -71,7 +71,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)
     is redefined private;
 
@@ -94,17 +94,17 @@ is
     	-- selection to a relative position.
 
     ComputeTwoFacesOffset(me: mutable;
-    	    	    	  aPresentation : mutable Presentation from Prs3d;
+    	    	    	  aPresentation : Presentation from Prs3d;
     	    	    	  aTrsf         : Trsf from gp)
     is private;
     
     ComputeTwoAxesOffset(me: mutable;
-    	    	    	  aPresentation : mutable Presentation from Prs3d;
+    	    	    	  aPresentation : Presentation from Prs3d;
     	    	    	  aTrsf         : Trsf from gp)
     is private;
 
     ComputeAxeFaceOffset(me: mutable;
-    	    	  	  aPresentation : mutable Presentation from Prs3d;
+    	    	  	  aPresentation : Presentation from Prs3d;
     	    	    	  aTrsf         : Trsf from gp)
     is private;
 
diff --git a/src/AIS/AIS_ParallelRelation.cdl b/src/AIS/AIS_ParallelRelation.cdl
index 77b70b835f..588c90c92a 100644
--- a/src/AIS/AIS_ParallelRelation.cdl
+++ b/src/AIS/AIS_ParallelRelation.cdl
@@ -38,7 +38,7 @@ is
 	---Purpose:  Constructs an object to display parallel constraints.
     	-- This object is defined by the first shape aFShape and
     	-- the second shape aSShape and the plane aPlane.
-    returns mutable ParallelRelation from AIS;
+    returns ParallelRelation from AIS;
 
     Create (aFShape     : Shape          from TopoDS;
     	    aSShape     : Shape          from TopoDS;
@@ -51,7 +51,7 @@ is
     	-- the second shape aSShape the plane aPlane, the
     	-- position aPosition, the type of arrow, aSymbolPrs and
     	-- its size anArrowSize.
-    returns mutable ParallelRelation from AIS;
+    returns ParallelRelation from AIS;
 
     IsMovable(me) returns Boolean from Standard 
     	---Purpose: Returns true if the parallelism is movable.  
@@ -62,19 +62,19 @@ is
 
     Compute(me            : mutable;
   	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>. 
@@ -87,7 +87,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
 
@@ -97,11 +97,11 @@ is
 --
 
     ComputeTwoFacesParallel(me: mutable;
-    	    	    	    aPresentation : mutable Presentation from Prs3d)
+    	    	    	    aPresentation : Presentation from Prs3d)
     is private;
     
     ComputeTwoEdgesParallel(me: mutable;
-    	    	    	    aPresentation : mutable Presentation from Prs3d)
+    	    	    	    aPresentation : Presentation from Prs3d)
     is private;
     
 
diff --git a/src/AIS/AIS_PerpendicularRelation.cdl b/src/AIS/AIS_PerpendicularRelation.cdl
index 6221f4b2c5..fc7fd914ad 100644
--- a/src/AIS/AIS_PerpendicularRelation.cdl
+++ b/src/AIS/AIS_PerpendicularRelation.cdl
@@ -39,7 +39,7 @@ is
     	-- aPlane is the plane of reference to show and test the
     	-- perpendicular relation between two shapes, at least
     	-- one of which has a revolved surface.
-    returns mutable PerpendicularRelation from AIS;
+    returns PerpendicularRelation from AIS;
 
     Create (aFShape     : Shape          from TopoDS;
     	    aSShape     : Shape          from TopoDS)
@@ -47,25 +47,25 @@ is
     	-- perpendicularity on shapes.
     	-- This object is defined by a first shape aFShape and a
     	-- second shape aSShape.
-    returns mutable PerpendicularRelation from AIS;
+    returns PerpendicularRelation from AIS;
 
 -- -- Methods from PresentableObject
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>. 
@@ -78,7 +78,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
 
@@ -87,11 +87,11 @@ is
 --
 
     ComputeTwoFacesPerpendicular(me: mutable;
-    	    	    	         aPresentation : mutable Presentation from Prs3d)
+    	    	    	         aPresentation : Presentation from Prs3d)
     is private;
     
     ComputeTwoEdgesPerpendicular(me: mutable;
-    	    	    	         aPresentation : mutable Presentation from Prs3d)
+    	    	    	         aPresentation : Presentation from Prs3d)
     is private;
     
 
diff --git a/src/AIS/AIS_Plane.cdl b/src/AIS/AIS_Plane.cdl
index 885cb9f0e3..17a35bb56c 100644
--- a/src/AIS/AIS_Plane.cdl
+++ b/src/AIS/AIS_Plane.cdl
@@ -44,7 +44,7 @@ uses
 is
     Create(aComponent : Plane from Geom;
     	   aCurrentMode : Boolean from Standard = Standard_False) 
-    returns mutable Plane from AIS;
+    returns Plane from AIS;
     	---Purpose: initializes the plane aComponent. If
     	--   the mode aCurrentMode equals true, the drawing
     	--   tool, "Drawer" is not initialized.  
@@ -52,7 +52,7 @@ is
     Create(aComponent : Plane from Geom;
     	   aCenter    : Pnt   from gp;
     	   aCurrentMode : Boolean from Standard = Standard_False) 
-    returns mutable Plane from AIS;
+    returns Plane from AIS;
     	--- Purpose:   initializes the plane aComponent and
     	--   the point aCenter. If the mode aCurrentMode
     	--   equals true, the drawing tool, "Drawer" is not
@@ -64,7 +64,7 @@ is
 	   aPmin      : Pnt   from gp;
 	   aPmax      : Pnt   from gp;
     	   aCurrentMode : Boolean from Standard = Standard_False) 
-    returns mutable Plane from AIS;
+    returns Plane from AIS;
     	---Purpose:   initializes the plane aComponent, the
     	--   point aCenter, and the minimum and maximum
     	--   points, aPmin and aPmax. If the mode
@@ -73,7 +73,7 @@ is
     Create(aComponent : Axis2Placement from Geom;
     	   aPlaneType : TypeOfPlane from AIS;
     	   aCurrentMode : Boolean from Standard = Standard_False) 
-    returns mutable Plane from AIS;
+    returns Plane from AIS;
 
 
     ---Category: Size Modifications...
@@ -197,19 +197,19 @@ is
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard = 0) 
     is redefined virtual private;
 
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined virtual private;
 
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
             aTrsf         : Transformation from Geom;
-            aPresentation : mutable Presentation from Prs3d)
+            aPresentation : Presentation from Prs3d)
     is redefined;
     ---Purpose: computes the presentation according to a point of view
     --          given by <aProjector>.
@@ -222,7 +222,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection (me           : mutable;
-                      theSelection : mutable Selection from SelectMgr;
+                      theSelection : Selection from SelectMgr;
                       theMode      : Integer from Standard) is redefined virtual;
 
 -- Methods from InteractiveObject
diff --git a/src/AIS/AIS_PlaneTrihedron.cdl b/src/AIS/AIS_PlaneTrihedron.cdl
index 0cfe8160c8..2774a83521 100644
--- a/src/AIS/AIS_PlaneTrihedron.cdl
+++ b/src/AIS/AIS_PlaneTrihedron.cdl
@@ -60,7 +60,7 @@ uses
 is
 
     Create(aPlane : Plane from Geom)
-    returns mutable PlaneTrihedron from AIS;
+    returns PlaneTrihedron from AIS;
     	---Purpose: Initializes the plane aPlane. The plane trihedron is
     	--  constructed from this and an axis.
         
@@ -94,20 +94,20 @@ is
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard = 0) 
     is redefined protected;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
 
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
             aTrsf         : Transformation from Geom;
-            aPresentation : mutable Presentation from Prs3d)
+            aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>.
@@ -120,7 +120,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
 -- Methods from InteractiveObject
diff --git a/src/AIS/AIS_Point.cdl b/src/AIS/AIS_Point.cdl
index ce062fe894..62745ffa1b 100644
--- a/src/AIS/AIS_Point.cdl
+++ b/src/AIS/AIS_Point.cdl
@@ -38,7 +38,7 @@ uses
 
 is
     Create(aComponent : Point from Geom) 
-    returns mutable Point from AIS;
+    returns Point from AIS;
     	---Purpose:
     	-- Initializes the point aComponent from which the point
     	-- datum will be built.
@@ -62,19 +62,19 @@ is
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard = 0) 
     is redefined virtual protected;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;
 
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
             aTrsf         : Transformation from Geom;
-            aPresentation : mutable Presentation from Prs3d)
+            aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>.
@@ -87,7 +87,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard )is private;
 
 -- Methods from InteractiveObject
diff --git a/src/AIS/AIS_Relation.cdl b/src/AIS/AIS_Relation.cdl
index 4a64668490..11b85f05b5 100644
--- a/src/AIS/AIS_Relation.cdl
+++ b/src/AIS/AIS_Relation.cdl
@@ -207,7 +207,7 @@ is
     	-- Returns true if the display mode aMode is accepted
     	-- for the Interactive Objects in the relation.
     	-- ComputeProjPresentation(me;
-    	-- 	    	    	    aPres    : mutable Presentation from Prs3d;
+    	-- 	    	    	    aPres    : Presentation from Prs3d;
 	--		    Curve1   : Curve                from Geom;
 	--		    Curve2   : Curve                from Geom;
 	--		    FirstP1  : Pnt                  from gp;
@@ -221,7 +221,7 @@ is
     --is protected;
     
     ComputeProjEdgePresentation(me;
-    	    	  		aPres    : mutable Presentation from Prs3d; 
+    	    	  		aPres    : Presentation from Prs3d; 
 			   	anEdge   : Edge                 from TopoDS;
 			    	ProjCurve: Curve                from Geom;
 			    	FirstP   : Pnt                  from gp;
@@ -238,7 +238,7 @@ is
     	-- type - aProjTOL and aCallTOL -   and width of line, aWidth.
         
     ComputeProjVertexPresentation(me;
-    	    	  		  aPres    : mutable Presentation from Prs3d; 
+    	    	  		  aPres    : Presentation from Prs3d; 
 			   	  aVertex  : Vertex               from TopoDS;
 			    	  ProjPoint: Pnt                  from gp;
        			    	  aColor   : NameOfColor          from Quantity = Quantity_NOC_PURPLE;
diff --git a/src/AIS/AIS_Selection.cdl b/src/AIS/AIS_Selection.cdl
index 9f54d735e2..eb5dc5828f 100644
--- a/src/AIS/AIS_Selection.cdl
+++ b/src/AIS/AIS_Selection.cdl
@@ -37,7 +37,7 @@ raises NoSuchObject,MultiplyDefined from Standard,TypeMismatch from Standard
 is
     
     Create(aName: CString from Standard)
-    returns mutable Selection from AIS;
+    returns Selection from AIS;
     ---Purpose: creates a new selection and make it current in the session.
     --          the selection will be accessible later through its name
     --          to make it again current.
@@ -72,7 +72,7 @@ is
 
     Selection(myclass; aName: CString from Standard) 
     ---Purpose: 
-    returns mutable Selection from AIS;
+    returns Selection from AIS;
 
     SetCurrentSelection(myclass; aName: CString from Standard)
     ---Purpose: 
@@ -81,7 +81,7 @@ is
 
     CurrentSelection(myclass)
     ---Purpose: 
-    returns mutable Selection from AIS;
+    returns Selection from AIS;
     
     ClearCurrentSelection(myclass);
     ---Purpose: Clears selection.
diff --git a/src/AIS/AIS_Shape.cdl b/src/AIS/AIS_Shape.cdl
index a7990c9e9e..abc541246b 100644
--- a/src/AIS/AIS_Shape.cdl
+++ b/src/AIS/AIS_Shape.cdl
@@ -69,7 +69,7 @@ uses
  is
 
     Create(shap: Shape from TopoDS) 
-    returns mutable Shape from AIS;
+    returns Shape from AIS;
     	---Purpose: Initializes construction of the shape shap from wires,
     	-- edges and vertices.
         
@@ -172,25 +172,25 @@ uses
 
     Compute(me                   : mutable;
             aPresentationManager : PresentationManager3d from PrsMgr;
-            aPresentation        : mutable Presentation from Prs3d;
+            aPresentation        : Presentation from Prs3d;
     	    aMode                : Integer from Standard = 0) 
     is redefined virtual protected;
 
     Compute(me                   : mutable;
     	    aProjector           : Projector from Prs3d;
-            aPresentation        : mutable Presentation from Prs3d)
+            aPresentation        : Presentation from Prs3d)
     is redefined virtual protected;
 
     Compute(me                   : mutable;
     	    aProjector           : Projector from Prs3d;
 	    aTrsf                : Transformation from Geom;
-	    aPresentation        : mutable Presentation from Prs3d)
+	    aPresentation        : Presentation from Prs3d)
     is redefined virtual protected;
     
 
 
     ComputeSelection(me          : mutable;
-    	    	     aSelection  : mutable Selection from SelectMgr;
+    	    	     aSelection  : Selection from SelectMgr;
     	    	     aMode       : Integer from Standard)
     is redefined virtual protected; 
 				
@@ -288,7 +288,7 @@ uses
 
     Compute(me                   : mutable;
     	    aProjector           : Projector from Prs3d;
-            aPresentation        : mutable Presentation from Prs3d;
+            aPresentation        : Presentation from Prs3d;
     	    ashape               : Shape from TopoDS) is static private;
 
     GetDeflection(myclass; aShape  : Shape from TopoDS;
diff --git a/src/AIS/AIS_SignatureFilter.cdl b/src/AIS/AIS_SignatureFilter.cdl
index 2afe26fd5b..d8cbadea71 100644
--- a/src/AIS/AIS_SignatureFilter.cdl
+++ b/src/AIS/AIS_SignatureFilter.cdl
@@ -55,7 +55,7 @@ is
 
     Create(aGivenKind      : KindOfInteractive from AIS;
            aGivenSignature : Integer from Standard)
-    returns mutable SignatureFilter from AIS;
+    returns SignatureFilter from AIS;
     	--- Purpose: Initializes the signature filter, adding the signature
     	-- specification, aGivenSignature, to that for type,
     	-- aGivenKind, in AIS_TypeFilter.
diff --git a/src/AIS/AIS_SymmetricRelation.cdl b/src/AIS/AIS_SymmetricRelation.cdl
index e271f5fa3b..b3a35f0bec 100644
--- a/src/AIS/AIS_SymmetricRelation.cdl
+++ b/src/AIS/AIS_SymmetricRelation.cdl
@@ -37,7 +37,7 @@ is
     	   FirstShape  : Shape from TopoDS;
     	   SecondShape : Shape from TopoDS;
 	   aPlane      : Plane from Geom)
-    returns mutable SymmetricRelation from AIS;
+    returns SymmetricRelation from AIS;
     	--- Purpose: Constructs an object to display constraints of symmetricity.
     	-- This object is defined by a tool aSymmTool, a first
     	-- shape FirstShape, a second shape SecondShape, and a plane aPlane.
@@ -70,19 +70,19 @@ is
 
     Compute(me            : mutable;
   	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>. 
@@ -95,20 +95,20 @@ is
 --     SymmetricRelation Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
 --
 --     Computation private methods
 --
 
-    ComputeTwoFacesSymmetric(me: mutable; aprs : mutable Presentation from Prs3d)
+    ComputeTwoFacesSymmetric(me: mutable; aprs : Presentation from Prs3d)
     is private;
     
-    ComputeTwoEdgesSymmetric(me: mutable; aprs : mutable Presentation from Prs3d)
+    ComputeTwoEdgesSymmetric(me: mutable; aprs : Presentation from Prs3d)
     is private;
     
-    ComputeTwoVerticesSymmetric(me: mutable; aprs : mutable Presentation from Prs3d)
+    ComputeTwoVerticesSymmetric(me: mutable; aprs : Presentation from Prs3d)
     is private;
     
     
diff --git a/src/AIS/AIS_TangentRelation.cdl b/src/AIS/AIS_TangentRelation.cdl
index 0223471738..d29f615644 100644
--- a/src/AIS/AIS_TangentRelation.cdl
+++ b/src/AIS/AIS_TangentRelation.cdl
@@ -34,7 +34,7 @@ is
 	    aPlane      : Plane          from Geom;
     	    anExternRef : Integer        from Standard = 0)
 	    ---Purpose:  TwoFacesTangent or TwoEdgesTangent relation
-    returns mutable TangentRelation from AIS;
+    returns TangentRelation from AIS;
     	---Purpose: Constructs an object to display tangency constraints.
     	-- This object is defined by the first shape aFShape, the
     	-- second shape aSShape, the plane aPlane and the index anExternRef.
@@ -61,19 +61,19 @@ is
 
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard= 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>. 
@@ -86,7 +86,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
 
@@ -95,11 +95,11 @@ is
 --
 
     ComputeTwoFacesTangent(me: mutable;
-    	    	    	   aPresentation : mutable Presentation from Prs3d)
+    	    	    	   aPresentation : Presentation from Prs3d)
     is private;
     
     ComputeTwoEdgesTangent(me: mutable;
-    	    	    	   aPresentation : mutable Presentation from Prs3d)
+    	    	    	   aPresentation : Presentation from Prs3d)
     is private;
     
 
diff --git a/src/AIS/AIS_Triangulation.cdl b/src/AIS/AIS_Triangulation.cdl
index 0de6558c6f..a68ab54d30 100644
--- a/src/AIS/AIS_Triangulation.cdl
+++ b/src/AIS/AIS_Triangulation.cdl
@@ -39,14 +39,14 @@ is
 
     Compute(me                    : mutable;
             aPresentationManager  : PresentationManager3d from PrsMgr;
-            aPresentation         : mutable Presentation from Prs3d;
+            aPresentation         : Presentation from Prs3d;
             aMode                 : Integer from Standard = 0) 
     is redefined private;
 
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-                     aSelection : mutable Selection from SelectMgr;
+                     aSelection : Selection from SelectMgr;
                      aMode      : Integer from Standard) 
     is redefined private;
     --- Empty implementation, does nothing
diff --git a/src/AIS/AIS_Trihedron.cdl b/src/AIS/AIS_Trihedron.cdl
index 342512aeb0..660f5505dd 100644
--- a/src/AIS/AIS_Trihedron.cdl
+++ b/src/AIS/AIS_Trihedron.cdl
@@ -64,7 +64,7 @@ uses
 is
 
     Create(aComponent : Axis2Placement from Geom)
-    returns mutable Trihedron from AIS;
+    returns Trihedron from AIS;
     	--- Purpose: Initializes a trihedron entity.   
     
     Component(me) returns any Axis2Placement from Geom 
@@ -126,13 +126,13 @@ is
         
     Compute(me            : mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-    	    aPresentation : mutable Presentation from Prs3d;
+    	    aPresentation : Presentation from Prs3d;
     	    aMode         : Integer from Standard = 0) 
     is redefined static private;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
 
@@ -140,7 +140,7 @@ is
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
             aTrsf         : Transformation from Geom;
-            aPresentation : mutable Presentation from Prs3d)
+            aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: Computes the presentation according to a point of view
     	--          given by <aProjector>.
@@ -159,7 +159,7 @@ is
 -- Methods from SelectableObject
 
     ComputeSelection(me         : mutable;
-    	    	     aSelection : mutable Selection from SelectMgr;
+    	    	     aSelection : Selection from SelectMgr;
     	    	     aMode      : Integer from Standard)is private;
 
 -- Methods from InteractiveObject
diff --git a/src/AIS/AIS_TypeFilter.cdl b/src/AIS/AIS_TypeFilter.cdl
index e9720a6b50..ec68021814 100644
--- a/src/AIS/AIS_TypeFilter.cdl
+++ b/src/AIS/AIS_TypeFilter.cdl
@@ -46,7 +46,7 @@ uses
 
 is
     Create(aGivenKind      : KindOfInteractive from AIS)
-    returns mutable TypeFilter from AIS;
+    returns TypeFilter from AIS;
     	---Purpose: Initializes filter for type, aGivenKind.
     IsOk (me;anobj : EntityOwner from SelectMgr)
     returns Boolean from Standard is redefined virtual;
diff --git a/src/APIHeaderSection/APIHeaderSection_MakeHeader.cdl b/src/APIHeaderSection/APIHeaderSection_MakeHeader.cdl
index 29eaa59958..60c90e3e4d 100644
--- a/src/APIHeaderSection/APIHeaderSection_MakeHeader.cdl
+++ b/src/APIHeaderSection/APIHeaderSection_MakeHeader.cdl
@@ -50,7 +50,7 @@ class MakeHeader from APIHeaderSection
        ---Purpose : Returns True if all data have been defined (see also
        --           HasFn, HasFs, HasFd)
 
-       Apply (me; model : mutable StepModel);
+       Apply (me; model : StepModel);
        ---Purpose : Creates an empty header for a new
        --           STEP model and allows the header fields to be completed.
 
@@ -117,8 +117,7 @@ class MakeHeader from APIHeaderSection
        FsValue (me) returns FileSchema from HeaderSection;
        ---Purpose: Returns the file_schema entity. Returns an empty entity if the file_schema entity is not initialized.
 
-       SetSchemaIdentifiers(me : in out; aSchemaIdentifiers : 
-    	    	    	    	 mutable HArray1OfHAsciiString);
+       SetSchemaIdentifiers(me : in out; aSchemaIdentifiers : HArray1OfHAsciiString);
        SetSchemaIdentifiersValue(me : in out; num : Integer;
     	    	       aSchemaIdentifier : HAsciiString);
        SchemaIdentifiers (me) returns HArray1OfHAsciiString;
diff --git a/src/Adaptor2d/Adaptor2d_GenHCurve2d.cdl b/src/Adaptor2d/Adaptor2d_GenHCurve2d.cdl
index 8995575e11..25d792b7fc 100644
--- a/src/Adaptor2d/Adaptor2d_GenHCurve2d.cdl
+++ b/src/Adaptor2d/Adaptor2d_GenHCurve2d.cdl
@@ -37,13 +37,13 @@ is
 
     Create
 	---Purpose: Creates an empty GenHCurve2d.
-    	returns mutable GenHCurve2d from Adaptor2d; 
+    	returns GenHCurve2d from Adaptor2d; 
     
 
     Create(C: TheCurve)
     
 	---Purpose: Creates a GenHCurve2d from a Curve
-    	returns mutable GenHCurve2d from Adaptor2d; 
+    	returns GenHCurve2d from Adaptor2d; 
 
 
     Set(me: mutable; C: TheCurve)
diff --git a/src/Adaptor3d/Adaptor3d_GenHCurve.cdl b/src/Adaptor3d/Adaptor3d_GenHCurve.cdl
index de969d2723..7b77743f91 100644
--- a/src/Adaptor3d/Adaptor3d_GenHCurve.cdl
+++ b/src/Adaptor3d/Adaptor3d_GenHCurve.cdl
@@ -36,13 +36,13 @@ is
 
     Create
 	---Purpose: Creates an empty GenHCurve.
-    	returns mutable GenHCurve from Adaptor3d; 
+    	returns GenHCurve from Adaptor3d; 
     
 
     Create(C: TheCurve)
     
 	---Purpose: Creates a GenHCurve from a Curve
-    	returns mutable GenHCurve from Adaptor3d; 
+    	returns GenHCurve from Adaptor3d; 
 
 
     Set(me: mutable; C: TheCurve)
diff --git a/src/Adaptor3d/Adaptor3d_GenHSurface.cdl b/src/Adaptor3d/Adaptor3d_GenHSurface.cdl
index 40752d9623..b4f0f68294 100644
--- a/src/Adaptor3d/Adaptor3d_GenHSurface.cdl
+++ b/src/Adaptor3d/Adaptor3d_GenHSurface.cdl
@@ -39,13 +39,13 @@ is
     Create
     
 	---Purpose: Creates an empty GenHSurface.
-    	returns mutable GenHSurface from Adaptor3d; 
+    	returns GenHSurface from Adaptor3d; 
     
 
     Create(S: TheSurface)
     
 	---Purpose: Creates a GenHSurface from a Surface.
-    	returns mutable GenHSurface from Adaptor3d; 
+    	returns GenHSurface from Adaptor3d; 
 
 
     Set(me: mutable; S: TheSurface)
diff --git a/src/Adaptor3d/Adaptor3d_HVertex.cdl b/src/Adaptor3d/Adaptor3d_HVertex.cdl
index 01e3caf9d9..98058fe7f8 100644
--- a/src/Adaptor3d/Adaptor3d_HVertex.cdl
+++ b/src/Adaptor3d/Adaptor3d_HVertex.cdl
@@ -29,13 +29,13 @@ is
 
     Create
     
-    	returns mutable HVertex from Adaptor3d;
+    	returns HVertex from Adaptor3d;
 
 
     Create(P: Pnt2d from gp; Ori: Orientation from TopAbs;
            Resolution: Real from Standard)
 
-    	returns mutable HVertex from Adaptor3d;
+    	returns HVertex from Adaptor3d;
 
 
     Value(me: mutable)
@@ -64,7 +64,7 @@ is
     is virtual;
 
 
-    IsSame(me: mutable; Other: mutable like me)
+    IsSame(me: mutable; Other: like me)
     
     	returns Boolean from Standard
     is virtual;
diff --git a/src/Adaptor3d/Adaptor3d_TopolTool.cdl b/src/Adaptor3d/Adaptor3d_TopolTool.cdl
index 2b284bea0b..555711fc06 100644
--- a/src/Adaptor3d/Adaptor3d_TopolTool.cdl
+++ b/src/Adaptor3d/Adaptor3d_TopolTool.cdl
@@ -44,12 +44,12 @@ is
 
     Create
     
-    	returns mutable TopolTool from Adaptor3d;
+    	returns TopolTool from Adaptor3d;
 
 
     Create(Surface: HSurface from Adaptor3d)
     
-    	returns mutable TopolTool from Adaptor3d;
+    	returns TopolTool from Adaptor3d;
 
 
     Initialize(me: mutable)
@@ -79,7 +79,7 @@ is
 
     Value(me: mutable)
     
-    	returns mutable HCurve2d from Adaptor2d
+    	returns HCurve2d from Adaptor2d
         raises DomainError from Standard
     is virtual;
 	
@@ -103,7 +103,7 @@ is
 
     Vertex(me: mutable)
     
-    	returns mutable HVertex from Adaptor3d
+    	returns HVertex from Adaptor3d
 	raises DomainError from Standard
     is virtual;
 
diff --git a/src/AppStd/AppStd_Application.cdl b/src/AppStd/AppStd_Application.cdl
index 68242a9a2d..b89b8fc750 100644
--- a/src/AppStd/AppStd_Application.cdl
+++ b/src/AppStd/AppStd_Application.cdl
@@ -21,7 +21,7 @@ uses MessageDriver            from CDM,
 
 is
    
-    Create returns mutable Application from AppStd; 
+    Create returns Application from AppStd; 
 
     MessageDriver(me: mutable)
         returns MessageDriver from CDM
diff --git a/src/AppStdL/AppStdL_Application.cdl b/src/AppStdL/AppStdL_Application.cdl
index f871809eb6..d75149e2e5 100644
--- a/src/AppStdL/AppStdL_Application.cdl
+++ b/src/AppStdL/AppStdL_Application.cdl
@@ -21,7 +21,7 @@ uses MessageDriver            from CDM,
 
 is
    
-    Create returns mutable Application from AppStdL; 
+    Create returns Application from AppStdL; 
 
     MessageDriver(me: mutable)
         returns MessageDriver from CDM
diff --git a/src/Approx/Approx_CurvlinFunc.cdl b/src/Approx/Approx_CurvlinFunc.cdl
index 5e030346cf..d8dab594ed 100644
--- a/src/Approx/Approx_CurvlinFunc.cdl
+++ b/src/Approx/Approx_CurvlinFunc.cdl
@@ -41,13 +41,13 @@ raises
 
 is 
     Create(C:  HCurve from Adaptor3d; Tol: Real) 
-    returns  mutable  CurvlinFunc;
+    returns  CurvlinFunc;
     
     Create(C2D:  HCurve2d from Adaptor2d;  S:  HSurface from Adaptor3d; Tol: Real) 
-    returns  mutable  CurvlinFunc;
+    returns  CurvlinFunc;
      
     Create(C2D1,  C2D2:  HCurve2d from Adaptor2d;  S1,  S2:  HSurface from Adaptor3d; Tol: Real)
-    returns  mutable  CurvlinFunc; 
+    returns  CurvlinFunc; 
      
     SetTol(me:  mutable;  Tol: Real) 
     ---Purpose Update the tolerance to used            
diff --git a/src/Aspect/Aspect_CircularGrid.cdl b/src/Aspect/Aspect_CircularGrid.cdl
index 7bea786a8e..fd27cf405c 100644
--- a/src/Aspect/Aspect_CircularGrid.cdl
+++ b/src/Aspect/Aspect_CircularGrid.cdl
@@ -32,7 +32,7 @@ is
                XOrigin: Length from Quantity = 0;
 	       anYOrigin: Length from Quantity = 0;
                aRotationAngle: PlaneAngle from Quantity = 0)
-    returns mutable CircularGrid from Aspect;
+    returns CircularGrid from Aspect;
     ---Purpose: creates a new grid. By default this grid is not
     --          active.
     
diff --git a/src/Aspect/Aspect_ColorCubeColorMap.cdl b/src/Aspect/Aspect_ColorCubeColorMap.cdl
index 71de63e142..e33b92a61b 100644
--- a/src/Aspect/Aspect_ColorCubeColorMap.cdl
+++ b/src/Aspect/Aspect_ColorCubeColorMap.cdl
@@ -35,7 +35,7 @@ is
 	Create( base_pixel, redmax,   redmult,
 			    greenmax, greenmult,
 			    bluemax,  bluemult : in Integer from Standard )
-	returns mutable ColorCubeColorMap from Aspect
+	returns ColorCubeColorMap from Aspect
 	raises RangeError from Standard ;
 	---Level: Public
 	---Purpose : Create a ColorCube ColorMap.
diff --git a/src/Aspect/Aspect_ColorRampColorMap.cdl b/src/Aspect/Aspect_ColorRampColorMap.cdl
index 052d857919..2b8cf9c4dc 100644
--- a/src/Aspect/Aspect_ColorRampColorMap.cdl
+++ b/src/Aspect/Aspect_ColorRampColorMap.cdl
@@ -35,7 +35,7 @@ raises
 is
 	Create( basepixel,dimension  : in Integer from Standard ;
 		color  		     : in Color from Quantity )
-		returns mutable ColorRampColorMap from Aspect
+		returns ColorRampColorMap from Aspect
 		raises RangeError from Standard ;
 	---Level: Public
 	---Purpose : Create a Color Ramp Colormap starting from Black at
@@ -43,7 +43,7 @@ is
 
 	Create( basepixel,dimension  : in Integer     from Standard ;
 		colorName  	     : in NameOfColor from Quantity )
-		returns mutable ColorRampColorMap from Aspect
+		returns ColorRampColorMap from Aspect
 		raises RangeError from Standard ;
 	---Level: Public
 	---Purpose : Create a Color Ramp Colormap starting from Black at
diff --git a/src/Aspect/Aspect_Driver.cdl b/src/Aspect/Aspect_Driver.cdl
index 58eacb3644..4a2805c1f3 100644
--- a/src/Aspect/Aspect_Driver.cdl
+++ b/src/Aspect/Aspect_Driver.cdl
@@ -359,19 +359,19 @@ is
         -- Category: Inquire methods
         ----------------------------
 
-	ColorMap(me) returns mutable ColorMap from Aspect 
+	ColorMap(me) returns ColorMap from Aspect 
         raises UndefinedMap from Aspect is static;
 
-	TypeMap(me) returns  mutable TypeMap from Aspect 
+	TypeMap(me) returns TypeMap from Aspect 
         raises UndefinedMap from Aspect is static;
 
-	WidthMap(me) returns mutable WidthMap from Aspect 
+	WidthMap(me) returns WidthMap from Aspect 
         raises UndefinedMap from Aspect is static;
 
-	FontMap(me) returns  mutable FontMap from Aspect
+	FontMap(me) returns FontMap from Aspect
         raises UndefinedMap from Aspect is static;
 
-	MarkMap(me) returns  mutable MarkMap from Aspect
+	MarkMap(me) returns MarkMap from Aspect
         raises UndefinedMap from Aspect is static;
 
         WorkSpace ( me ; Width,Heigth : out Length from Quantity ) 
diff --git a/src/Aspect/Aspect_FontMap.cdl b/src/Aspect/Aspect_FontMap.cdl
index 965c380d6b..0ddc90602d 100644
--- a/src/Aspect/Aspect_FontMap.cdl
+++ b/src/Aspect/Aspect_FontMap.cdl
@@ -32,7 +32,7 @@ raises
 
 is
 
-	Create returns mutable FontMap from Aspect;
+	Create returns FontMap from Aspect;
 
         AddEntry (me : mutable; AnEntry : FontMapEntry from Aspect)
 	---Level: Public
diff --git a/src/Aspect/Aspect_GenericColorMap.cdl b/src/Aspect/Aspect_GenericColorMap.cdl
index b9537d5459..5e21aa8039 100644
--- a/src/Aspect/Aspect_GenericColorMap.cdl
+++ b/src/Aspect/Aspect_GenericColorMap.cdl
@@ -37,7 +37,7 @@ raises
 is
 
 	Create
-		returns mutable GenericColorMap from Aspect;
+		returns GenericColorMap from Aspect;
 	---Level: Public
 	---Purpose: Creates a generic ColorMap .
 
diff --git a/src/Aspect/Aspect_MarkMap.cdl b/src/Aspect/Aspect_MarkMap.cdl
index b04c8d59cc..bcfc12da64 100644
--- a/src/Aspect/Aspect_MarkMap.cdl
+++ b/src/Aspect/Aspect_MarkMap.cdl
@@ -31,7 +31,7 @@ raises
 	BadAccess 	from Aspect
 
 is
-	Create returns mutable MarkMap from Aspect;
+	Create returns MarkMap from Aspect;
 
         AddEntry (me : mutable; AnEntry : MarkMapEntry from Aspect)
 	---Level: Public
diff --git a/src/Aspect/Aspect_RectangularGrid.cdl b/src/Aspect/Aspect_RectangularGrid.cdl
index f838d39a1b..0cf5541112 100644
--- a/src/Aspect/Aspect_RectangularGrid.cdl
+++ b/src/Aspect/Aspect_RectangularGrid.cdl
@@ -31,7 +31,7 @@ is
                aFirstAngle: PlaneAngle from Quantity = 0;
                aSecondAngle: PlaneAngle from Quantity = 0;
                aRotationAngle: PlaneAngle from Quantity = 0)
-    returns mutable RectangularGrid from Aspect
+    returns RectangularGrid from Aspect
     ---Purpose: creates a new grid. By default this grid is not
     --          active.
     --          The first angle is given relatively to the horizontal.
diff --git a/src/Aspect/Aspect_TypeMap.cdl b/src/Aspect/Aspect_TypeMap.cdl
index 6f9557310d..f60532e141 100644
--- a/src/Aspect/Aspect_TypeMap.cdl
+++ b/src/Aspect/Aspect_TypeMap.cdl
@@ -31,7 +31,7 @@ raises
 	BadAccess 	from Aspect
 
 is
-	Create returns mutable TypeMap from Aspect;
+	Create returns TypeMap from Aspect;
 
         AddEntry (me : mutable; AnEntry : TypeMapEntry from Aspect)
 	---Level: Public
diff --git a/src/Aspect/Aspect_WidthMap.cdl b/src/Aspect/Aspect_WidthMap.cdl
index 27241b2b87..e0788d4b22 100644
--- a/src/Aspect/Aspect_WidthMap.cdl
+++ b/src/Aspect/Aspect_WidthMap.cdl
@@ -34,7 +34,7 @@ raises
 
 is
 	Create
-	returns mutable WidthMap from Aspect;
+	returns WidthMap from Aspect;
 	---Level: Public
         ---Purpose: Creates a width map.
 
diff --git a/src/BOPDS/BOPDS_PaveBlock.cdl b/src/BOPDS/BOPDS_PaveBlock.cdl
index 1682498616..b018bc5724 100644
--- a/src/BOPDS/BOPDS_PaveBlock.cdl
+++ b/src/BOPDS/BOPDS_PaveBlock.cdl
@@ -32,12 +32,12 @@ uses
 
 is 
     Create 
-    returns mutable PaveBlock from BOPDS; 
+    returns PaveBlock from BOPDS; 
     ---Purpose:  
     --- Empty contructor  
     --- 
     Create (theAllocator: BaseAllocator from BOPCol) 
-    returns mutable PaveBlock from BOPDS; 
+    returns PaveBlock from BOPDS; 
     ---Purpose:  
     ---  Contructor    
     ---  <theAllocator> - the allocator to manage the memory     
diff --git a/src/BOPInt/BOPInt_Context.cdl b/src/BOPInt/BOPInt_Context.cdl
index b6ba30d761..a26e7bffc9 100644
--- a/src/BOPInt/BOPInt_Context.cdl
+++ b/src/BOPInt/BOPInt_Context.cdl
@@ -48,7 +48,7 @@ uses
 
 is 
     Create   
-    returns mutable Context from BOPInt;
+    returns Context from BOPInt;
     ---C++: alias "Standard_EXPORT virtual  ~BOPInt_Context();"   
       
     Create (theAllocator: BaseAllocator from BOPCol) 
diff --git a/src/BOPTest/BOPTest_DrawableShape.cdl b/src/BOPTest/BOPTest_DrawableShape.cdl
index 53407d74fc..0d78dd903f 100644
--- a/src/BOPTest/BOPTest_DrawableShape.cdl
+++ b/src/BOPTest/BOPTest_DrawableShape.cdl
@@ -40,13 +40,13 @@ is
     	    Text      : CString from Standard; 
     	    TextColor : Color from Draw
     	    )
-    	returns mutable DrawableShape from BOPTest;
+    	returns DrawableShape from BOPTest;
 
     Create (S         : Shape from TopoDS;
     	    Text      : CString from Standard; 
     	    TextColor : Color from Draw
     	    )
-    	returns mutable DrawableShape from BOPTest; 
+    	returns DrawableShape from BOPTest; 
 	
     Pnt(me) returns Pnt from gp  is private;
   
diff --git a/src/BRep/BRep_Curve3D.cdl b/src/BRep/BRep_Curve3D.cdl
index a4443e8486..f3214b66d4 100644
--- a/src/BRep/BRep_Curve3D.cdl
+++ b/src/BRep/BRep_Curve3D.cdl
@@ -28,7 +28,7 @@ is
 
     Create(C : Curve    from Geom;
     	   L : Location from TopLoc) 
-    returns mutable Curve3D from BRep;
+    returns Curve3D from BRep;
 
     D0(me; U : Real; P : out Pnt from gp);
 	---Purpose: Computes the point at parameter U.
@@ -44,7 +44,7 @@ is
     Curve3D(me : mutable; C : Curve from Geom)
     is redefined;
 	
-    Copy(me) returns mutable CurveRepresentation from BRep;
+    Copy(me) returns CurveRepresentation from BRep;
 	---Purpose: Return a copy of this representation.
 
 fields
diff --git a/src/BRep/BRep_CurveOn2Surfaces.cdl b/src/BRep/BRep_CurveOn2Surfaces.cdl
index 8cc026618d..896490d78b 100644
--- a/src/BRep/BRep_CurveOn2Surfaces.cdl
+++ b/src/BRep/BRep_CurveOn2Surfaces.cdl
@@ -33,7 +33,7 @@ is
     Create(S1 , S2  : Surface  from Geom;
 	   L1 , L2  : Location from TopLoc;
 	   C        : Shape    from GeomAbs)
-    returns mutable CurveOn2Surfaces from BRep;
+    returns CurveOn2Surfaces from BRep;
 
     IsRegularity(me) returns Boolean
 	---Purpose: Returns True.
@@ -67,7 +67,7 @@ is
     Continuity(me : mutable; C : Shape from GeomAbs)
     is redefined;
     
-    Copy(me) returns mutable CurveRepresentation from BRep;
+    Copy(me) returns CurveRepresentation from BRep;
 	---Purpose: Return a copy of this representation.
 
 fields
diff --git a/src/BRep/BRep_CurveOnClosedSurface.cdl b/src/BRep/BRep_CurveOnClosedSurface.cdl
index e72aba3089..078d1f7ba4 100644
--- a/src/BRep/BRep_CurveOnClosedSurface.cdl
+++ b/src/BRep/BRep_CurveOnClosedSurface.cdl
@@ -34,7 +34,7 @@ is
     	   S        : Surface  from Geom;
 	   L        : Location from TopLoc;
 	   C        : Shape    from GeomAbs)
-    returns mutable CurveOnClosedSurface from BRep;
+    returns CurveOnClosedSurface from BRep;
 
     SetUVPoints2(me : mutable; P1, P2 : Pnt2d from gp)
 	---C++: inline
@@ -84,7 +84,7 @@ is
     PCurve2(me : mutable; C : Curve from Geom2d)
     is redefined;
 
-    Copy(me) returns mutable CurveRepresentation from BRep
+    Copy(me) returns CurveRepresentation from BRep
 	---Purpose: Return a copy of this representation.
     is redefined;
 
diff --git a/src/BRep/BRep_CurveOnSurface.cdl b/src/BRep/BRep_CurveOnSurface.cdl
index 7e8de427ca..661e7dd91a 100644
--- a/src/BRep/BRep_CurveOnSurface.cdl
+++ b/src/BRep/BRep_CurveOnSurface.cdl
@@ -33,7 +33,7 @@ is
     Create(PC : Curve    from Geom2d; 
     	   S  : Surface  from Geom; 
     	   L  : Location from  TopLoc)
-    returns mutable CurveOnSurface from BRep;
+    returns CurveOnSurface from BRep;
 
     SetUVPoints(me : mutable; P1, P2 : Pnt2d from gp)
 	---C++: inline
@@ -66,7 +66,7 @@ is
     PCurve(me : mutable; C : Curve from Geom2d)
     is redefined;
 
-    Copy(me) returns mutable CurveRepresentation from BRep is virtual;
+    Copy(me) returns CurveRepresentation from BRep is virtual;
 	---Purpose: Return a copy of this representation.
 
     Update(me : mutable)
diff --git a/src/BRep/BRep_CurveRepresentation.cdl b/src/BRep/BRep_CurveRepresentation.cdl
index f3ca97cfe6..9b0e49a66e 100644
--- a/src/BRep/BRep_CurveRepresentation.cdl
+++ b/src/BRep/BRep_CurveRepresentation.cdl
@@ -284,7 +284,7 @@ is
     is virtual;
 
 
-    Copy(me) returns mutable CurveRepresentation from BRep
+    Copy(me) returns CurveRepresentation from BRep
 	---Purpose: Return a copy of this representation.
     is deferred;
     
diff --git a/src/BRep/BRep_PointOnCurve.cdl b/src/BRep/BRep_PointOnCurve.cdl
index 6ad1356383..6300c9758a 100644
--- a/src/BRep/BRep_PointOnCurve.cdl
+++ b/src/BRep/BRep_PointOnCurve.cdl
@@ -27,7 +27,7 @@ is
     Create(P : Real;
     	   C : Curve    from Geom;
 	   L : Location from TopLoc)
-    returns mutable PointOnCurve from BRep;
+    returns PointOnCurve from BRep;
     
     
     IsPointOnCurve(me)          returns Boolean
diff --git a/src/BRep/BRep_PointOnCurveOnSurface.cdl b/src/BRep/BRep_PointOnCurveOnSurface.cdl
index 282c2ae15a..9ca2bbb35f 100644
--- a/src/BRep/BRep_PointOnCurveOnSurface.cdl
+++ b/src/BRep/BRep_PointOnCurveOnSurface.cdl
@@ -28,7 +28,7 @@ is
     	   C : Curve from Geom2d;
 	   S : Surface from Geom;
 	   L : Location from TopLoc)
-    returns mutable PointOnCurveOnSurface from BRep;
+    returns PointOnCurveOnSurface from BRep;
     
     IsPointOnCurveOnSurface(me) returns Boolean
 	---Purpose: Returns True
diff --git a/src/BRep/BRep_PointOnSurface.cdl b/src/BRep/BRep_PointOnSurface.cdl
index cf38f1bc3d..52febea9b2 100644
--- a/src/BRep/BRep_PointOnSurface.cdl
+++ b/src/BRep/BRep_PointOnSurface.cdl
@@ -24,7 +24,7 @@ is
     Create(P1,P2 : Real;
     	   S : Surface from Geom;
 	   L : Location from TopLoc)
-    returns mutable PointOnSurface from BRep;
+    returns PointOnSurface from BRep;
     
     
     IsPointOnSurface(me)        returns Boolean
diff --git a/src/BRep/BRep_Polygon3D.cdl b/src/BRep/BRep_Polygon3D.cdl
index 47cbddf673..db48670721 100644
--- a/src/BRep/BRep_Polygon3D.cdl
+++ b/src/BRep/BRep_Polygon3D.cdl
@@ -31,7 +31,7 @@ is
     	   L: Location  from TopLoc) 
     	---Purpose:
 
-    returns mutable Polygon3D from BRep;
+    returns Polygon3D from BRep;
     
     
     IsPolygon3D(me) returns Boolean
@@ -47,7 +47,7 @@ is
     	DomainError from Standard
     is redefined;
 
-    Copy(me) returns mutable CurveRepresentation from BRep;
+    Copy(me) returns CurveRepresentation from BRep;
 	---Purpose: Return a copy of this representation.
 
 
diff --git a/src/BRep/BRep_PolygonOnClosedSurface.cdl b/src/BRep/BRep_PolygonOnClosedSurface.cdl
index c2792028f3..8e0dc5c3f0 100644
--- a/src/BRep/BRep_PolygonOnClosedSurface.cdl
+++ b/src/BRep/BRep_PolygonOnClosedSurface.cdl
@@ -33,7 +33,7 @@ is
     	   P2: Polygon2D from Poly;
     	   S:  Surface   from Geom;
 	   L:  Location  from TopLoc)
-    returns mutable PolygonOnClosedSurface from BRep;
+    returns PolygonOnClosedSurface from BRep;
     
     
     IsPolygonOnClosedSurface(me) returns Boolean
@@ -48,7 +48,7 @@ is
     is redefined;
     
     
-    Copy(me) returns mutable CurveRepresentation from BRep
+    Copy(me) returns CurveRepresentation from BRep
 	---Purpose: Return a copy of this representation.
     is redefined;
     
diff --git a/src/BRep/BRep_PolygonOnClosedTriangulation.cdl b/src/BRep/BRep_PolygonOnClosedTriangulation.cdl
index d914b2cce9..c4960db0a9 100644
--- a/src/BRep/BRep_PolygonOnClosedTriangulation.cdl
+++ b/src/BRep/BRep_PolygonOnClosedTriangulation.cdl
@@ -36,7 +36,7 @@ is
     Create(P1, P2 : PolygonOnTriangulation from Poly;
     	   Tr: Triangulation          from Poly;
 	   L : Location               from TopLoc)
-    returns mutable PolygonOnClosedTriangulation from BRep;
+    returns PolygonOnClosedTriangulation from BRep;
 
 
     IsPolygonOnClosedTriangulation(me)    returns Boolean
@@ -53,7 +53,7 @@ is
     is redefined;
 
 
-    Copy(me) returns mutable CurveRepresentation from BRep is redefined;
+    Copy(me) returns CurveRepresentation from BRep is redefined;
 	---Purpose: Return a copy of this representation.
 
 
diff --git a/src/BRep/BRep_PolygonOnSurface.cdl b/src/BRep/BRep_PolygonOnSurface.cdl
index fbed23756d..4c178a032c 100644
--- a/src/BRep/BRep_PolygonOnSurface.cdl
+++ b/src/BRep/BRep_PolygonOnSurface.cdl
@@ -35,7 +35,7 @@ is
     Create(P: Polygon2D from Poly;
     	   S: Surface   from Geom;
 	   L: Location  from TopLoc)
-    returns mutable PolygonOnSurface from BRep;
+    returns PolygonOnSurface from BRep;
 
 
     IsPolygonOnSurface(me)          returns Boolean
@@ -64,7 +64,7 @@ is
     is redefined;
 
 
-    Copy(me) returns mutable CurveRepresentation from BRep
+    Copy(me) returns CurveRepresentation from BRep
 	---Purpose: Return a copy of this representation.
     is redefined;
 
diff --git a/src/BRep/BRep_PolygonOnTriangulation.cdl b/src/BRep/BRep_PolygonOnTriangulation.cdl
index 9b90f93786..a4551e259f 100644
--- a/src/BRep/BRep_PolygonOnTriangulation.cdl
+++ b/src/BRep/BRep_PolygonOnTriangulation.cdl
@@ -31,7 +31,7 @@ is
     Create(P: PolygonOnTriangulation from Poly;
     	   T: Triangulation          from Poly;
 	   L: Location               from TopLoc)
-    returns mutable PolygonOnTriangulation from BRep;
+    returns PolygonOnTriangulation from BRep;
 
 
     IsPolygonOnTriangulation(me) returns Boolean
@@ -57,7 +57,7 @@ is
     is redefined;
 
     
-    Copy(me) returns mutable CurveRepresentation from BRep is virtual;
+    Copy(me) returns CurveRepresentation from BRep is virtual;
 	---Purpose: Return a copy of this representation.
 
 
diff --git a/src/BRep/BRep_TEdge.cdl b/src/BRep/BRep_TEdge.cdl
index 72c9119daf..df505dc635 100644
--- a/src/BRep/BRep_TEdge.cdl
+++ b/src/BRep/BRep_TEdge.cdl
@@ -36,7 +36,7 @@ uses
     ListOfCurveRepresentation from BRep
 
 is
-    Create returns mutable TEdge from BRep;
+    Create returns TEdge from BRep;
 	---Purpose: Creates an empty TEdge.
 	
     Tolerance(me) returns Real
@@ -82,7 +82,7 @@ is
 	---C++: inline
     is static;
     
-    EmptyCopy(me) returns mutable TShape from TopoDS;
+    EmptyCopy(me) returns TShape from TopoDS;
 	---Purpose: Returns a copy  of the  TShape  with no sub-shapes.
     
 fields
diff --git a/src/BRep/BRep_TFace.cdl b/src/BRep/BRep_TFace.cdl
index b292fb0c7a..d563f7cd86 100644
--- a/src/BRep/BRep_TFace.cdl
+++ b/src/BRep/BRep_TFace.cdl
@@ -47,7 +47,7 @@ uses
     
 is
 
-    Create returns mutable TFace from BRep;
+    Create returns TFace from BRep;
 	---Purpose: Creates an empty TFace.
 	
     Surface(me) returns any Surface from Geom;
@@ -83,7 +83,7 @@ is
     NaturalRestriction(me : mutable; N : Boolean);
 	---C++: inline
     
-    EmptyCopy(me) returns mutable TShape from TopoDS
+    EmptyCopy(me) returns TShape from TopoDS
 	---Purpose: Returns a copy  of the  TShape  with no sub-shapes.
 	--          The new Face has no triangulation.
     is redefined;
diff --git a/src/BRep/BRep_TVertex.cdl b/src/BRep/BRep_TVertex.cdl
index 7878456537..0c09d77746 100644
--- a/src/BRep/BRep_TVertex.cdl
+++ b/src/BRep/BRep_TVertex.cdl
@@ -27,7 +27,7 @@ uses
     ListOfPointRepresentation from BRep
 
 is
-    Create returns mutable TVertex from BRep;
+    Create returns TVertex from BRep;
 
     Tolerance(me) returns Real
 	---C++: inline
@@ -63,7 +63,7 @@ is
 	---C++: return &
     is static;
     
-    EmptyCopy(me) returns mutable TShape from TopoDS;
+    EmptyCopy(me) returns TShape from TopoDS;
 	---Purpose: Returns a copy  of the  TShape  with no sub-shapes.
     
 fields
diff --git a/src/BRepAlgo/BRepAlgo_AsDes.cdl b/src/BRepAlgo/BRepAlgo_AsDes.cdl
index bd309be374..8c30a2f131 100644
--- a/src/BRepAlgo/BRepAlgo_AsDes.cdl
+++ b/src/BRepAlgo/BRepAlgo_AsDes.cdl
@@ -27,7 +27,7 @@ raises
     ConstructionError from Standard 
 
 is
-    Create returns mutable AsDes from BRepAlgo;
+    Create returns AsDes from BRepAlgo;
 	---Purpose: Creates an empty AsDes.
     
     Clear(me : mutable);
diff --git a/src/BRepApprox/BRepApprox_ApproxLine.cdl b/src/BRepApprox/BRepApprox_ApproxLine.cdl
index 2d64b331ab..7b24589fd4 100644
--- a/src/BRepApprox/BRepApprox_ApproxLine.cdl
+++ b/src/BRepApprox/BRepApprox_ApproxLine.cdl
@@ -28,10 +28,10 @@ is
     Create(CurveXYZ: BSplineCurve from Geom;
       	   CurveUV1: BSplineCurve from Geom2d;
     	   CurveUV2: BSplineCurve from Geom2d)
-    returns mutable ApproxLine from BRepApprox;
+    returns ApproxLine from BRepApprox;
 
     Create(lin: LineOn2S from IntSurf; Tang: Boolean from Standard)
-    returns mutable ApproxLine from BRepApprox;
+    returns ApproxLine from BRepApprox;
 	 
     NbPnts(me) 
     returns Integer from Standard
diff --git a/src/BRepBlend/BRepBlend_Line.cdl b/src/BRepBlend/BRepBlend_Line.cdl
index 739c20b931..269d3b006d 100644
--- a/src/BRepBlend/BRepBlend_Line.cdl
+++ b/src/BRepBlend/BRepBlend_Line.cdl
@@ -31,7 +31,7 @@ is
 
     Create
     
-    	returns mutable Line from BRepBlend;
+    	returns Line from BRepBlend;
 
 
 
diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_FindPlane.cdl b/src/BRepBuilderAPI/BRepBuilderAPI_FindPlane.cdl
index 54ca4419c5..e85a06c744 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_FindPlane.cdl
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_FindPlane.cdl
@@ -67,7 +67,7 @@ is
     	---Purpose: Returns true if a plane containing the edges of the
     	-- shape is found and built. Use the function Plane to consult the result.   
     Plane(me)
-    returns mutable Plane from Geom;
+    returns Plane from Geom;
     	---Purpose: Returns the plane containing the edges of the shape.
     	-- Warning
     	-- Use the function Found to verify that the plane is built. If
diff --git a/src/BRepCheck/BRepCheck_Edge.cdl b/src/BRepCheck/BRepCheck_Edge.cdl
index 825df9a3b8..96d83cf803 100644
--- a/src/BRepCheck/BRepCheck_Edge.cdl
+++ b/src/BRepCheck/BRepCheck_Edge.cdl
@@ -27,7 +27,7 @@ is
 
     Create(E: Edge from TopoDS)
     
-    	returns mutable Edge from BRepCheck;
+    	returns Edge from BRepCheck;
 
 
     InContext(me: mutable; ContextShape: Shape from TopoDS);
diff --git a/src/BRepCheck/BRepCheck_Face.cdl b/src/BRepCheck/BRepCheck_Face.cdl
index 5e40a93f53..e5f50ac7f5 100644
--- a/src/BRepCheck/BRepCheck_Face.cdl
+++ b/src/BRepCheck/BRepCheck_Face.cdl
@@ -27,7 +27,7 @@ is
 
     Create(F: Face from TopoDS)
     
-    	returns mutable Face from BRepCheck;
+    	returns Face from BRepCheck;
 
 
     InContext(me: mutable; ContextShape: Shape from TopoDS);
diff --git a/src/BRepCheck/BRepCheck_Shell.cdl b/src/BRepCheck/BRepCheck_Shell.cdl
index fffbf2ea3a..3dffef6f4b 100644
--- a/src/BRepCheck/BRepCheck_Shell.cdl
+++ b/src/BRepCheck/BRepCheck_Shell.cdl
@@ -28,7 +28,7 @@ is
 
     Create(S: Shell from TopoDS)
     
-    	returns mutable Shell from BRepCheck;
+    	returns Shell from BRepCheck;
 
 
     InContext(me: mutable; ContextShape: Shape from TopoDS);
diff --git a/src/BRepCheck/BRepCheck_Vertex.cdl b/src/BRepCheck/BRepCheck_Vertex.cdl
index 92bb2bb5b1..b98b570209 100644
--- a/src/BRepCheck/BRepCheck_Vertex.cdl
+++ b/src/BRepCheck/BRepCheck_Vertex.cdl
@@ -25,7 +25,7 @@ is
 
     Create(V: Vertex from TopoDS)
     
-    	returns mutable Vertex from BRepCheck;
+    	returns Vertex from BRepCheck;
 
 
     InContext(me: mutable; ContextShape: Shape from TopoDS);
diff --git a/src/BRepCheck/BRepCheck_Wire.cdl b/src/BRepCheck/BRepCheck_Wire.cdl
index 214ae3d352..4a1d3cbf09 100644
--- a/src/BRepCheck/BRepCheck_Wire.cdl
+++ b/src/BRepCheck/BRepCheck_Wire.cdl
@@ -33,7 +33,7 @@ is
 
     Create(W: Wire from TopoDS)
 
-        returns mutable Wire from BRepCheck;
+        returns Wire from BRepCheck;
 
 
     InContext(me: mutable; ContextShape: Shape from TopoDS);
diff --git a/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.cdl b/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.cdl
index 03b8b1b46d..7a6248f0bb 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.cdl
+++ b/src/BRepFilletAPI/BRepFilletAPI_LocalOperation.cdl
@@ -137,7 +137,7 @@ is
     is deferred;
 	 
     Sect(me; IC, IS : Integer from Standard)
-    returns mutable SecHArray1 from ChFiDS
+    returns SecHArray1 from ChFiDS
     is deferred;
 
 end LocalOperation;
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cdl b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cdl
index 9decc9938f..dc57b7a3f6 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cdl
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeChamfer.cdl
@@ -384,7 +384,7 @@ is
     returns Integer from Standard;
 	 
     Sect(me; IC, IS : Integer from Standard)
-    returns mutable SecHArray1 from ChFiDS;
+    returns SecHArray1 from ChFiDS;
     
 fields
 
diff --git a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cdl b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cdl
index 4d0f9e18e2..d2a48ccc4f 100644
--- a/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cdl
+++ b/src/BRepFilletAPI/BRepFilletAPI_MakeFillet.cdl
@@ -262,7 +262,7 @@ is
     GetLaw(me     : in out; 
     	   IC     : Integer from Standard;
     	   E      : Edge from TopoDS)
-    returns mutable Function from Law; 
+    returns Function from Law; 
 
     SetLaw(me     : in out; 
     	   IC     : Integer from Standard;
@@ -472,7 +472,7 @@ is
     returns Integer from Standard;
 	 
     Sect(me; IC, IS : Integer from Standard)
-    returns mutable SecHArray1 from ChFiDS;
+    returns SecHArray1 from ChFiDS;
 
 
     -------------------------------------
diff --git a/src/BRepLib/BRepLib_FindSurface.cdl b/src/BRepLib/BRepLib_FindSurface.cdl
index e08446bd7a..06c08c324c 100644
--- a/src/BRepLib/BRepLib_FindSurface.cdl
+++ b/src/BRepLib/BRepLib_FindSurface.cdl
@@ -83,7 +83,7 @@ is
     Found(me) returns Boolean
     is static;
     
-    Surface(me) returns mutable Surface from Geom
+    Surface(me) returns Surface from Geom
     is static;
     
     Tolerance(me) returns Real
diff --git a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cdl b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cdl
index 45c19a454c..75edd90e2f 100644
--- a/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cdl
+++ b/src/BRepMesh/BRepMesh_DataStructureOfDelaun.cdl
@@ -42,7 +42,7 @@ class DataStructureOfDelaun from BRepMesh inherits TShared from MMgt
                 --          presumed  number of nodes  in this mesh.   The
                 --          Mesh   data  structure will   be automatically
                 --          redimensioned if necessary.
-                returns mutable DataStructureOfDelaun from BRepMesh ;
+                returns DataStructureOfDelaun from BRepMesh ;
 
               AddNode    (me      : mutable ;
                           theNode : Vertex from BRepMesh) 
diff --git a/src/BRepMesh/BRepMesh_FaceAttribute.cdl b/src/BRepMesh/BRepMesh_FaceAttribute.cdl
index 1abedbd399..c8775887c5 100644
--- a/src/BRepMesh/BRepMesh_FaceAttribute.cdl
+++ b/src/BRepMesh/BRepMesh_FaceAttribute.cdl
@@ -24,7 +24,7 @@ uses
 
 is 
 
-    Create returns mutable FaceAttribute from BRepMesh;
+    Create returns FaceAttribute from BRepMesh;
 
     GetDefFace(me:mutable) returns Real;
        ---C++: return &
diff --git a/src/BRepMesh/BRepMesh_FastDiscret.cdl b/src/BRepMesh/BRepMesh_FastDiscret.cdl
index 8506fd98d0..e7a12b0f15 100644
--- a/src/BRepMesh/BRepMesh_FastDiscret.cdl
+++ b/src/BRepMesh/BRepMesh_FastDiscret.cdl
@@ -74,7 +74,7 @@ is
                 inshape   : Boolean from Standard=Standard_False;
                 relative  : Boolean from Standard=Standard_False;
                 shapetrigu: Boolean from Standard=Standard_False)
-          returns mutable FastDiscret from BRepMesh;
+          returns FastDiscret from BRepMesh;
 
 
         Create (defle     : Real    from Standard;
@@ -97,7 +97,7 @@ is
            --          
            --          if   <inshape>   is   True, the      calculated
            --          triangulation will be stored in the shape.
-            returns mutable FastDiscret from BRepMesh;
+            returns FastDiscret from BRepMesh;
 
 
         Perform (me: mutable; shape: Shape from TopoDS) is static;
diff --git a/src/BRepMesh/BRepMesh_FastDiscretFace.cdl b/src/BRepMesh/BRepMesh_FastDiscretFace.cdl
index 215490a06c..0196d509cc 100644
--- a/src/BRepMesh/BRepMesh_FastDiscretFace.cdl
+++ b/src/BRepMesh/BRepMesh_FastDiscretFace.cdl
@@ -54,7 +54,7 @@ is
 
         Create (theAngle      : Real    from Standard;
                 theWithShare  : Boolean from Standard=Standard_True)
-          returns mutable FastDiscretFace from BRepMesh;
+          returns FastDiscretFace from BRepMesh;
 
 
 
diff --git a/src/BRepOffset/BRepOffset_Inter2d.cdl b/src/BRepOffset/BRepOffset_Inter2d.cdl
index 69066324fa..d3929ae1e2 100644
--- a/src/BRepOffset/BRepOffset_Inter2d.cdl
+++ b/src/BRepOffset/BRepOffset_Inter2d.cdl
@@ -30,7 +30,7 @@ uses
     Real                from Standard
 
 is
-    Compute(myclass ; AsDes    : mutable AsDes      from BRepAlgo;
+    Compute(myclass ; AsDes    : AsDes      from BRepAlgo;
     	    	      F        :         Face       from TopoDS;
        	    	      NewEdges :         IndexedMapOfShape from TopTools;
 		      Tol      :         Real       from Standard);
@@ -47,7 +47,7 @@ is
     	    	   OFI   : in out   Offset              from BRepOffset;
 		   MES   : in out   DataMapOfShapeShape from TopTools;  
 		   Build :          DataMapOfShapeShape from TopTools;  
-		   AsDes : mutable  AsDes               from BRepAlgo; 
+		   AsDes :  AsDes               from BRepAlgo; 
     	    	   Offset:          Real                from Standard;
     	    	   Tol   :          Real                from Standard);
     --  Modified by skv - Fri Dec 26 16:53:16 2003 OCC4455 End
diff --git a/src/BRepOffset/BRepOffset_Inter3d.cdl b/src/BRepOffset/BRepOffset_Inter3d.cdl
index 171b804093..44469a9a50 100644
--- a/src/BRepOffset/BRepOffset_Inter3d.cdl
+++ b/src/BRepOffset/BRepOffset_Inter3d.cdl
@@ -35,7 +35,7 @@ uses
     State                     from TopAbs	
 
 is
-    Create(AsDes : mutable AsDes from BRepAlgo;
+    Create(AsDes : AsDes from BRepAlgo;
            Side  : State         from TopAbs;
     	   Tol   : Real          from Standard);
     
diff --git a/src/BRepToIGES/BRepToIGES_BRShell.cdl b/src/BRepToIGES/BRepToIGES_BRShell.cdl
index 6b2f5eddc3..38cb5cbd00 100644
--- a/src/BRepToIGES/BRepToIGES_BRShell.cdl
+++ b/src/BRepToIGES/BRepToIGES_BRShell.cdl
@@ -42,7 +42,7 @@ is
 
     TransferShell (me    : in out;
                    start : Shape from TopoDS)
-    	returns mutable IGESEntity from IGESData;
+    	returns IGESEntity from IGESData;
     ---Purpose :  Transfert an Shape entity from TopoDS to IGES
     --            This entity must be a Face or a Shell.
     --            If this Entity could not be converted, this member returns a NullEntity.
@@ -50,14 +50,14 @@ is
 
     TransferShell (me    : in out;
                    start : Shell from TopoDS)
-    	returns mutable IGESEntity from IGESData;
+    	returns IGESEntity from IGESData;
     ---Purpose :  Transfert an Shell entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
 
     TransferFace (me    : in out;
                   start : Face from TopoDS)
-    	returns mutable IGESEntity from IGESData;
+    	returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Face entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
diff --git a/src/BRepToIGES/BRepToIGES_BRSolid.cdl b/src/BRepToIGES/BRepToIGES_BRSolid.cdl
index 79a1a359b9..577b176ea4 100644
--- a/src/BRepToIGES/BRepToIGES_BRSolid.cdl
+++ b/src/BRepToIGES/BRepToIGES_BRSolid.cdl
@@ -43,7 +43,7 @@ is
 
     TransferSolid (me    : in out;
                    start : Shape from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Shape entity from TopoDS to IGES 
     --            this entity must be a Solid or a CompSolid or a Compound. 
     --            If this Entity could not be converted, this member returns a NullEntity.
@@ -51,21 +51,21 @@ is
 
     TransferSolid (me    : in out;
                    start : Solid from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Solid entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
 
     TransferCompSolid (me    : in out;
                        start : CompSolid from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert an CompSolid entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
 
     TransferCompound (me    : in out;
                       start : Compound from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Compound entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
diff --git a/src/BRepToIGES/BRepToIGES_BRWire.cdl b/src/BRepToIGES/BRepToIGES_BRWire.cdl
index 028afa8585..60648f5265 100644
--- a/src/BRepToIGES/BRepToIGES_BRWire.cdl
+++ b/src/BRepToIGES/BRepToIGES_BRWire.cdl
@@ -49,7 +49,7 @@ is
 
     TransferWire   (me        : in out;
                     start     :        Shape from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Shape entity from TopoDS to IGES
     --            this entity must be a Vertex or an Edge or a Wire.
     --            If this Entity could not be converted, 
@@ -58,7 +58,7 @@ is
 
     TransferVertex (me        : in out;
                     myvertex  :        Vertex from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Vertex entity from TopoDS to IGES
     --            If this Entity could not be converted, 
     --            this member returns a NullEntity.
@@ -68,7 +68,7 @@ is
                     myvertex  :        Vertex from TopoDS;		    
     	    	    myedge    :        Edge   from TopoDS;
                     parameter : out    Real   from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Vertex entity on an Edge from TopoDS to IGES
     --            Returns the parameter of myvertex on myedge.
     --            If this Entity could not be converted, 
@@ -80,7 +80,7 @@ is
     	    	    myedge    :        Edge   from TopoDS;
                     myface    :        Face   from TopoDS;
                     parameter : out    Real   from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Vertex entity of an edge on a Face 
     --            from TopoDS to IGES
     --            Returns the parameter of myvertex on the pcurve 
@@ -95,7 +95,7 @@ is
                     mysurface :        Surface  from Geom;
     	    	    myloc     :        Location from TopLoc;
                     parameter : out    Real     from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Vertex entity of an edge on a Surface 
     --            from TopoDS to IGES
     --            Returns the parameter of myvertex on the pcurve 
@@ -108,7 +108,7 @@ is
                     myvertex  :        Vertex from TopoDS;
                     myface    :        Face   from TopoDS;
                     mypoint   : out    Pnt2d  from gp)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Vertex entity on a Face from TopoDS to IGES
     --            Returns the parameters of myvertex on myface
     --            If this Entity could not be converted,
@@ -119,7 +119,7 @@ is
                     myedge    :        Edge    from TopoDS; 
     --  	    IsRevol   : in     Boolean from Standard
 		    isBRepMode: in     Boolean from Standard) 
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert an Edge entity from TopoDS to IGES
     --            If this Entity could not be converted, 
     --            this member returns a NullEntity. 
@@ -134,7 +134,7 @@ is
 		    myface    :           Face from TopoDS;
                     length    : in        Real from Standard;		    
 		    isBRepMode: in     Boolean from Standard) 
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert an Edge entity on a Face from TopoDS to IGES
     --            If this Entity could not be converted, 
     --            this member returns a NullEntity. 
@@ -144,7 +144,7 @@ is
 
     TransferWire   (me        : in out;
                     mywire    :        Wire from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Wire entity from TopoDS to IGES
     --            If this Entity could not be converted, 
     --            this member returns a NullEntity.
@@ -156,7 +156,7 @@ is
 		    mycurve2d : out    IGESEntity from IGESData;
                     length    : in     Real       from Standard)
     --		    IsRevol   : in     Boolean    from Standard		    
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Wire entity from TopoDS to IGES.
     --            Returns the curve associated to mywire in 
     --            the parametric space of myface.
diff --git a/src/BRepToIGESBRep/BRepToIGESBRep_Entity.cdl b/src/BRepToIGESBRep/BRepToIGESBRep_Entity.cdl
index b02d21e388..511bc62a01 100644
--- a/src/BRepToIGESBRep/BRepToIGESBRep_Entity.cdl
+++ b/src/BRepToIGESBRep/BRepToIGESBRep_Entity.cdl
@@ -102,7 +102,7 @@ is
 
     TransferEdge       (me        : in out;
                         myedge    : Edge     from TopoDS)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
     ---Purpose :  Transfert an Edge entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
@@ -111,7 +111,7 @@ is
                         myedge    : Edge     from TopoDS;
 		        myface    : Face     from TopoDS;
                         length    : in Real   from Standard)		    				    
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
     ---Purpose :  Transfert an Edge entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
@@ -120,7 +120,7 @@ is
                         mywire    : Wire     from TopoDS;
 		        myface    : Face     from TopoDS;
 			length    : in Real   from Standard)		    
-    returns mutable Loop from IGESSolid;
+    returns Loop from IGESSolid;
     ---Purpose :  Transfert a Wire entity from TopoDS to IGES.
     --            Returns the curve associated to mywire in the parametric space of myface.
     --            If this Entity could not be converted, this member returns a NullEntity.
@@ -128,35 +128,35 @@ is
 
     TransferFace       (me    : in out;
                         start : Face from TopoDS)
-    returns mutable Face from IGESSolid;
+    returns Face from IGESSolid;
     ---Purpose :  Transfert a Face entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
 
     TransferShell      (me    : in out;
                         start : Shell from TopoDS)
-    returns mutable Shell from IGESSolid;
+    returns Shell from IGESSolid;
     ---Purpose :  Transfert an Shell entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
 
     TransferSolid      (me    : in out;
                         start : Solid from TopoDS)
-    	 returns mutable ManifoldSolid from IGESSolid;
+    	 returns ManifoldSolid from IGESSolid;
     ---Purpose :  Transfert a Solid entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
 
     TransferCompSolid  (me    : in out;
                         start : CompSolid from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert an CompSolid entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
 
     TransferCompound   (me    : in out;
                         start : Compound from TopoDS)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert a Compound entity from TopoDS to IGES
     --            If this Entity could not be converted, this member returns a NullEntity.
 
diff --git a/src/BRepTools/BRepTools_GTrsfModification.cdl b/src/BRepTools/BRepTools_GTrsfModification.cdl
index 9389f740b6..a580c5bd31 100644
--- a/src/BRepTools/BRepTools_GTrsfModification.cdl
+++ b/src/BRepTools/BRepTools_GTrsfModification.cdl
@@ -35,7 +35,7 @@ uses Face     from TopoDS,
 
 is
 
-    Create (T : GTrsf from gp) returns mutable GTrsfModification from BRepTools; 
+    Create (T : GTrsf from gp) returns GTrsfModification from BRepTools; 
     
     GTrsf(me: mutable)
 	---Purpose: Gives an access on the GTrsf.
diff --git a/src/BRepTools/BRepTools_NurbsConvertModification.cdl b/src/BRepTools/BRepTools_NurbsConvertModification.cdl
index 79279ba999..cfac09404a 100644
--- a/src/BRepTools/BRepTools_NurbsConvertModification.cdl
+++ b/src/BRepTools/BRepTools_NurbsConvertModification.cdl
@@ -37,7 +37,7 @@ uses Face     from TopoDS,
 
 is
 
-    Create returns mutable NurbsConvertModification from BRepTools; 
+    Create returns NurbsConvertModification from BRepTools; 
     
 
 
diff --git a/src/BRepTools/BRepTools_ReShape.cdl b/src/BRepTools/BRepTools_ReShape.cdl
index 0cda21965a..7c2a8d3a9c 100644
--- a/src/BRepTools/BRepTools_ReShape.cdl
+++ b/src/BRepTools/BRepTools_ReShape.cdl
@@ -36,7 +36,7 @@ uses
 
 is
 
-    Create returns mutable ReShape from BRepTools;
+    Create returns ReShape from BRepTools;
     	---Purpose: Returns an empty Reshape
 
     Clear (me: mutable);
diff --git a/src/BRepTools/BRepTools_TrsfModification.cdl b/src/BRepTools/BRepTools_TrsfModification.cdl
index f48f12ee42..6f23a4a06e 100644
--- a/src/BRepTools/BRepTools_TrsfModification.cdl
+++ b/src/BRepTools/BRepTools_TrsfModification.cdl
@@ -35,7 +35,7 @@ uses Face     from TopoDS,
      
 is
 
-    Create (T : Trsf from gp) returns mutable TrsfModification from BRepTools; 
+    Create (T : Trsf from gp) returns TrsfModification from BRepTools; 
     
     Trsf(me: mutable)
 	---Purpose: Provides access to the gp_Trsf associated with this
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cdl b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cdl
index cc73c10d87..b3ab42c420 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cdl
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_HVertex.cdl
@@ -31,7 +31,7 @@ is
 
     Create(Vtx: Vertex from TopoDS; Curve: HCurve2d from BRepAdaptor)
 
-    	returns mutable HVertex from BRepTopAdaptor;
+    	returns HVertex from BRepTopAdaptor;
 
 
     Vertex(me)
@@ -76,7 +76,7 @@ is
 	is redefined;
 
 
-    IsSame(me: mutable; Other: mutable like me)
+    IsSame(me: mutable; Other: like me)
     
     	returns Boolean from Standard
 	is redefined;
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_Tool.cdl b/src/BRepTopAdaptor/BRepTopAdaptor_Tool.cdl
index 8c141908d9..7645b48d43 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_Tool.cdl
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_Tool.cdl
@@ -47,13 +47,13 @@ is
   ---- 
 
   GetTopolTool(me: in out) 
-     returns mutable TopolTool from BRepTopAdaptor;
+     returns TopolTool from BRepTopAdaptor;
      
   SetTopolTool(me: in out ; 
                TT: TopolTool from BRepTopAdaptor);
 	
   GetSurface(me: in out)
-    returns mutable HSurface from Adaptor3d;
+    returns HSurface from Adaptor3d;
     
 	
   ---
diff --git a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cdl b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cdl
index b579e8ad29..7ad3c6fa73 100644
--- a/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cdl
+++ b/src/BRepTopAdaptor/BRepTopAdaptor_TopolTool.cdl
@@ -39,12 +39,12 @@ is
 
     Create
     
-    	returns mutable TopolTool from BRepTopAdaptor;
+    	returns TopolTool from BRepTopAdaptor;
 
 
     Create(Surface: HSurface from Adaptor3d)
     
-    	returns mutable TopolTool from BRepTopAdaptor;
+    	returns TopolTool from BRepTopAdaptor;
 
     Initialize(me: mutable)
     is redefined;
@@ -74,7 +74,7 @@ is
 
     Value(me: mutable)
     
-    	returns mutable HCurve2d from Adaptor2d
+    	returns HCurve2d from Adaptor2d
         raises DomainError from Standard
 	is redefined;
 	
@@ -104,7 +104,7 @@ is
 
     Vertex(me: mutable)
     
-    	returns mutable HVertex from Adaptor3d
+    	returns HVertex from Adaptor3d
 	raises DomainError from Standard
 	is redefined;
 
diff --git a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cdl b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cdl
index d610d5af4b..60c8e223f5 100644
--- a/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cdl
+++ b/src/BinDrivers/BinDrivers_DocumentRetrievalDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
     -- ===== Public methods =====
 
-    Create returns mutable DocumentRetrievalDriver from BinDrivers;
+    Create returns DocumentRetrievalDriver from BinDrivers;
 	---Purpose: Constructor
 
     AttributeDrivers  (me : mutable; theMsgDriver: MessageDriver from CDM)
diff --git a/src/BinDrivers/BinDrivers_DocumentStorageDriver.cdl b/src/BinDrivers/BinDrivers_DocumentStorageDriver.cdl
index 61f1eea958..8800cc9a7d 100644
--- a/src/BinDrivers/BinDrivers_DocumentStorageDriver.cdl
+++ b/src/BinDrivers/BinDrivers_DocumentStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
     -- ===== Public methods =====
 
-    Create returns mutable DocumentStorageDriver from BinDrivers;
+    Create returns DocumentStorageDriver from BinDrivers;
 	---Purpose: Constructor
 
 
diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cdl b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cdl
index 4472cd7b67..c2bf91bbc8 100644
--- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cdl
+++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cdl
@@ -36,7 +36,7 @@ uses
 is
     -- ===== Public methods =====
 
-    Create returns mutable DocumentRetrievalDriver from BinLDrivers;
+    Create returns DocumentRetrievalDriver from BinLDrivers;
         ---Purpose: Constructor
 
     SchemaName          (me)
diff --git a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cdl b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cdl
index 07d8dc9356..088f292142 100644
--- a/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cdl
+++ b/src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cdl
@@ -36,7 +36,7 @@ uses
 is
     -- ===== Public methods =====
 
-    Create returns mutable DocumentStorageDriver from BinLDrivers;
+    Create returns DocumentStorageDriver from BinLDrivers;
         ---Purpose: Constructor
 
     SchemaName(me) returns ExtendedString from TCollection is redefined virtual;
diff --git a/src/BinMDF/BinMDF_ADriver.cdl b/src/BinMDF/BinMDF_ADriver.cdl
index 5b2503b0c6..5ff40dce02 100644
--- a/src/BinMDF/BinMDF_ADriver.cdl
+++ b/src/BinMDF/BinMDF_ADriver.cdl
@@ -31,7 +31,7 @@ is
                 theName     : CString from Standard = NULL);
 
     NewEmpty    (me)
-        returns mutable Attribute from TDF
+        returns Attribute from TDF
         is deferred;
         ---Purpose: Creates a new attribute from TDF.
 
@@ -49,7 +49,7 @@ is
         ---Purpose: Returns the type name of the attribute object
 
     Paste       (me; aSource     : Persistent from BinObjMgt;
-                     aTarget     : mutable Attribute from TDF;
+                     aTarget     : Attribute from TDF;
                      aRelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is deferred;
         ---Purpose: Translate the contents of <aSource> and put it
diff --git a/src/BinMDF/BinMDF_ADriverTable.cdl b/src/BinMDF/BinMDF_ADriverTable.cdl
index d92383d7fd..5df634acf4 100644
--- a/src/BinMDF/BinMDF_ADriverTable.cdl
+++ b/src/BinMDF/BinMDF_ADriverTable.cdl
@@ -30,7 +30,7 @@ uses
     TypeIdMap from BinMDF
 
 is
-    Create returns mutable ADriverTable from BinMDF;
+    Create returns ADriverTable from BinMDF;
         ---Purpose: Constructor
 
     AddDriver(me : mutable; theDriver : ADriver from BinMDF);
diff --git a/src/BinMDF/BinMDF_ReferenceDriver.cdl b/src/BinMDF/BinMDF_ReferenceDriver.cdl
index b67ec37fb7..f5834dfe8a 100644
--- a/src/BinMDF/BinMDF_ReferenceDriver.cdl
+++ b/src/BinMDF/BinMDF_ReferenceDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ReferenceDriver from BinMDF;
+        returns ReferenceDriver from BinMDF;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDF/BinMDF_TagSourceDriver.cdl b/src/BinMDF/BinMDF_TagSourceDriver.cdl
index 51ccdd2e87..42ef8c2c63 100644
--- a/src/BinMDF/BinMDF_TagSourceDriver.cdl
+++ b/src/BinMDF/BinMDF_TagSourceDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver : MessageDriver from CDM)
-        returns mutable TagSourceDriver from BinMDF;
+        returns TagSourceDriver from BinMDF;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cdl b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cdl
index 11eada0735..77566f9256 100644
--- a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable AsciiStringDriver from BinMDataStd;
+        returns AsciiStringDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
     ---Purpose: persistent -> transient (retrieve)
diff --git a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cdl b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cdl
index 215ed9f632..c20adda2a7 100644
--- a/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_BooleanArrayDriver.cdl
@@ -25,14 +25,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable BooleanArrayDriver from BinMDataStd;
+    returns BooleanArrayDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_BooleanListDriver.cdl b/src/BinMDataStd/BinMDataStd_BooleanListDriver.cdl
index 49f12316cc..9d5b36471c 100644
--- a/src/BinMDataStd/BinMDataStd_BooleanListDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_BooleanListDriver.cdl
@@ -25,14 +25,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable BooleanListDriver from BinMDataStd;
+    returns BooleanListDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cdl b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cdl
index 8473c86629..059c8d1b6b 100644
--- a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cdl
@@ -25,14 +25,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ByteArrayDriver from BinMDataStd;
+    returns ByteArrayDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_CommentDriver.cdl b/src/BinMDataStd/BinMDataStd_CommentDriver.cdl
index 902f1bac46..67765283e3 100644
--- a/src/BinMDataStd/BinMDataStd_CommentDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_CommentDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable CommentDriver from BinMDataStd;
+        returns CommentDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataStd/BinMDataStd_DirectoryDriver.cdl b/src/BinMDataStd/BinMDataStd_DirectoryDriver.cdl
index 5244f0191f..09042a9548 100644
--- a/src/BinMDataStd/BinMDataStd_DirectoryDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_DirectoryDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable DirectoryDriver from BinMDataStd;
+        returns DirectoryDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_ExpressionDriver.cdl b/src/BinMDataStd/BinMDataStd_ExpressionDriver.cdl
index c90b07c469..0e29b819f5 100644
--- a/src/BinMDataStd/BinMDataStd_ExpressionDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_ExpressionDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ExpressionDriver from BinMDataStd;
+        returns ExpressionDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cdl b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cdl
index 9b77ee6409..dfea7f7906 100644
--- a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ExtStringArrayDriver from BinMDataStd;
+        returns ExtStringArrayDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cdl b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cdl
index 312555033f..c6a99b7bb4 100644
--- a/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_ExtStringListDriver.cdl
@@ -25,14 +25,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ExtStringListDriver from BinMDataStd;
+    returns ExtStringListDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cdl b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cdl
index e17e358f55..a1750156a1 100644
--- a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cdl
@@ -25,12 +25,12 @@ uses
     Attribute        from TDF
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable IntPackedMapDriver from BinMDataStd;
+        returns IntPackedMapDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
     ---Purpose: persistent -> transient (retrieve)
diff --git a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cdl b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cdl
index a2d9d1a2cc..158aba0993 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable IntegerArrayDriver from BinMDataStd;
+        returns IntegerArrayDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_IntegerDriver.cdl b/src/BinMDataStd/BinMDataStd_IntegerDriver.cdl
index 21a813708b..4c3cbe5987 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_IntegerDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable IntegerDriver from BinMDataStd;
+        returns IntegerDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_IntegerListDriver.cdl b/src/BinMDataStd/BinMDataStd_IntegerListDriver.cdl
index 699baca82a..ca33b25287 100644
--- a/src/BinMDataStd/BinMDataStd_IntegerListDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_IntegerListDriver.cdl
@@ -25,14 +25,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable IntegerListDriver from BinMDataStd;
+    returns IntegerListDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_NameDriver.cdl b/src/BinMDataStd/BinMDataStd_NameDriver.cdl
index 8ef4d31f1e..e74145fa62 100644
--- a/src/BinMDataStd/BinMDataStd_NameDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_NameDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable NameDriver from BinMDataStd;
+        returns NameDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
     ---Purpose: persistent -> transient (retrieve)
diff --git a/src/BinMDataStd/BinMDataStd_NamedDataDriver.cdl b/src/BinMDataStd/BinMDataStd_NamedDataDriver.cdl
index 6d645e3812..6591366b6e 100644
--- a/src/BinMDataStd/BinMDataStd_NamedDataDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_NamedDataDriver.cdl
@@ -26,14 +26,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable NamedDataDriver from BinMDataStd;
+    returns NamedDataDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_NoteBookDriver.cdl b/src/BinMDataStd/BinMDataStd_NoteBookDriver.cdl
index 0e906b3218..2540d176e1 100644
--- a/src/BinMDataStd/BinMDataStd_NoteBookDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_NoteBookDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable NoteBookDriver from BinMDataStd;
+        returns NoteBookDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_RealArrayDriver.cdl b/src/BinMDataStd/BinMDataStd_RealArrayDriver.cdl
index 9674cf4099..53d2bce9ef 100644
--- a/src/BinMDataStd/BinMDataStd_RealArrayDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_RealArrayDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable RealArrayDriver from BinMDataStd;
+        returns RealArrayDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_RealDriver.cdl b/src/BinMDataStd/BinMDataStd_RealDriver.cdl
index beaec82da2..865107e9c0 100644
--- a/src/BinMDataStd/BinMDataStd_RealDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_RealDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable RealDriver from BinMDataStd;
+        returns RealDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_RealListDriver.cdl b/src/BinMDataStd/BinMDataStd_RealListDriver.cdl
index a6f6938a9a..c3da2da0ce 100644
--- a/src/BinMDataStd/BinMDataStd_RealListDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_RealListDriver.cdl
@@ -25,14 +25,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable RealListDriver from BinMDataStd;
+    returns RealListDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cdl b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cdl
index 29c73297d5..db1118b5c3 100644
--- a/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_ReferenceArrayDriver.cdl
@@ -25,14 +25,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ReferenceArrayDriver from BinMDataStd;
+    returns ReferenceArrayDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cdl b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cdl
index d6bc945009..626e1607c4 100644
--- a/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_ReferenceListDriver.cdl
@@ -25,14 +25,14 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ReferenceListDriver from BinMDataStd;
+    returns ReferenceListDriver from BinMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_RelationDriver.cdl b/src/BinMDataStd/BinMDataStd_RelationDriver.cdl
index abc38bc76b..0682985175 100644
--- a/src/BinMDataStd/BinMDataStd_RelationDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_RelationDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable RelationDriver from BinMDataStd;
+        returns RelationDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataStd/BinMDataStd_TickDriver.cdl b/src/BinMDataStd/BinMDataStd_TickDriver.cdl
index ca5101489f..dbb4c7dda9 100644
--- a/src/BinMDataStd/BinMDataStd_TickDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_TickDriver.cdl
@@ -28,14 +28,14 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable TickDriver from BinMDataStd;
+    returns TickDriver from BinMDataStd;
 
     NewEmpty (me) 
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cdl b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cdl
index 61553c9d0e..226a848f77 100644
--- a/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_TreeNodeDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable TreeNodeDriver from BinMDataStd;
+        returns TreeNodeDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataStd/BinMDataStd_UAttributeDriver.cdl b/src/BinMDataStd/BinMDataStd_UAttributeDriver.cdl
index bf4ce86bd6..202537d784 100644
--- a/src/BinMDataStd/BinMDataStd_UAttributeDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_UAttributeDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable UAttributeDriver from BinMDataStd;
+        returns UAttributeDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataStd/BinMDataStd_VariableDriver.cdl b/src/BinMDataStd/BinMDataStd_VariableDriver.cdl
index 8498a62349..1dc2d2b82e 100644
--- a/src/BinMDataStd/BinMDataStd_VariableDriver.cdl
+++ b/src/BinMDataStd/BinMDataStd_VariableDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable VariableDriver from BinMDataStd;
+        returns VariableDriver from BinMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataXtd/BinMDataXtd_AxisDriver.cdl b/src/BinMDataXtd/BinMDataXtd_AxisDriver.cdl
index ea4ce7619e..14c5575c23 100644
--- a/src/BinMDataXtd/BinMDataXtd_AxisDriver.cdl
+++ b/src/BinMDataXtd/BinMDataXtd_AxisDriver.cdl
@@ -28,13 +28,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable AxisDriver from BinMDataXtd;
+        returns AxisDriver from BinMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cdl b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cdl
index 8d1c8a9bec..73151f5251 100644
--- a/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cdl
+++ b/src/BinMDataXtd/BinMDataXtd_ConstraintDriver.cdl
@@ -28,12 +28,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ConstraintDriver from BinMDataXtd;
+        returns ConstraintDriver from BinMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cdl b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cdl
index 10cca02dc3..2783c67881 100644
--- a/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cdl
+++ b/src/BinMDataXtd/BinMDataXtd_GeometryDriver.cdl
@@ -28,12 +28,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable GeometryDriver from BinMDataXtd;
+        returns GeometryDriver from BinMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cdl b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cdl
index 2935a28792..00a57f9c9c 100644
--- a/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cdl
+++ b/src/BinMDataXtd/BinMDataXtd_PatternStdDriver.cdl
@@ -28,12 +28,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PatternStdDriver from BinMDataXtd;
+        returns PatternStdDriver from BinMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cdl b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cdl
index b1a0ed0edf..c3f6804367 100644
--- a/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cdl
+++ b/src/BinMDataXtd/BinMDataXtd_PlacementDriver.cdl
@@ -28,13 +28,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PlacementDriver from BinMDataXtd;
+        returns PlacementDriver from BinMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cdl b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cdl
index 84117ddd81..ef61602931 100644
--- a/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cdl
+++ b/src/BinMDataXtd/BinMDataXtd_PlaneDriver.cdl
@@ -28,13 +28,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PlaneDriver from BinMDataXtd;
+        returns PlaneDriver from BinMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataXtd/BinMDataXtd_PointDriver.cdl b/src/BinMDataXtd/BinMDataXtd_PointDriver.cdl
index 2865439c70..74de6cd03b 100644
--- a/src/BinMDataXtd/BinMDataXtd_PointDriver.cdl
+++ b/src/BinMDataXtd/BinMDataXtd_PointDriver.cdl
@@ -28,13 +28,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PointDriver from BinMDataXtd;
+        returns PointDriver from BinMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cdl b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cdl
index cd15ca2d5b..d0cb1f8fc2 100644
--- a/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cdl
+++ b/src/BinMDataXtd/BinMDataXtd_ShapeDriver.cdl
@@ -28,13 +28,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ShapeDriver from BinMDataXtd;
+        returns ShapeDriver from BinMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMDocStd/BinMDocStd_XLinkDriver.cdl b/src/BinMDocStd/BinMDocStd_XLinkDriver.cdl
index f947101daa..89cc542413 100644
--- a/src/BinMDocStd/BinMDocStd_XLinkDriver.cdl
+++ b/src/BinMDocStd/BinMDocStd_XLinkDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable XLinkDriver from BinMDocStd;
+        returns XLinkDriver from BinMDocStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMFunction/BinMFunction_FunctionDriver.cdl b/src/BinMFunction/BinMFunction_FunctionDriver.cdl
index cb34b787eb..846e5966a5 100644
--- a/src/BinMFunction/BinMFunction_FunctionDriver.cdl
+++ b/src/BinMFunction/BinMFunction_FunctionDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable FunctionDriver from BinMFunction;
+        returns FunctionDriver from BinMFunction;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     	is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard is redefined;
 
diff --git a/src/BinMFunction/BinMFunction_GraphNodeDriver.cdl b/src/BinMFunction/BinMFunction_GraphNodeDriver.cdl
index 9daab01be7..623019c766 100644
--- a/src/BinMFunction/BinMFunction_GraphNodeDriver.cdl
+++ b/src/BinMFunction/BinMFunction_GraphNodeDriver.cdl
@@ -28,14 +28,14 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable GraphNodeDriver from BinMFunction;
+    returns GraphNodeDriver from BinMFunction;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMFunction/BinMFunction_ScopeDriver.cdl b/src/BinMFunction/BinMFunction_ScopeDriver.cdl
index 61968eed96..775a726ad3 100644
--- a/src/BinMFunction/BinMFunction_ScopeDriver.cdl
+++ b/src/BinMFunction/BinMFunction_ScopeDriver.cdl
@@ -28,14 +28,14 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ScopeDriver from BinMFunction;
+    returns ScopeDriver from BinMFunction;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMNaming/BinMNaming_NamedShapeDriver.cdl b/src/BinMNaming/BinMNaming_NamedShapeDriver.cdl
index 88e39899be..87da7b09c6 100644
--- a/src/BinMNaming/BinMNaming_NamedShapeDriver.cdl
+++ b/src/BinMNaming/BinMNaming_NamedShapeDriver.cdl
@@ -28,12 +28,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable NamedShapeDriver from BinMNaming;
+        returns NamedShapeDriver from BinMNaming;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMNaming/BinMNaming_NamingDriver.cdl b/src/BinMNaming/BinMNaming_NamingDriver.cdl
index 52d93b899d..69dd1f7ff6 100644
--- a/src/BinMNaming/BinMNaming_NamingDriver.cdl
+++ b/src/BinMNaming/BinMNaming_NamingDriver.cdl
@@ -27,12 +27,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable NamingDriver from BinMNaming;
+        returns NamingDriver from BinMNaming;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cdl b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cdl
index fda569b00f..71e7ee25a6 100644
--- a/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cdl
+++ b/src/BinMPrsStd/BinMPrsStd_AISPresentationDriver.cdl
@@ -27,12 +27,12 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable AISPresentationDriver from BinMPrsStd;
+        returns AISPresentationDriver from BinMPrsStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMPrsStd/BinMPrsStd_PositionDriver.cdl b/src/BinMPrsStd/BinMPrsStd_PositionDriver.cdl
index 8f4aea8693..e2ed922dad 100644
--- a/src/BinMPrsStd/BinMPrsStd_PositionDriver.cdl
+++ b/src/BinMPrsStd/BinMPrsStd_PositionDriver.cdl
@@ -27,12 +27,12 @@ uses
 is
 
 Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PositionDriver from BinMPrsStd;
+        returns PositionDriver from BinMPrsStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from BinObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from BinObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cdl
index 458711c325..9be019e4b6 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_AreaDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable AreaDriver from BinMXCAFDoc;
+    returns AreaDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cdl
index 4e25894f23..d189dd4b8f 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_CentroidDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable CentroidDriver from BinMXCAFDoc;
+    returns CentroidDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cdl
index 325696db38..d27fa80c55 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable ColorDriver from BinMXCAFDoc;
+    returns ColorDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cdl
index ab6afb5608..b85bc5d169 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ColorToolDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable ColorToolDriver from BinMXCAFDoc;
+    returns ColorToolDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cdl
index b942264984..4f5d7175f9 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DatumDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable DatumDriver from BinMXCAFDoc;
+    returns DatumDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cdl
index 8df47cbc2a..87f0223326 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable DimTolDriver from BinMXCAFDoc;
+    returns DimTolDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cdl
index bfa593288f..0bece18255 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DimTolToolDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable DimTolToolDriver from BinMXCAFDoc;
+    returns DimTolToolDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cdl
index 7bc631c2a7..3bbe3cf39b 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_DocumentToolDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable DocumentToolDriver from BinMXCAFDoc;
+    returns DocumentToolDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cdl
index e9ea1947c0..fe2b201c76 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_GraphNodeDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable GraphNodeDriver from BinMXCAFDoc;
+    returns GraphNodeDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cdl
index ddc1d03536..17a999f9ff 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LayerToolDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable LayerToolDriver from BinMXCAFDoc;
+    returns LayerToolDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cdl
index fb16a6393b..2b6ceb7d0b 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cdl
@@ -25,13 +25,13 @@ uses
     LocationSetPtr   from BinTools
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable LocationDriver from BinMXCAFDoc;
+    returns LocationDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cdl
index 8f4fe71b73..aa4a5945c2 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable MaterialDriver from BinMXCAFDoc;
+    returns MaterialDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cdl
index 4e4a628c9d..104e12cde5 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_MaterialToolDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable MaterialToolDriver from BinMXCAFDoc;
+    returns MaterialToolDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cdl
index 645aedd775..038978b8ae 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_ShapeToolDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable ShapeToolDriver from BinMXCAFDoc;
+    returns ShapeToolDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cdl b/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cdl
index 9ccd258e6c..c70b0ce3e1 100644
--- a/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cdl
+++ b/src/BinMXCAFDoc/BinMXCAFDoc_VolumeDriver.cdl
@@ -24,13 +24,13 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable VolumeDriver from BinMXCAFDoc;
+    returns VolumeDriver from BinMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF
+    NewEmpty (me)  returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from BinObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from BinObjMgt)
     returns Boolean from Standard is redefined;
 
diff --git a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.cdl b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.cdl
index e1c54fbb6f..452250c5bf 100644
--- a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.cdl
+++ b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentRetrievalDriver.cdl
@@ -21,7 +21,7 @@ uses
 is
     -- ===== Public methods =====
 
-    Create returns mutable DocumentRetrievalDriver from BinXCAFDrivers;
+    Create returns DocumentRetrievalDriver from BinXCAFDrivers;
 	---Purpose: Constructor
 
     AttributeDrivers  (me : mutable; theMsgDriver: MessageDriver from CDM)
diff --git a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.cdl b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.cdl
index 43f15e9db2..830bf3ce15 100644
--- a/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.cdl
+++ b/src/BinXCAFDrivers/BinXCAFDrivers_DocumentStorageDriver.cdl
@@ -20,7 +20,7 @@ uses
     ADriverTable     from BinMDF
 is
 
-    Create returns mutable DocumentStorageDriver from BinXCAFDrivers;
+    Create returns DocumentStorageDriver from BinXCAFDrivers;
 	---Purpose: Constructor
 
 
diff --git a/src/Bisector/Bisector_Bisec.cdl b/src/Bisector/Bisector_Bisec.cdl
index 228696b969..114526a408 100644
--- a/src/Bisector/Bisector_Bisec.cdl
+++ b/src/Bisector/Bisector_Bisec.cdl
@@ -112,7 +112,7 @@ is
     	 ---C++: return const & 
     is static;
     
-    ChangeValue (me : in out) returns mutable TrimmedCurve from Geom2d
+    ChangeValue (me : in out) returns TrimmedCurve from Geom2d
    	 --- Purpose : Returns the Curve of <me>.  
    	 --  
     	 ---C++: return const & 
diff --git a/src/Bisector/Bisector_BisecAna.cdl b/src/Bisector/Bisector_BisecAna.cdl
index 8659f25158..c61ac43dc8 100644
--- a/src/Bisector/Bisector_BisecAna.cdl
+++ b/src/Bisector/Bisector_BisecAna.cdl
@@ -38,7 +38,7 @@ raises DomainError    from Standard,
        RangeError     from Standard
 
 is
-    Create returns mutable BisecAna;
+    Create returns BisecAna;
     
     Perform(me        : mutable                                ;
             Cu1       : Curve   from Geom2d                    ;
@@ -143,7 +143,7 @@ is
         --- Purpose : Raised if N < 0. 
     is static;
     
-    Copy (me)  returns mutable like me   
+    Copy (me)  returns like me   
     is static;    
         
     Transform (me : mutable; T : Trsf2d) 
diff --git a/src/Bisector/Bisector_BisecCC.cdl b/src/Bisector/Bisector_BisecCC.cdl
index 7a4bfd0be4..0a526d7b70 100644
--- a/src/Bisector/Bisector_BisecCC.cdl
+++ b/src/Bisector/Bisector_BisecCC.cdl
@@ -38,7 +38,7 @@ raises DomainError    from Standard,
        RangeError     from Standard
 is
     
-    Create returns mutable BisecCC;
+    Create returns BisecCC;
 
     Create  (Cu1     : Curve from Geom2d;
     	     Cu2     : Curve from Geom2d;
@@ -58,7 +58,7 @@ is
     	--          between the points of the bisector and <Cu> is smaller
     	--          than <DistMax>.
     	--          
-    returns mutable BisecCC from Bisector;	     
+    returns BisecCC from Bisector;	     
 
     Perform (me      : mutable          ;
              Cu1     : Curve from Geom2d;
@@ -101,13 +101,13 @@ is
         --- Purpose : Raised if N < 0. 
     is static;
     
-    ChangeGuide (me) returns mutable like me
+    ChangeGuide (me) returns like me
     	---Purpose: The parameter  on <me> is linked to  the parameter
     	--          on the first curve. This method creates the same bisector
     	--          where the curves are inversed.
     is static;
 
-    Copy (me)  returns mutable like me   
+    Copy (me)  returns like me   
     is static;
     
     Transform (me : mutable; T : Trsf2d) 
diff --git a/src/Bisector/Bisector_BisecPC.cdl b/src/Bisector/Bisector_BisecPC.cdl
index af30d3296e..4f1c98ffe9 100644
--- a/src/Bisector/Bisector_BisecPC.cdl
+++ b/src/Bisector/Bisector_BisecPC.cdl
@@ -39,7 +39,7 @@ raises DomainError    from Standard,
        RangeError        from Standard
 is
     
-    Create returns mutable BisecPC;
+    Create returns BisecPC;
 
     Create  (Cu      : Curve from Geom2d;
 	     P       : Pnt2d from gp    ;
@@ -54,7 +54,7 @@ is
     	--          between the points of the bisector and <Cu> is smaller
     	--          than <DistMax>.
     	--          
-    returns mutable BisecPC from Bisector;	
+    returns BisecPC from Bisector;	
     
     Create  (Cu      : Curve from Geom2d;
 	     P       : Pnt2d from gp    ;
@@ -69,7 +69,7 @@ is
     	--  Warning: the bisector is supposed all over defined between
     	--          <UMin> and <UMax>. 
 
-    returns mutable BisecPC from Bisector;
+    returns BisecPC from Bisector;
     
     Perform (me      : mutable          ;
     	     Cu      : Curve from Geom2d;
@@ -111,7 +111,7 @@ is
 	--          the point of parameter U on <me>.
     is static;
     
-    Copy (me)  returns mutable like me   
+    Copy (me)  returns like me   
     is static;
     
     Transform (me : mutable; T : Trsf2d) 
diff --git a/src/CDF/CDF_Application.cdl b/src/CDF/CDF_Application.cdl
index 0ab98e9275..b321ab31c0 100644
--- a/src/CDF/CDF_Application.cdl
+++ b/src/CDF/CDF_Application.cdl
@@ -38,7 +38,7 @@ is
     Initialize;
     
     Load(myclass; aGUID:GUID from Standard)
-    returns  mutable Application from CDF;
+    returns Application from CDF;
     ---Purpose: plugs an application.
     
 
@@ -185,11 +185,11 @@ is
     
 ---Category: private methods
     Retrieve(me: mutable; aMetaData: MetaData from CDM; UseStorageConfiguration: Boolean from Standard)
-    returns mutable Document from CDM
+    returns Document from CDM
     is private;
 
     Retrieve(me: mutable; aMetaData: MetaData from CDM; UseStorageConfiguration: Boolean from Standard; IsComponent: Boolean from Standard)
-    returns mutable Document from CDM
+    returns Document from CDM
     is private;
 
     DocumentVersion(me: mutable; theMetaData: MetaData from CDM)
diff --git a/src/CDF/CDF_Directory.cdl b/src/CDF/CDF_Directory.cdl
index 4b34efdc31..409e388104 100644
--- a/src/CDF/CDF_Directory.cdl
+++ b/src/CDF/CDF_Directory.cdl
@@ -27,7 +27,7 @@ raises  NoSuchObject
     
 is
     Create 
-    returns mutable Directory from CDF;
+    returns Directory from CDF;
     ---Purpose: Creates an empty directory.
     
     
diff --git a/src/CDF/CDF_Session.cdl b/src/CDF/CDF_Session.cdl
index 2c09f38d07..5402aff22b 100644
--- a/src/CDF/CDF_Session.cdl
+++ b/src/CDF/CDF_Session.cdl
@@ -28,19 +28,19 @@ raises
     NoSuchObject from Standard,MultiplyDefined from Standard
 
 is
-    Create  returns mutable Session from CDF
+    Create  returns Session from CDF
     raises MultiplyDefined from Standard;
 
     Exists(myclass)
 --- Purpose: returns true if a session has been created.
     returns Boolean from Standard;
     
-    CurrentSession(myclass) returns mutable Session from CDF;
+    CurrentSession(myclass) returns Session from CDF;
     ---Purpose: returns the only one instance of Session 
     --          that has been created.
 
     
-    Directory(me) returns mutable Directory from CDF;
+    Directory(me) returns Directory from CDF;
     ---Purpose: returns the directory of the session;
     ---Level: Public 
 
@@ -48,7 +48,7 @@ is
 ---Category: current application management
     HasCurrentApplication(me) returns Boolean from Standard;
     
-    CurrentApplication(me) returns mutable Application from CDF
+    CurrentApplication(me) returns Application from CDF
     raises NoSuchObject from Standard;
     
     SetCurrentApplication(me: mutable; anApplication: Application from CDF);
diff --git a/src/CDF/CDF_StoreList.cdl b/src/CDF/CDF_StoreList.cdl
index e9730fdc5a..ae0d7d6a01 100644
--- a/src/CDF/CDF_StoreList.cdl
+++ b/src/CDF/CDF_StoreList.cdl
@@ -29,7 +29,7 @@ raises NoSuchObject from Standard
 is
 
     Create(aDocument: Document from CDM)
-    returns mutable StoreList from CDF;
+    returns StoreList from CDF;
     
     IsConsistent(me) returns Boolean from Standard;
 
diff --git a/src/CDM/CDM_Application.cdl b/src/CDM/CDM_Application.cdl
index 7f55b3e09e..4de074918d 100644
--- a/src/CDM/CDM_Application.cdl
+++ b/src/CDM/CDM_Application.cdl
@@ -27,7 +27,7 @@ uses Document           from CDM,
 is
 
     Retrieve(me: mutable; aMetaData: MetaData from CDM; UseStorageConfiguration: Boolean from Standard)
-    returns mutable Document from CDM
+    returns Document from CDM
     is deferred private;
 
 
diff --git a/src/CDM/CDM_NullMessageDriver.cdl b/src/CDM/CDM_NullMessageDriver.cdl
index 101678da9b..d15d5b5af2 100644
--- a/src/CDM/CDM_NullMessageDriver.cdl
+++ b/src/CDM/CDM_NullMessageDriver.cdl
@@ -17,7 +17,7 @@
 class NullMessageDriver from CDM inherits MessageDriver from CDM
 
 is
-    Create returns mutable NullMessageDriver from CDM;
+    Create returns NullMessageDriver from CDM;
     
     
     Write(me: mutable; aString: ExtString from Standard);
diff --git a/src/CDM/CDM_Reference.cdl b/src/CDM/CDM_Reference.cdl
index 71ff371db6..8efe4cb74b 100644
--- a/src/CDM/CDM_Reference.cdl
+++ b/src/CDM/CDM_Reference.cdl
@@ -21,11 +21,11 @@ uses Document from CDM, DocumentPointer from CDM, Application from CDM, MetaData
 is
 
     Create(aFromDocument: Document from CDM; aToDocument: Document from CDM; aReferenceIdentifier: Integer from Standard; aToDocumentVersion: Integer from Standard)
-    returns mutable Reference from CDM
+    returns Reference from CDM
     is private;
 
     Create(aFromDocument: Document from CDM; aMetaData: MetaData from CDM; aReferenceIdentifier: Integer from Standard; anApplication: Application from CDM; aToDocumentVersion: Integer from Standard; UseStorageConfiguration: Boolean from Standard)
-    returns mutable Reference from CDM
+    returns Reference from CDM
     is private;
     
 
diff --git a/src/ChFi3d/ChFi3d_Builder.cdl b/src/ChFi3d/ChFi3d_Builder.cdl
index d3c34e0cdc..c9d9b4d507 100644
--- a/src/ChFi3d/ChFi3d_Builder.cdl
+++ b/src/ChFi3d/ChFi3d_Builder.cdl
@@ -254,7 +254,7 @@ is
 
     --- Simulation
     
-    SimulKPart(me; SD : mutable SurfData from ChFiDS)
+    SimulKPart(me; SD : SurfData from ChFiDS)
     is deferred protected; 
     
     SimulSurf(me              : in out; 
diff --git a/src/ChFi3d/ChFi3d_ChBuilder.cdl b/src/ChFi3d/ChFi3d_ChBuilder.cdl
index 0b7d761d14..896165096b 100644
--- a/src/ChFi3d/ChFi3d_ChBuilder.cdl
+++ b/src/ChFi3d/ChFi3d_ChBuilder.cdl
@@ -179,9 +179,9 @@ is
     	returns Integer from Standard;		 
 
     	Sect(me; IC, IS : Integer from Standard)
-    	returns mutable SecHArray1 from ChFiDS;
+    	returns SecHArray1 from ChFiDS;
     
-        SimulKPart(me; SD : mutable SurfData from ChFiDS)
+        SimulKPart(me; SD : SurfData from ChFiDS)
         is protected; 
 
         SimulSurf(me              : in out; 
diff --git a/src/ChFi3d/ChFi3d_FilBuilder.cdl b/src/ChFi3d/ChFi3d_FilBuilder.cdl
index 662d57d5bb..273a44bb5d 100644
--- a/src/ChFi3d/ChFi3d_FilBuilder.cdl
+++ b/src/ChFi3d/ChFi3d_FilBuilder.cdl
@@ -203,7 +203,7 @@ is
     	GetLaw(me         : in out; 
     	       IC         : Integer from Standard;
     	       E          : Edge from TopoDS)
-	returns mutable Function from Law
+	returns Function from Law
 	 ---Purpose: Returns the rule of  elementary  evolution of  the
 	 --          part to  variable vector framing E, returns a
 	 --          rule zero if E is flagged as edge constant.
@@ -228,9 +228,9 @@ is
     	returns Integer from Standard;
 		 
     	Sect(me; IC, IS : Integer from Standard)
-    	returns mutable SecHArray1 from ChFiDS;
+    	returns SecHArray1 from ChFiDS;
 
-        SimulKPart(me; SD : mutable SurfData from ChFiDS)
+        SimulKPart(me; SD : SurfData from ChFiDS)
         is protected; 
     
         SimulSurf(me              : in out; 
diff --git a/src/ChFiDS/ChFiDS_ChamfSpine.cdl b/src/ChFiDS/ChFiDS_ChamfSpine.cdl
index 12986dfe75..ba62a76978 100644
--- a/src/ChFiDS/ChFiDS_ChamfSpine.cdl
+++ b/src/ChFiDS/ChFiDS_ChamfSpine.cdl
@@ -22,8 +22,8 @@ uses
   ChamfMethod from ChFiDS           
  
 is
-    Create  returns  mutable ChamfSpine from ChFiDS;
-    Create (Tol : Real from Standard) returns  mutable ChamfSpine from ChFiDS;
+    Create  returns ChamfSpine from ChFiDS;
+    Create (Tol : Real from Standard) returns ChamfSpine from ChFiDS;
     
     SetDist (me : mutable; Dis : Real from Standard) is static;
 
diff --git a/src/ChFiDS/ChFiDS_ElSpine.cdl b/src/ChFiDS/ChFiDS_ElSpine.cdl
index ecb26e8a1d..f85b305322 100644
--- a/src/ChFiDS/ChFiDS_ElSpine.cdl
+++ b/src/ChFiDS/ChFiDS_ElSpine.cdl
@@ -114,13 +114,13 @@ is
 
     SetCurve(me : in out; C : Curve from Geom);
 
-    Previous(me) returns mutable SurfData from ChFiDS;
+    Previous(me) returns SurfData from ChFiDS;
     ---C++: return const &
 
     ChangePrevious(me : in out) returns any SurfData from ChFiDS;
     ---C++: return &
 
-    Next(me) returns mutable SurfData from ChFiDS;
+    Next(me) returns SurfData from ChFiDS;
     ---C++: return const &
 
     ChangeNext(me : in out) returns any SurfData from ChFiDS;
diff --git a/src/ChFiDS/ChFiDS_FilSpine.cdl b/src/ChFiDS/ChFiDS_FilSpine.cdl
index cc5279008a..73b0f658d4 100644
--- a/src/ChFiDS/ChFiDS_FilSpine.cdl
+++ b/src/ChFiDS/ChFiDS_FilSpine.cdl
@@ -34,9 +34,9 @@ uses
 
 is
 
-    Create  returns  mutable FilSpine from ChFiDS;
+    Create  returns FilSpine from ChFiDS;
 
-    Create(Tol : Real from Standard) returns  mutable FilSpine from ChFiDS;
+    Create(Tol : Real from Standard) returns FilSpine from ChFiDS;
 
     Reset(me : mutable; AllData : Boolean from Standard = Standard_False)
     is redefined;
@@ -110,7 +110,7 @@ is
     --          all along the edge E.
 
     ComputeLaw(me : mutable; Els : HElSpine from ChFiDS) 
-    returns mutable Composite from Law
+    returns Composite from Law
     is private;
     
     AppendElSpine(me : mutable; Els : HElSpine from ChFiDS) 
@@ -120,12 +120,12 @@ is
     is private;
     
     Law(me; Els : HElSpine from ChFiDS) 
-    returns mutable Composite from Law
+    returns Composite from Law
     is static;
     
     ChangeLaw(me : mutable; E : Edge from TopoDS) 
     ---C++: return &
-    returns mutable Function from Law
+    returns Function from Law
     ---Purpose: returns the elementary law 
     is static;
 
diff --git a/src/ChFiDS/ChFiDS_Spine.cdl b/src/ChFiDS/ChFiDS_Spine.cdl
index ed090b5194..e77a2d95af 100644
--- a/src/ChFiDS/ChFiDS_Spine.cdl
+++ b/src/ChFiDS/ChFiDS_Spine.cdl
@@ -67,9 +67,9 @@ is
 -- methodes de construction.
 ----------------------------
 
-    Create  returns mutable Spine from ChFiDS;
+    Create  returns Spine from ChFiDS;
 
-    Create(Tol : Real from Standard) returns mutable Spine from ChFiDS;
+    Create(Tol : Real from Standard) returns Spine from ChFiDS;
 
     SetEdges(me : mutable; E : Edge from TopoDS) is static;
     ---Purpose: store edges composing the guideline
@@ -103,15 +103,15 @@ is
     is virtual;
     
     ElSpine(me; IE : Integer from Standard) 
-    returns mutable HElSpine from  ChFiDS
+    returns HElSpine from  ChFiDS
     is static;
 
     ElSpine(me; E : Edge from TopoDS) 
-    returns mutable HElSpine from  ChFiDS
+    returns HElSpine from  ChFiDS
     is static;
 
     ElSpine(me; W : Real from Standard) 
-    returns mutable HElSpine from  ChFiDS
+    returns HElSpine from  ChFiDS
     is static;
 
     ChangeElSpines(me : mutable) 
diff --git a/src/ChFiDS/ChFiDS_Stripe.cdl b/src/ChFiDS/ChFiDS_Stripe.cdl
index a3b72bfe1f..876c448b8b 100644
--- a/src/ChFiDS/ChFiDS_Stripe.cdl
+++ b/src/ChFiDS/ChFiDS_Stripe.cdl
@@ -25,7 +25,7 @@ uses HData from ChFiDS,
 
 is
 
-    Create returns mutable Stripe from ChFiDS;
+    Create returns Stripe from ChFiDS;
     
     
     Reset(me : mutable) is static;
diff --git a/src/ChFiDS/ChFiDS_SurfData.cdl b/src/ChFiDS/ChFiDS_SurfData.cdl
index 3257e781ac..f9e2897d2e 100644
--- a/src/ChFiDS/ChFiDS_SurfData.cdl
+++ b/src/ChFiDS/ChFiDS_SurfData.cdl
@@ -26,7 +26,7 @@ uses
     CommonPoint from ChFiDS
 
 is
-    Create returns mutable SurfData;
+    Create returns SurfData;
     
     Copy(me: mutable; Other : SurfData from ChFiDS);
     
@@ -171,7 +171,7 @@ is
     FirstExtensionValue(me:mutable;Extend:Real from Standard) is static;
     LastExtensionValue(me:mutable;Extend:Real from Standard) is static;
   
-    Simul(me) returns mutable TShared from MMgt;
+    Simul(me) returns TShared from MMgt;
     SetSimul(me : mutable; S : TShared from MMgt);
     ResetSimul(me : mutable);
 
diff --git a/src/DBC/DBC_VArray.cdl b/src/DBC/DBC_VArray.cdl
index ee19b10f79..99aefcc6db 100644
--- a/src/DBC/DBC_VArray.cdl
+++ b/src/DBC/DBC_VArray.cdl
@@ -38,8 +38,8 @@ raises NegativeValue, OutOfRange , DimensionMismatch, NullObject
       inherits ArrayNode from PStandard
       is
       
-      	Create returns mutable VArrayNode from DBC;
-	Create(aValue : Item)  returns mutable VArrayNode from DBC;
+      	Create returns VArrayNode from DBC;
+	Create(aValue : Item)  returns VArrayNode from DBC;
 	
 	SetValue(me : mutable; aValue : Item);
 	Value(me) returns Address from Standard;
diff --git a/src/DBRep/DBRep_DrawableShape.cdl b/src/DBRep/DBRep_DrawableShape.cdl
index 2d2bd3c444..92d6a761d3 100644
--- a/src/DBRep/DBRep_DrawableShape.cdl
+++ b/src/DBRep/DBRep_DrawableShape.cdl
@@ -42,7 +42,7 @@ is
 	    size    : Real;               -- size for infinite isos
 	    nbisos  : Integer;            -- # of isos on each face
 	    discret : Integer)            -- # of points on curves
-    returns mutable DrawableShape from DBRep
+    returns DrawableShape from DBRep
     raises DomainError;
     
     Set (me : mutable; C: Shape from TopoDS)
@@ -118,7 +118,7 @@ is
     
     DisplayHiddenLines(me : mutable; dis : in out Display from Draw);
 
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
     is redefined;
 	
diff --git a/src/DBRep/DBRep_Edge.cdl b/src/DBRep/DBRep_Edge.cdl
index d5529b5de3..7e7865cf61 100644
--- a/src/DBRep/DBRep_Edge.cdl
+++ b/src/DBRep/DBRep_Edge.cdl
@@ -22,7 +22,7 @@ uses
 
 is
     Create (E : Edge from TopoDS; C : Color from Draw)
-    returns mutable Edge from DBRep;
+    returns Edge from DBRep;
     
     Edge(me) returns Edge from TopoDS
 	---C++: return const &
diff --git a/src/DBRep/DBRep_Face.cdl b/src/DBRep/DBRep_Face.cdl
index 5c0c106f6b..cb3087f75f 100644
--- a/src/DBRep/DBRep_Face.cdl
+++ b/src/DBRep/DBRep_Face.cdl
@@ -27,7 +27,7 @@ is
     Create (F : Face from TopoDS; 
     	    N : Integer;
     	    C : Color from Draw)
-    returns mutable Face from DBRep;
+    returns Face from DBRep;
 	---Purpose: N is the number of iso intervals.
     
     Face(me) returns Face from TopoDS
diff --git a/src/DBRep/DBRep_IsoBuilder.cdl b/src/DBRep/DBRep_IsoBuilder.cdl
index 4ecb055a01..885ad80cfd 100644
--- a/src/DBRep/DBRep_IsoBuilder.cdl
+++ b/src/DBRep/DBRep_IsoBuilder.cdl
@@ -49,7 +49,7 @@ is
     	is static ;
 
 
-    LoadIsos (me; Face : mutable Face from DBRep)
+    LoadIsos (me; Face : Face from DBRep)
 
     	---Purpose: Loading of the isoparametric curves in the
     	--          Data Structure of a drawable face.
diff --git a/src/DDF/DDF_Browser.cdl b/src/DDF/DDF_Browser.cdl
index 9531836984..2c26e0226e 100644
--- a/src/DDF/DDF_Browser.cdl
+++ b/src/DDF/DDF_Browser.cdl
@@ -38,14 +38,14 @@ uses
 is
 
     Create  (aDF : Data from TDF)
-    returns mutable Browser from DDF;
+    returns Browser from DDF;
     
     
     DrawOn (me; dis : in out Display);
     
     
     Copy (me) 
-    returns mutable Drawable3D from Draw
+    returns Drawable3D from Draw
     is redefined;
 
     Dump (me; S : in out OStream) 
diff --git a/src/DDF/DDF_Data.cdl b/src/DDF/DDF_Data.cdl
index cebfda6ca9..919038b228 100644
--- a/src/DDF/DDF_Data.cdl
+++ b/src/DDF/DDF_Data.cdl
@@ -34,14 +34,14 @@ is
 
 
     Create  (aDF : Data from TDF)
-    returns mutable Data from DDF;
+    returns Data from DDF;
     
     
     DrawOn (me; dis : in out Display);
     
     
     Copy (me) 
-    returns mutable Drawable3D from Draw
+    returns Drawable3D from Draw
     is redefined;
 
 	
diff --git a/src/DDataStd/DDataStd_DrawPresentation.cdl b/src/DDataStd/DDataStd_DrawPresentation.cdl
index 439de02b22..91d9680058 100644
--- a/src/DDataStd/DDataStd_DrawPresentation.cdl
+++ b/src/DDataStd/DDataStd_DrawPresentation.cdl
@@ -54,7 +54,7 @@ is
     GetID(myclass) returns GUID from Standard;
     ---C++: return const &
 
-    Create returns mutable DrawPresentation from DDataStd;
+    Create returns DrawPresentation from DDataStd;
 
     SetDisplayed (me : mutable; status : Boolean from Standard);
     
@@ -71,12 +71,12 @@ is
 	---C++: return const &
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;    
+    returns Attribute from TDF;    
  
     Restore(me: mutable; with : Attribute from TDF);
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);     
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);     
 
 
     ---Purpose: call backs for viewer updating
diff --git a/src/DDataStd/DDataStd_TreeBrowser.cdl b/src/DDataStd/DDataStd_TreeBrowser.cdl
index 1db1a0c301..89363fbaff 100644
--- a/src/DDataStd/DDataStd_TreeBrowser.cdl
+++ b/src/DDataStd/DDataStd_TreeBrowser.cdl
@@ -35,12 +35,12 @@ uses
 is
 
     Create  (root : Label from TDF)
-    returns mutable TreeBrowser from DDataStd;
+    returns TreeBrowser from DDataStd;
     
     DrawOn (me; dis : in out Display);
     
     Copy (me) 
-    returns mutable Drawable3D from Draw
+    returns Drawable3D from Draw
     is redefined;
 
     Dump (me; S : in out OStream) 
diff --git a/src/DDocStd/DDocStd_DrawDocument.cdl b/src/DDocStd/DDocStd_DrawDocument.cdl
index 60b0319e71..3e92da8e27 100644
--- a/src/DDocStd/DDocStd_DrawDocument.cdl
+++ b/src/DDocStd/DDocStd_DrawDocument.cdl
@@ -30,14 +30,14 @@ is
     returns DrawDocument from DDocStd;
 
     Create (Doc : Document from TDocStd)
-    returns mutable DrawDocument from DDocStd;
+    returns DrawDocument from DDocStd;
 
     GetDocument(me) returns Document from TDocStd;
 
     DrawOn (me; dis : in out Display from Draw);
     
     Copy (me) 
-    returns mutable Drawable3D from Draw
+    returns Drawable3D from Draw
     is redefined;
 	
     Dump (me; S : in out OStream) 
diff --git a/src/DNaming/DNaming_BooleanOperationDriver.cdl b/src/DNaming/DNaming_BooleanOperationDriver.cdl
index b8347c5733..7c3a76510b 100644
--- a/src/DNaming/DNaming_BooleanOperationDriver.cdl
+++ b/src/DNaming/DNaming_BooleanOperationDriver.cdl
@@ -24,7 +24,7 @@ uses
      BooleanOperation from BRepAlgoAPI
 
 is
-    Create returns mutable BooleanOperationDriver from DNaming;
+    Create returns BooleanOperationDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_BoxDriver.cdl b/src/DNaming/DNaming_BoxDriver.cdl
index 7911adc7bd..e5e32c33bb 100644
--- a/src/DNaming/DNaming_BoxDriver.cdl
+++ b/src/DNaming/DNaming_BoxDriver.cdl
@@ -22,7 +22,7 @@ uses
      ExtendedString from TCollection,
      MakeBox     from BRepPrimAPI
 is
-    Create returns mutable BoxDriver from DNaming;
+    Create returns BoxDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_CylinderDriver.cdl b/src/DNaming/DNaming_CylinderDriver.cdl
index 6365145b9d..0886de4b84 100644
--- a/src/DNaming/DNaming_CylinderDriver.cdl
+++ b/src/DNaming/DNaming_CylinderDriver.cdl
@@ -25,7 +25,7 @@ uses
      MakeCylinder     from BRepPrimAPI
 
 is
-    Create returns mutable CylinderDriver from DNaming;
+    Create returns CylinderDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_FilletDriver.cdl b/src/DNaming/DNaming_FilletDriver.cdl
index 07c2420203..a9ca1d8363 100644
--- a/src/DNaming/DNaming_FilletDriver.cdl
+++ b/src/DNaming/DNaming_FilletDriver.cdl
@@ -26,7 +26,7 @@ uses
      Shape            from TopoDS
 
 is
-    Create returns mutable FilletDriver from DNaming;
+    Create returns FilletDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_Line3DDriver.cdl b/src/DNaming/DNaming_Line3DDriver.cdl
index e71e220dd2..4a3e1dd6c1 100644
--- a/src/DNaming/DNaming_Line3DDriver.cdl
+++ b/src/DNaming/DNaming_Line3DDriver.cdl
@@ -24,7 +24,7 @@ uses
      Wire             from TopoDS,
      Array1OfShape    from TopTools
 is
-  Create returns mutable Line3DDriver from DNaming;
+  Create returns Line3DDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_PointDriver.cdl b/src/DNaming/DNaming_PointDriver.cdl
index f1b31272c0..620a733c44 100644
--- a/src/DNaming/DNaming_PointDriver.cdl
+++ b/src/DNaming/DNaming_PointDriver.cdl
@@ -23,7 +23,7 @@ uses
      Function         from TFunction
 
 is
-    Create returns mutable PointDriver from DNaming;
+    Create returns PointDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_PrismDriver.cdl b/src/DNaming/DNaming_PrismDriver.cdl
index f5a46403c4..6231a31f58 100644
--- a/src/DNaming/DNaming_PrismDriver.cdl
+++ b/src/DNaming/DNaming_PrismDriver.cdl
@@ -24,7 +24,7 @@ uses
      MakePrism   from BRepPrimAPI, 
      Shape       from TopoDS
 is
-    Create returns mutable PrismDriver from DNaming;
+    Create returns PrismDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_RevolutionDriver.cdl b/src/DNaming/DNaming_RevolutionDriver.cdl
index 1e7fbbda0c..3fda6c93dd 100644
--- a/src/DNaming/DNaming_RevolutionDriver.cdl
+++ b/src/DNaming/DNaming_RevolutionDriver.cdl
@@ -24,7 +24,7 @@ uses
      MakeRevol   from BRepPrimAPI, 
      Shape       from TopoDS
 is
-    Create returns mutable RevolutionDriver from DNaming;
+    Create returns RevolutionDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_SelectionDriver.cdl b/src/DNaming/DNaming_SelectionDriver.cdl
index b4c588e9e2..9042576e8f 100644
--- a/src/DNaming/DNaming_SelectionDriver.cdl
+++ b/src/DNaming/DNaming_SelectionDriver.cdl
@@ -24,7 +24,7 @@ uses
      ExtendedString   from TCollection
 
 is
-    Create returns mutable SelectionDriver from DNaming;
+    Create returns SelectionDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_SphereDriver.cdl b/src/DNaming/DNaming_SphereDriver.cdl
index 09755acab3..d6e465dd39 100644
--- a/src/DNaming/DNaming_SphereDriver.cdl
+++ b/src/DNaming/DNaming_SphereDriver.cdl
@@ -25,7 +25,7 @@ uses
      MakeSphere  from BRepPrimAPI, 
      Shape       from TopoDS
 is
-    Create returns mutable SphereDriver from DNaming;
+    Create returns SphereDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/DNaming/DNaming_TransformationDriver.cdl b/src/DNaming/DNaming_TransformationDriver.cdl
index 8f48e79e72..6dce7d0a11 100644
--- a/src/DNaming/DNaming_TransformationDriver.cdl
+++ b/src/DNaming/DNaming_TransformationDriver.cdl
@@ -26,7 +26,7 @@ uses
      Trsf             from gp
 
 is
-    Create returns mutable TransformationDriver from DNaming;
+    Create returns TransformationDriver from DNaming;
     ---Purpose: Constructor
 
     ---Purpose: validation
diff --git a/src/Dico/Dico_Dictionary.cdl b/src/Dico/Dico_Dictionary.cdl
index 742ad09c0c..896fd3a387 100644
--- a/src/Dico/Dico_Dictionary.cdl
+++ b/src/Dico/Dico_Dictionary.cdl
@@ -105,13 +105,13 @@ raises NoSuchObject
 
     is
     
-    	Create returns mutable StackItem;
+    	Create returns StackItem;
 	---Purpose : Creates a StackItem with no Previous one
     
-    	Create (previous : mutable StackItem) returns mutable StackItem;
+    	Create (previous : StackItem) returns StackItem;
 	---Purpose : Creates a StackItem with a Previous one
 
-    	Previous (me) returns mutable StackItem  is static;
+    	Previous (me) returns StackItem  is static;
 	---Purpose : Returns the Previous Item (is Null if no Previous defined)
 
     	Value (me) returns Dictionary  is static;
@@ -136,7 +136,7 @@ is
     	    	-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
     	-- (methods having a String argument are duplicated String-CString)
 
-    Create returns mutable Dictionary;
+    Create returns Dictionary;
     ---Purpose : Creates a Dictionary cell.
     --           A Dictionary is always created then handled by its first cell
     --           After creating a Dictionary, user can call methods HasItem,
@@ -246,7 +246,7 @@ is
     Clear (me : mutable)  is static;
     ---Purpose : Clears all the Dictionary : all recorded Items are removed
 
-    Copy (me) returns mutable Dictionary  is static;
+    Copy (me) returns Dictionary  is static;
     ---Purpose : Copies the Dictionary as a Tree, without Copying the Items
 
     	-- --    Internal methods    -- --
@@ -254,33 +254,33 @@ is
     HasSub (me) returns Boolean  is static private;
     ---Purpose : Returns True if this cell has a subcell
 
-    Sub (me) returns mutable Dictionary  is static private;
+    Sub (me) returns Dictionary  is static private;
     ---Purpose : Returns subcell
 
     HasNext (me) returns Boolean  is static private;    
     ---Purpose : Returns True if this cell has a next cell
 
-    Next (me) returns mutable Dictionary  is static private;
+    Next (me) returns Dictionary  is static private;
     ---Purpose : Returns next cell
     
-    SetSub  (me : mutable; acell : mutable Dictionary)  is static private;
+    SetSub  (me : mutable; acell : Dictionary)  is static private;
     ---Purpose : Defines subcell
 
-    SetNext (me : mutable; acell : mutable Dictionary)  is static private;
+    SetNext (me : mutable; acell : Dictionary)  is static private;
     ---Purpose : Defines next cell
 
     SearchCell (me; name : CString; lmax : Size;
     	        car : Character; level : Size;
-    	    	acell : out mutable Dictionary; reslev : out Size;
+    	    	acell : out Dictionary; reslev : out Size;
     	        stat : out Integer)  is static private;
     ---Purpose : Internal method used to get an entry from a given name
 
     NewCell (me : mutable; name : CString; namlen : Size;
-    	     acell : in out mutable Dictionary; reslev : Size; stat : Integer)
+    	     acell : in out Dictionary; reslev : Size; stat : Integer)
 	     is static private;
     ---Purpose : Internal method used to create a new entry for a name
 
-    Complete (me; acell : out mutable Dictionary) returns Boolean  is static;
+    Complete (me; acell : out Dictionary) returns Boolean  is static;
     ---Purpose : Internal routine used for completion (returns True if success)
 
     HasIt (me) returns Boolean  is static private;
diff --git a/src/Draft/Draft_Modification.cdl b/src/Draft/Draft_Modification.cdl
index e2d33ead52..9aba1551b7 100644
--- a/src/Draft/Draft_Modification.cdl
+++ b/src/Draft/Draft_Modification.cdl
@@ -52,7 +52,7 @@ is
 
     Create(S: Shape from TopoDS)
     
-    	returns mutable Modification from Draft;
+    	returns Modification from Draft;
 
 
     Clear(me: mutable)
@@ -301,7 +301,7 @@ is
 			  NeutralPlane: Pln         from gp; 
                           Flag        : Boolean     from Standard = Standard_True)
 
-	returns mutable Curve from Geom
+	returns Curve from Geom
 	is static private;
 
 
@@ -311,7 +311,7 @@ is
                             Angle       : Real        from Standard; 
 			    NeutralPlane: Pln         from gp)
 
-	returns mutable Surface from Geom
+	returns Surface from Geom
 	is static private;
 
 
diff --git a/src/Draw/Draw_Axis2D.cdl b/src/Draw/Draw_Axis2D.cdl
index 9b86d50310..5a61a1edf7 100644
--- a/src/Draw/Draw_Axis2D.cdl
+++ b/src/Draw/Draw_Axis2D.cdl
@@ -26,13 +26,13 @@ uses Pnt2d from gp,
 is
 
     Create(col : Color; Size : Integer = 5)
-    returns mutable Axis2D;
+    returns Axis2D;
 
     Create(p : Pnt2d; col : Color; Size : Integer = 5)
-    returns mutable Axis2D;
+    returns Axis2D;
     
     Create(A : Ax22d from gp; col : Color; Size : Integer = 5)
-    returns mutable Axis2D;
+    returns Axis2D;
     
     DrawOn(me; dis : in out Display);
 
diff --git a/src/Draw/Draw_Axis3D.cdl b/src/Draw/Draw_Axis3D.cdl
index bcd149e0e3..0d09b875ed 100644
--- a/src/Draw/Draw_Axis3D.cdl
+++ b/src/Draw/Draw_Axis3D.cdl
@@ -26,13 +26,13 @@ uses Pnt from gp,
 is
 
     Create(col : Color; Size : Integer = 5)
-    returns mutable Axis3D;
+    returns Axis3D;
 
     Create(p : Pnt; col : Color; Size : Integer = 5)
-    returns mutable Axis3D;
+    returns Axis3D;
     
     Create(A : Ax3 from gp; col : Color; Size : Integer = 5)
-    returns mutable Axis3D;
+    returns Axis3D;
     
     DrawOn(me; dis : in out Display);
 
diff --git a/src/Draw/Draw_Box.cdl b/src/Draw/Draw_Box.cdl
index e6f8ec3642..091715d7d2 100644
--- a/src/Draw/Draw_Box.cdl
+++ b/src/Draw/Draw_Box.cdl
@@ -25,7 +25,7 @@ uses Pnt from gp,
 is
 
     Create(p1,p2 : Pnt; col : Color)
-    returns mutable Box;
+    returns Box;
     
     DrawOn(me; dis : in out Display);
     
diff --git a/src/Draw/Draw_Chronometer.cdl b/src/Draw/Draw_Chronometer.cdl
index 79edf4d5f6..f081e8424c 100644
--- a/src/Draw/Draw_Chronometer.cdl
+++ b/src/Draw/Draw_Chronometer.cdl
@@ -26,7 +26,7 @@ uses
 
 is
 
-    Create returns mutable Chronometer from Draw;
+    Create returns Chronometer from Draw;
     
     
     Timer(me : mutable) returns Timer from OSD
@@ -36,7 +36,7 @@ is
     DrawOn(me; dis : in out Display);
 	---Purpose: Does nothhing,
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
     is redefined;
 	
diff --git a/src/Draw/Draw_Circle2D.cdl b/src/Draw/Draw_Circle2D.cdl
index bf7169d050..c12126e96b 100644
--- a/src/Draw/Draw_Circle2D.cdl
+++ b/src/Draw/Draw_Circle2D.cdl
@@ -26,7 +26,7 @@ uses
 is
 
     Create(C : Circ2d from gp; A1,A2 : Real; col : Color)
-    returns mutable Circle2D;
+    returns Circle2D;
     
     DrawOn(me; dis : in out Display);
 
diff --git a/src/Draw/Draw_Circle3D.cdl b/src/Draw/Draw_Circle3D.cdl
index 52d403b020..66f48408bd 100644
--- a/src/Draw/Draw_Circle3D.cdl
+++ b/src/Draw/Draw_Circle3D.cdl
@@ -26,7 +26,7 @@ uses
 is
 
     Create(C : Circ from gp; A1,A2 : Real; col : Color)
-    returns mutable Circle3D;
+    returns Circle3D;
     
     DrawOn(me; dis : in out Display);
 
diff --git a/src/Draw/Draw_Drawable3D.cdl b/src/Draw/Draw_Drawable3D.cdl
index a81d7424a2..3b471084fb 100644
--- a/src/Draw/Draw_Drawable3D.cdl
+++ b/src/Draw/Draw_Drawable3D.cdl
@@ -34,7 +34,7 @@ is
 	---Purpose: Returs True if the pick is outside the box
     is virtual;
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
     is virtual;
 	---Purpose: For variable copy.
 	
diff --git a/src/Draw/Draw_Grid.cdl b/src/Draw/Draw_Grid.cdl
index e932cb615d..f19808e732 100644
--- a/src/Draw/Draw_Grid.cdl
+++ b/src/Draw/Draw_Grid.cdl
@@ -25,7 +25,7 @@ is
      
     	---Purpose: Creates a grid.
 
-	returns mutable Grid from Draw ;
+	returns Grid from Draw ;
 
 
     Steps (me : mutable; StepX, StepY, StepZ : Real from Standard)
diff --git a/src/Draw/Draw_Marker2D.cdl b/src/Draw/Draw_Marker2D.cdl
index 1a3825058a..371090def9 100644
--- a/src/Draw/Draw_Marker2D.cdl
+++ b/src/Draw/Draw_Marker2D.cdl
@@ -26,10 +26,10 @@ uses
 
 is
     Create(P : Pnt2d from gp; T : MarkerShape from Draw; C : Color from Draw; 
-    	Size : Integer = 5) returns mutable Marker2D from Draw;
+    	Size : Integer = 5) returns Marker2D from Draw;
 	
     Create(P : Pnt2d from gp; T : MarkerShape from Draw; C : Color from Draw; 
-    	RSize : Real) returns mutable Marker2D from Draw;
+    	RSize : Real) returns Marker2D from Draw;
     
     ChangePos(me : mutable) returns Pnt2d from gp;
     ---C++: return &
diff --git a/src/Draw/Draw_Marker3D.cdl b/src/Draw/Draw_Marker3D.cdl
index d80bdb146b..f1cb646c4a 100644
--- a/src/Draw/Draw_Marker3D.cdl
+++ b/src/Draw/Draw_Marker3D.cdl
@@ -26,10 +26,10 @@ uses
 
 is
     Create(P : Pnt from gp; T : MarkerShape from Draw; C : Color from Draw; 
-    	ISize : Integer = 5) returns mutable Marker3D from Draw;
+    	ISize : Integer = 5) returns Marker3D from Draw;
 	
     Create(P : Pnt from gp; T : MarkerShape from Draw; C : Color from Draw; 
-    	RSize : Real) returns mutable Marker3D from Draw;
+    	RSize : Real) returns Marker3D from Draw;
 
     ChangePos(me : mutable) returns Pnt from gp;
     ---C++: return &
diff --git a/src/Draw/Draw_Number.cdl b/src/Draw/Draw_Number.cdl
index 52630b107f..dc0335a61a 100644
--- a/src/Draw/Draw_Number.cdl
+++ b/src/Draw/Draw_Number.cdl
@@ -24,7 +24,7 @@ uses
     Interpretor from Draw
 
 is
-    Create (V : Real) returns mutable Number from Draw;
+    Create (V : Real) returns Number from Draw;
 
     Value(me) returns Real
     is static;
@@ -35,7 +35,7 @@ is
     DrawOn(me; dis : in out Display);
 	---Purpose: Does nothhing,
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
     is redefined;
 	
diff --git a/src/Draw/Draw_Segment2D.cdl b/src/Draw/Draw_Segment2D.cdl
index d32a3f5f9a..186425ba65 100644
--- a/src/Draw/Draw_Segment2D.cdl
+++ b/src/Draw/Draw_Segment2D.cdl
@@ -26,7 +26,7 @@ uses Pnt2d from gp,
 is
 
     Create(p1,p2 : Pnt2d; col : Color)
-    returns mutable Segment2D;
+    returns Segment2D;
     
     DrawOn(me; dis : in out Display);
     
diff --git a/src/Draw/Draw_Segment3D.cdl b/src/Draw/Draw_Segment3D.cdl
index 16919cfe0a..948e333aad 100644
--- a/src/Draw/Draw_Segment3D.cdl
+++ b/src/Draw/Draw_Segment3D.cdl
@@ -25,7 +25,7 @@ uses Pnt from gp,
 is
 
     Create(p1,p2 : Pnt; col : Color)
-    returns mutable Segment3D;
+    returns Segment3D;
     
     DrawOn(me; dis : in out Display);
     
diff --git a/src/Draw/Draw_Text2D.cdl b/src/Draw/Draw_Text2D.cdl
index 29b3570c8f..b8116648bd 100644
--- a/src/Draw/Draw_Text2D.cdl
+++ b/src/Draw/Draw_Text2D.cdl
@@ -26,11 +26,11 @@ uses Pnt2d from gp,
 is
 
     Create(p : Pnt2d; T : CString; col : Color)
-    returns mutable Text2D from Draw;
+    returns Text2D from Draw;
     
     Create(p : Pnt2d; T : CString; col : Color;
     	   moveX : Integer; moveY : Integer)
-    returns mutable Text2D from Draw;
+    returns Text2D from Draw;
     
     SetPnt2d(me : mutable; p : Pnt2d);
 
diff --git a/src/Draw/Draw_Text3D.cdl b/src/Draw/Draw_Text3D.cdl
index 69313687b5..e7c0bb5c79 100644
--- a/src/Draw/Draw_Text3D.cdl
+++ b/src/Draw/Draw_Text3D.cdl
@@ -26,11 +26,11 @@ uses Pnt from gp,
 is
 
     Create(p : Pnt; T : CString; col : Color)
-    returns mutable Text3D from Draw;
+    returns Text3D from Draw;
     
     Create(p : Pnt; T : CString; col : Color;
     	   moveX : Real; moveY : Real)
-    returns mutable Text3D from Draw;
+    returns Text3D from Draw;
 
     SetPnt(me : mutable; p : Pnt);
    
diff --git a/src/DrawDim/DrawDim_Angle.cdl b/src/DrawDim/DrawDim_Angle.cdl
index bd8f491728..04caf8d132 100644
--- a/src/DrawDim/DrawDim_Angle.cdl
+++ b/src/DrawDim/DrawDim_Angle.cdl
@@ -25,7 +25,7 @@ is
 
     Create (plane1 : Face from TopoDS; 
             plane2 : Face from TopoDS)
-    returns mutable Angle from DrawDim;
+    returns Angle from DrawDim;
     
     Plane1 (me) returns Face from TopoDS;
 	---C++: return const&
diff --git a/src/DrawDim/DrawDim_Distance.cdl b/src/DrawDim/DrawDim_Distance.cdl
index 43f395b967..d1f6123432 100644
--- a/src/DrawDim/DrawDim_Distance.cdl
+++ b/src/DrawDim/DrawDim_Distance.cdl
@@ -24,10 +24,10 @@ uses Face    from TopoDS,
 is
 
     Create (plane1 : Face from TopoDS; plane2 : Face from TopoDS)
-    returns mutable Distance from DrawDim;
+    returns Distance from DrawDim;
 
     Create (plane1 : Face from TopoDS)
-    returns mutable Distance from DrawDim;
+    returns Distance from DrawDim;
     
     Plane1 (me) returns Face from TopoDS;
 	---C++: return const&
diff --git a/src/DrawDim/DrawDim_PlanarAngle.cdl b/src/DrawDim/DrawDim_PlanarAngle.cdl
index db3355fd23..98c5e4ee05 100644
--- a/src/DrawDim/DrawDim_PlanarAngle.cdl
+++ b/src/DrawDim/DrawDim_PlanarAngle.cdl
@@ -28,11 +28,11 @@ is
     Create (plane : Face  from TopoDS;
             line1 : Shape from TopoDS; 
             line2 : Shape from TopoDS)
-    returns mutable PlanarAngle from DrawDim;    
+    returns PlanarAngle from DrawDim;    
 
     Create (line1 : Shape from TopoDS; 
             line2 : Shape from TopoDS)
-    returns mutable PlanarAngle from DrawDim;
+    returns PlanarAngle from DrawDim;
     
     Sector (me : mutable; inverted, reversed : Boolean from Standard);
     
diff --git a/src/DrawDim/DrawDim_PlanarDiameter.cdl b/src/DrawDim/DrawDim_PlanarDiameter.cdl
index edf3477622..64565cdbb9 100644
--- a/src/DrawDim/DrawDim_PlanarDiameter.cdl
+++ b/src/DrawDim/DrawDim_PlanarDiameter.cdl
@@ -28,10 +28,10 @@ is
 
     Create (plane  : Face  from TopoDS;
             circle : Shape from TopoDS)
-    returns mutable PlanarDiameter from DrawDim;    
+    returns PlanarDiameter from DrawDim;    
 
     Create (circle : Shape from TopoDS)
-    returns mutable PlanarDiameter from DrawDim;
+    returns PlanarDiameter from DrawDim;
     
     DrawOn(me; dis : in out Display);
     
diff --git a/src/DrawDim/DrawDim_PlanarDistance.cdl b/src/DrawDim/DrawDim_PlanarDistance.cdl
index 671f4161c7..71b0e95a9a 100644
--- a/src/DrawDim/DrawDim_PlanarDistance.cdl
+++ b/src/DrawDim/DrawDim_PlanarDistance.cdl
@@ -32,11 +32,11 @@ is
     Create (plane  : Face from TopoDS;
             point1 : Shape from TopoDS;
             point2 : Shape from TopoDS)
-    returns mutable PlanarDistance from DrawDim;
+    returns PlanarDistance from DrawDim;
     
     Create (geom1 : Shape from TopoDS;
             geom2 : Shape from TopoDS)
-    returns mutable PlanarDistance from DrawDim; 
+    returns PlanarDistance from DrawDim; 
     
     DrawOn(me; dis : in out Display);
 
diff --git a/src/DrawDim/DrawDim_PlanarRadius.cdl b/src/DrawDim/DrawDim_PlanarRadius.cdl
index c4ae7b39ae..4c6acd9962 100644
--- a/src/DrawDim/DrawDim_PlanarRadius.cdl
+++ b/src/DrawDim/DrawDim_PlanarRadius.cdl
@@ -27,10 +27,10 @@ is
 
     Create (plane  : Face  from TopoDS;
             circle : Shape from TopoDS)
-    returns mutable PlanarRadius from DrawDim;    
+    returns PlanarRadius from DrawDim;    
 
     Create (circle : Shape from TopoDS)
-    returns mutable PlanarRadius from DrawDim;
+    returns PlanarRadius from DrawDim;
     
     DrawOn(me; dis : in out Display);
     
diff --git a/src/DrawDim/DrawDim_Radius.cdl b/src/DrawDim/DrawDim_Radius.cdl
index 7df7c693f5..df118e0189 100644
--- a/src/DrawDim/DrawDim_Radius.cdl
+++ b/src/DrawDim/DrawDim_Radius.cdl
@@ -24,7 +24,7 @@ uses Face    from TopoDS,
 is
 
     Create (cylinder : Face from TopoDS)
-    returns mutable Radius from DrawDim;
+    returns Radius from DrawDim;
     
     Cylinder (me) returns Face from TopoDS;
     ---C++: return const&
diff --git a/src/DrawFairCurve/DrawFairCurve_Batten.cdl b/src/DrawFairCurve/DrawFairCurve_Batten.cdl
index 760676bc29..2f418b7de0 100644
--- a/src/DrawFairCurve/DrawFairCurve_Batten.cdl
+++ b/src/DrawFairCurve/DrawFairCurve_Batten.cdl
@@ -24,7 +24,7 @@ uses Batten from FairCurve,
 
 is
    Create(TheBatten : Address)
-   returns mutable Batten from DrawFairCurve;
+   returns Batten from DrawFairCurve;
    Compute(me:mutable);
    SetPoint(me: mutable; Side : Integer; Point : Pnt2d);
    SetAngle(me: mutable; Side : Integer; Angle : Real);
diff --git a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cdl b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cdl
index a96fde3e62..8b1a754036 100644
--- a/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cdl
+++ b/src/DrawFairCurve/DrawFairCurve_MinimalVariation.cdl
@@ -22,7 +22,7 @@ uses MinimalVariation from FairCurve
 
 is
    Create(TheMVC : Address)
-   returns mutable MinimalVariation from DrawFairCurve;
+   returns MinimalVariation from DrawFairCurve;
    
    SetCurvature(me: mutable; Side : Integer; Rho : Real);
    SetPhysicalRatio(me: mutable; Ratio : Real);
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineCurve.cdl b/src/DrawTrSurf/DrawTrSurf_BSplineCurve.cdl
index dbba5c3f06..6992d18db8 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineCurve.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineCurve.cdl
@@ -37,7 +37,7 @@ is
         --- Purpose :
         --  creates a drawable BSpline curve from a BSpline curve of 
         --  package Geom.
-     returns mutable BSplineCurve from DrawTrSurf;
+     returns BSplineCurve from DrawTrSurf;
 
 
 
@@ -49,7 +49,7 @@ is
         --- Purpose :
         --  creates a drawable BSpline curve from a BSpline curve of 
         --  package Geom.
-     returns mutable BSplineCurve from DrawTrSurf;
+     returns BSplineCurve from DrawTrSurf;
 
 
   DrawOn (me; dis : in out Display from Draw)
@@ -129,7 +129,7 @@ is
         ---C++: inline
      is static;
     
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;	
     
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cdl b/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cdl
index d8eec58836..6231342e5f 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cdl
@@ -37,14 +37,14 @@ is
         --- Purpose :
         --  creates a drawable BSpline curve from a BSpline curve of 
         --  package Geom2d.
-     returns mutable BSplineCurve2d from DrawTrSurf;
+     returns BSplineCurve2d from DrawTrSurf;
 
 
   Create (C : BSplineCurve from Geom2d;
           CurvColor, PolesColor, KnotsColor : Color from Draw;
           KnotsShape : MarkerShape from Draw; KnotsSize : Integer;
           ShowPoles, ShowKnots : Boolean; Discret : Integer)
-     returns mutable BSplineCurve2d from DrawTrSurf;
+     returns BSplineCurve2d from DrawTrSurf;
 
 
   DrawOn (me; dis : in out Display from Draw)
@@ -99,7 +99,7 @@ is
         ---C++: inline
      is static;
     
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
   
diff --git a/src/DrawTrSurf/DrawTrSurf_BSplineSurface.cdl b/src/DrawTrSurf/DrawTrSurf_BSplineSurface.cdl
index d6b2e5169c..2d6cf5a6bf 100644
--- a/src/DrawTrSurf/DrawTrSurf_BSplineSurface.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_BSplineSurface.cdl
@@ -36,7 +36,7 @@ is
 
 
   Create (S : BSplineSurface from Geom)
-     returns mutable BSplineSurface from DrawTrSurf;
+     returns BSplineSurface from DrawTrSurf;
         --- Purpose : default drawing mode.
         --  The isoparametric curves corresponding to the knots values are 
         --  drawn.
@@ -51,7 +51,7 @@ is
           KnotsShape : MarkerShape from Draw; KnotsSize : Integer;
           ShowPoles, ShowKnots : Boolean; Discret : Integer; Deflection : Real;
           DrawMode : Integer)
-     returns mutable BSplineSurface from DrawTrSurf;
+     returns BSplineSurface from DrawTrSurf;
         --- Purpose :
         --  The isoparametric curves corresponding to the knots values are 
         --  drawn.
@@ -64,7 +64,7 @@ is
           KnotsShape : MarkerShape from Draw; KnotsSize : Integer;
           ShowPoles, ShowKnots : Boolean; Discret : Integer; Deflection : Real;
           DrawMode : Integer)
-     returns mutable BSplineSurface from DrawTrSurf;
+     returns BSplineSurface from DrawTrSurf;
 	--- Purpose : Parametric equidistant iso curves are drawn.
 
 
@@ -147,7 +147,7 @@ is
         ---C++: inline
      is static;
     
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
 	
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierCurve.cdl b/src/DrawTrSurf/DrawTrSurf_BezierCurve.cdl
index a0ab551a98..28ab049e6d 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierCurve.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_BezierCurve.cdl
@@ -36,14 +36,14 @@ is
         --- Purpose :
         --  creates a drawable Bezier curve from a Bezier curve of 
         --  package Geom.
-     returns mutable BezierCurve from DrawTrSurf;
+     returns BezierCurve from DrawTrSurf;
 
 
   Create (C : BezierCurve from Geom;
           CurvColor, PolesColor : Color from Draw;
           ShowPoles : Boolean; Discret : Integer;Deflection : Real;
           DrawMode : Integer)
-     returns mutable BezierCurve from DrawTrSurf;
+     returns BezierCurve from DrawTrSurf;
 
 
   DrawOn (me; dis : in out Display from Draw)
@@ -78,7 +78,7 @@ is
         ---C++: inline
      is static;
     
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
   
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cdl b/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cdl
index 8c3a838e1d..f38353f169 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cdl
@@ -36,13 +36,13 @@ is
         --- Purpose :
         --  creates a drawable Bezier curve from a Bezier curve of 
         --  package Geom2d.
-     returns mutable BezierCurve2d from DrawTrSurf;
+     returns BezierCurve2d from DrawTrSurf;
 
 
   Create (C : BezierCurve from Geom2d;
           CurvColor, PolesColor : Color from Draw;
           ShowPoles : Boolean; Discret : Integer)
-     returns mutable BezierCurve2d from DrawTrSurf;
+     returns BezierCurve2d from DrawTrSurf;
 
 
   DrawOn (me; dis : in out Display from Draw)
@@ -76,7 +76,7 @@ is
         ---C++: inline
      is static;
     
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
   
diff --git a/src/DrawTrSurf/DrawTrSurf_BezierSurface.cdl b/src/DrawTrSurf/DrawTrSurf_BezierSurface.cdl
index bbab18e984..e3345724f8 100644
--- a/src/DrawTrSurf/DrawTrSurf_BezierSurface.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_BezierSurface.cdl
@@ -33,7 +33,7 @@ is
         --- Purpose :
         --  creates a drawable Bezier curve from a Bezier curve of 
         --  package Geom.
-     returns mutable BezierSurface from DrawTrSurf;
+     returns BezierSurface from DrawTrSurf;
 
 
 
@@ -42,7 +42,7 @@ is
           BoundsColor, IsosColor, PolesColor : Color from Draw;
           ShowPoles : Boolean; Discret : Integer;Deflection : Real;
           DrawMode : Integer)
-     returns mutable BezierSurface from DrawTrSurf;
+     returns BezierSurface from DrawTrSurf;
 
 
   DrawOn (me; dis : in out Display from Draw)
@@ -71,7 +71,7 @@ is
         ---C++: inline
      is static;
     
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
   
diff --git a/src/DrawTrSurf/DrawTrSurf_Curve.cdl b/src/DrawTrSurf/DrawTrSurf_Curve.cdl
index a6e401af5c..764bb00450 100644
--- a/src/DrawTrSurf/DrawTrSurf_Curve.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_Curve.cdl
@@ -36,7 +36,7 @@ is
   Create (C : Curve from Geom; DispOrigin : Boolean from Standard = Standard_True)
         --- Purpose :
         --  creates a drawable curve from a curve of package Geom.
-     returns mutable Curve from DrawTrSurf;
+     returns Curve from DrawTrSurf;
 
 
   Create (C : Curve from Geom; aColor : Color from Draw; Discret : Integer;
@@ -45,7 +45,7 @@ is
           DispCurvRadius : Boolean  = Standard_False;
           RadiusMax : Real = 1.0e3;
 	  RatioOfRadius : Real = 0.1)
-     returns mutable Curve from DrawTrSurf;
+     returns Curve from DrawTrSurf;
 
 
   DrawOn (me; dis : in out Display from Draw);
@@ -94,7 +94,7 @@ is
         ---C++: inline
      is static;   
      
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
   
diff --git a/src/DrawTrSurf/DrawTrSurf_Curve2d.cdl b/src/DrawTrSurf/DrawTrSurf_Curve2d.cdl
index b84b05a898..1e493d51ca 100644
--- a/src/DrawTrSurf/DrawTrSurf_Curve2d.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_Curve2d.cdl
@@ -43,7 +43,7 @@ is
           DispOrigin : Boolean from Standard = Standard_True)
         --- Purpose :
         --  creates a drawable curve from a curve of package Geom2d.
-     returns mutable Curve2d from DrawTrSurf;
+     returns Curve2d from DrawTrSurf;
 
 
   Create (C : Curve from Geom2d; aColor : Color from Draw; Discret :Integer;
@@ -51,7 +51,7 @@ is
           DispCurvRadius : Boolean  = Standard_False;
           RadiusMax : Real = 1.0e3;
 	  RatioOfRadius : Real = 0.1)
-     returns mutable Curve2d from DrawTrSurf;
+     returns Curve2d from DrawTrSurf;
 
 
   DrawOn (me; dis : in out Display from Draw);
@@ -95,7 +95,7 @@ is
      is static;     
      
  
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
 	
diff --git a/src/DrawTrSurf/DrawTrSurf_Point.cdl b/src/DrawTrSurf/DrawTrSurf_Point.cdl
index f53fc1438a..d5f64c29b0 100644
--- a/src/DrawTrSurf/DrawTrSurf_Point.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_Point.cdl
@@ -32,12 +32,12 @@ is
     Create( P : Pnt from gp; 
     	    Shape : MarkerShape from Draw;
 	    Col   : Color from Draw) 
-    returns mutable Point from DrawTrSurf;
+    returns Point from DrawTrSurf;
     
     Create( P : Pnt2d from gp; 
     	    Shape : MarkerShape from Draw;
 	    Col   : Color from Draw) 
-    returns mutable Point from DrawTrSurf;
+    returns Point from DrawTrSurf;
     
     DrawOn (me; dis : in out Display from Draw);
      
@@ -69,7 +69,7 @@ is
   Shape(me) returns MarkerShape from Draw
   is  static;
      
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
   
diff --git a/src/DrawTrSurf/DrawTrSurf_Polygon2D.cdl b/src/DrawTrSurf/DrawTrSurf_Polygon2D.cdl
index 1681b3a243..a0d3de3f7c 100644
--- a/src/DrawTrSurf/DrawTrSurf_Polygon2D.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_Polygon2D.cdl
@@ -29,7 +29,7 @@ uses Polygon2D   from Poly,
 is
 
     Create(P: Polygon2D from Poly)
-    returns mutable Polygon2D from DrawTrSurf;
+    returns Polygon2D from DrawTrSurf;
     
     Polygon2D(me) returns Polygon2D from Poly;
     
@@ -39,7 +39,7 @@ is
     
     DrawOn(me; dis: in out Display);
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
     is redefined;
 	---Purpose: For variable copy.
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Polygon3D.cdl b/src/DrawTrSurf/DrawTrSurf_Polygon3D.cdl
index cded5ce6c0..69801e94d8 100644
--- a/src/DrawTrSurf/DrawTrSurf_Polygon3D.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_Polygon3D.cdl
@@ -29,7 +29,7 @@ uses Polygon3D   from Poly,
 is
 
     Create(P: Polygon3D from Poly)
-    returns mutable Polygon3D from DrawTrSurf;
+    returns Polygon3D from DrawTrSurf;
     
     Polygon3D(me) returns Polygon3D from Poly;
     
@@ -39,7 +39,7 @@ is
     
     DrawOn(me; dis: in out Display);
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
     is redefined;
 	---Purpose: For variable copy.
 
diff --git a/src/DrawTrSurf/DrawTrSurf_Surface.cdl b/src/DrawTrSurf/DrawTrSurf_Surface.cdl
index c39f9796a1..9a9d3d7550 100644
--- a/src/DrawTrSurf/DrawTrSurf_Surface.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_Surface.cdl
@@ -36,7 +36,7 @@ is
         --  The boundaries are yellow, the isoparametric curves are blues.
         --  For the discretisation 50 points are computed in each parametric
         --  direction.
-     returns mutable Surface from DrawTrSurf;
+     returns Surface from DrawTrSurf;
 
 
 
@@ -46,7 +46,7 @@ is
           Discret : Integer;
           Deflection : Real;
           DrawMode  : Integer)
-     returns mutable Surface from DrawTrSurf;
+     returns Surface from DrawTrSurf;
 
 
   BoundsColor (me) returns Color from Draw
@@ -96,7 +96,7 @@ is
   ShowIsos (me : mutable; Nu, Nv : Integer) is virtual;
         --- Purpose : change the number of isoparametric curves to be drawn.
 
-  Copy(me) returns mutable Drawable3D from Draw
+  Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
   is redefined;
   
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation.cdl b/src/DrawTrSurf/DrawTrSurf_Triangulation.cdl
index 6877b35bc1..d67c75994c 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation.cdl
@@ -32,7 +32,7 @@ uses
 is
 
     Create(T : Triangulation from Poly)
-    returns mutable Triangulation from DrawTrSurf;
+    returns Triangulation from DrawTrSurf;
     
     Triangulation(me)
     returns Triangulation from Poly;
@@ -47,7 +47,7 @@ is
 
     DrawOn(me; dis : in out Display);
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
     is redefined;
 	---Purpose: For variable copy.
 	
diff --git a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cdl b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cdl
index b0615d1742..3dd4cbf5e7 100644
--- a/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cdl
+++ b/src/DrawTrSurf/DrawTrSurf_Triangulation2D.cdl
@@ -33,14 +33,14 @@ uses
 is
 
     Create(T : Triangulation from Poly)
-    returns mutable Triangulation2D from DrawTrSurf;
+    returns Triangulation2D from DrawTrSurf;
     
     Triangulation(me)
     returns Triangulation from Poly;
     
     DrawOn(me; dis : in out Display);
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
     is redefined;
 	---Purpose: For variable copy.
 	
diff --git a/src/Expr/Expr_Absolute.cdl b/src/Expr/Expr_Absolute.cdl
index d110cabad4..0a3ffd8876 100644
--- a/src/Expr/Expr_Absolute.cdl
+++ b/src/Expr/Expr_Absolute.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the Abs of <exp>
-    returns mutable Absolute;
+    returns Absolute;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_ArcCosine.cdl b/src/Expr/Expr_ArcCosine.cdl
index c0e6a7f14d..ab6c9b7abe 100644
--- a/src/Expr/Expr_ArcCosine.cdl
+++ b/src/Expr/Expr_ArcCosine.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the Arccos of <exp>
-    returns mutable ArcCosine;
+    returns ArcCosine;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_ArcSine.cdl b/src/Expr/Expr_ArcSine.cdl
index c5acef5b83..2608154687 100644
--- a/src/Expr/Expr_ArcSine.cdl
+++ b/src/Expr/Expr_ArcSine.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the Arcsin of <exp>
-    returns mutable ArcSine;
+    returns ArcSine;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_ArcTangent.cdl b/src/Expr/Expr_ArcTangent.cdl
index 29fe31a3d0..4db8c16908 100644
--- a/src/Expr/Expr_ArcTangent.cdl
+++ b/src/Expr/Expr_ArcTangent.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the Arctan of <exp>.
-    returns mutable ArcTangent;
+    returns ArcTangent;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_ArgCosh.cdl b/src/Expr/Expr_ArgCosh.cdl
index d0d1a1a745..2e1cacd321 100644
--- a/src/Expr/Expr_ArgCosh.cdl
+++ b/src/Expr/Expr_ArgCosh.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the ArgCosh of <exp>
-    returns mutable ArgCosh;
+    returns ArgCosh;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_ArgSinh.cdl b/src/Expr/Expr_ArgSinh.cdl
index 7cd36004a3..11a60c9a95 100644
--- a/src/Expr/Expr_ArgSinh.cdl
+++ b/src/Expr/Expr_ArgSinh.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the ArgSinh of <exp>.
-    returns mutable ArgSinh;
+    returns ArgSinh;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_ArgTanh.cdl b/src/Expr/Expr_ArgTanh.cdl
index bbc8629c3d..78ef6ae050 100644
--- a/src/Expr/Expr_ArgTanh.cdl
+++ b/src/Expr/Expr_ArgTanh.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the Argtanh of <exp>.
-    returns mutable ArgTanh;
+    returns ArgTanh;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_BinaryFunction.cdl b/src/Expr/Expr_BinaryFunction.cdl
index 20b93ce35a..144a92797c 100644
--- a/src/Expr/Expr_BinaryFunction.cdl
+++ b/src/Expr/Expr_BinaryFunction.cdl
@@ -37,7 +37,7 @@ is
     Create(func : GeneralFunction; exp1,exp2 : GeneralExpression)
     ---Purpose: Creates <me> as <func> (<exp1>,<exp2>).
     --          Raises exception if <func> is not binary.
-    returns mutable BinaryFunction
+    returns BinaryFunction
     raises InvalidFunction;
 
     Function(me)
@@ -52,7 +52,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Cosh.cdl b/src/Expr/Expr_Cosh.cdl
index 857e4a81be..3091fbe318 100644
--- a/src/Expr/Expr_Cosh.cdl
+++ b/src/Expr/Expr_Cosh.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the Cosh of <exp>
-    returns mutable Cosh;
+    returns Cosh;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Cosine.cdl b/src/Expr/Expr_Cosine.cdl
index 24e4558491..9d49ab0556 100644
--- a/src/Expr/Expr_Cosine.cdl
+++ b/src/Expr/Expr_Cosine.cdl
@@ -31,7 +31,7 @@ is
 
     Create(Exp : GeneralExpression)
     ---Purpose: Creates the cosine of Exp
-    returns mutable Cosine;
+    returns Cosine;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Difference.cdl b/src/Expr/Expr_Difference.cdl
index b163a15157..931fa0291a 100644
--- a/src/Expr/Expr_Difference.cdl
+++ b/src/Expr/Expr_Difference.cdl
@@ -32,7 +32,7 @@ is
 
     Create(exp1,exp2 : GeneralExpression)
     ---Purpose: Creates the difference <exp1> - <exp2>.
-    returns mutable Difference;
+    returns Difference;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -42,7 +42,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Different.cdl b/src/Expr/Expr_Different.cdl
index 90c811ab40..5bce3dc988 100644
--- a/src/Expr/Expr_Different.cdl
+++ b/src/Expr/Expr_Different.cdl
@@ -28,7 +28,7 @@ is
 
     Create(exp1 : GeneralExpression ; exp2 : GeneralExpression)
     ---Purpose: Creates the relation <exp1> # <exp2>.
-    returns mutable Different;
+    returns Different;
 
     IsSatisfied(me)
     returns Boolean;
@@ -37,7 +37,7 @@ is
     ---Purpose: Returns a GeneralRelation after replacement of
     --          NamedUnknowns by an associated expression, and after
     --          values computation.
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NumericError;
     
     Simplify(me : mutable)
@@ -48,7 +48,7 @@ is
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and 
     --          functions. 
-    returns mutable like me;
+    returns like me;
     
     String(me)
     ---Purpose: returns a string representing <me> in a readable way.
diff --git a/src/Expr/Expr_Division.cdl b/src/Expr/Expr_Division.cdl
index 151a46b0a5..ca384efaac 100644
--- a/src/Expr/Expr_Division.cdl
+++ b/src/Expr/Expr_Division.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp1,exp2 : GeneralExpression)
     ---Purpose: Creates the division <exp1>/<exp2>
-    returns mutable Division;
+    returns Division;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Equal.cdl b/src/Expr/Expr_Equal.cdl
index b83a12b85b..6e55ffb676 100644
--- a/src/Expr/Expr_Equal.cdl
+++ b/src/Expr/Expr_Equal.cdl
@@ -28,7 +28,7 @@ is
 
     Create(exp1 : GeneralExpression ; exp2 : GeneralExpression)
     ---Purpose: Creates the relation <exp1> = <exp2>.
-    returns mutable Equal;
+    returns Equal;
 
     IsSatisfied(me)
     returns Boolean;
@@ -37,7 +37,7 @@ is
     ---Purpose: returns a GeneralRelation after replacement of
     --          NamedUnknowns by an associated expression and after
     --          values computation.
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NumericError;
     
     Simplify(me : mutable)
@@ -47,7 +47,7 @@ is
     
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     String(me)
     ---Purpose: returns a string representing <me> in a readable way.
diff --git a/src/Expr/Expr_Exponential.cdl b/src/Expr/Expr_Exponential.cdl
index e326a9be88..7668270200 100644
--- a/src/Expr/Expr_Exponential.cdl
+++ b/src/Expr/Expr_Exponential.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the exponential of <exp>
-    returns mutable Exponential;
+    returns Exponential;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Exponentiate.cdl b/src/Expr/Expr_Exponentiate.cdl
index b80e06a605..6b0a96432c 100644
--- a/src/Expr/Expr_Exponentiate.cdl
+++ b/src/Expr/Expr_Exponentiate.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp1,exp2 : GeneralExpression)
     ---Purpose: Creates the exponential <exp1> ^ <exp2>
-    returns mutable Exponentiate;
+    returns Exponentiate;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_FunctionDerivative.cdl b/src/Expr/Expr_FunctionDerivative.cdl
index 7dd5efd115..98db30dfa6 100644
--- a/src/Expr/Expr_FunctionDerivative.cdl
+++ b/src/Expr/Expr_FunctionDerivative.cdl
@@ -36,7 +36,7 @@ is
     --          to the <withX> variable.
     --          Raises OutOfRange if <deg> lower or equal to zero.
     ---Level : Advanced
-    returns mutable FunctionDerivative
+    returns FunctionDerivative
     raises OutOfRange;
 
     NbOfVariables(me)
@@ -60,7 +60,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> with the same form.
-    returns mutable like me;
+    returns like me;
 
     Derivative(me; var : NamedUnknown)
     ---Purpose: Returns Derivative of <me> for variable <var>.
diff --git a/src/Expr/Expr_GeneralExpression.cdl b/src/Expr/Expr_GeneralExpression.cdl
index 38929fa9bb..f5a93f6ed1 100644
--- a/src/Expr/Expr_GeneralExpression.cdl
+++ b/src/Expr/Expr_GeneralExpression.cdl
@@ -69,7 +69,7 @@ is
     ---Purpose: Returns a copy of <me> having the same unknowns and 
     --          functions. 
     ---Level: Advanced 
-    returns mutable like me
+    returns like me
     is deferred;
     
     ContainsUnknowns(me) 
diff --git a/src/Expr/Expr_GeneralFunction.cdl b/src/Expr/Expr_GeneralFunction.cdl
index 9b4ac67e59..3e45faf4ec 100644
--- a/src/Expr/Expr_GeneralFunction.cdl
+++ b/src/Expr/Expr_GeneralFunction.cdl
@@ -51,7 +51,7 @@ is
     Copy(me)
     ---Purpose: Returns a copy of <me> with the same form.
     ---Level: Advanced 
-    returns mutable like me
+    returns like me
     is deferred;
     
     Derivative(me; var : NamedUnknown)
diff --git a/src/Expr/Expr_GeneralRelation.cdl b/src/Expr/Expr_GeneralRelation.cdl
index 596f38cdeb..04bee2af04 100644
--- a/src/Expr/Expr_GeneralRelation.cdl
+++ b/src/Expr/Expr_GeneralRelation.cdl
@@ -48,7 +48,7 @@ is
     --          NamedUnknowns by an associated expression, and after
     --          values computation.
     ---Level: Advanced 
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NumericError
     is deferred;
 
@@ -63,7 +63,7 @@ is
     ---Purpose: Returns a copy of <me> having the same unknowns and 
     --          functions.
     ---Level: Advanced 
-    returns mutable like me
+    returns like me
     is deferred;
     
     NbOfSubRelations(me)
diff --git a/src/Expr/Expr_GreaterThan.cdl b/src/Expr/Expr_GreaterThan.cdl
index 670914d803..0c23be0604 100644
--- a/src/Expr/Expr_GreaterThan.cdl
+++ b/src/Expr/Expr_GreaterThan.cdl
@@ -28,7 +28,7 @@ is
 
     Create(exp1 : GeneralExpression ; exp2 : GeneralExpression)
     ---Purpose: Creates the relation <exp1> > <exp2>.
-    returns mutable GreaterThan;
+    returns GreaterThan;
 
     IsSatisfied(me)
     returns Boolean;
@@ -37,7 +37,7 @@ is
     ---Purpose: Returns a GeneralRelation after replacement of
     --          NamedUnknowns by an associated expression, and after
     --          values computation.
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NumericError;
     
     Simplify(me : mutable)
@@ -47,7 +47,7 @@ is
     
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     String(me)
     ---Purpose: returns a string representing <me> in a readable way.
diff --git a/src/Expr/Expr_GreaterThanOrEqual.cdl b/src/Expr/Expr_GreaterThanOrEqual.cdl
index f2d18e50ba..1a62a2e47e 100644
--- a/src/Expr/Expr_GreaterThanOrEqual.cdl
+++ b/src/Expr/Expr_GreaterThanOrEqual.cdl
@@ -28,7 +28,7 @@ is
 
     Create(exp1 : GeneralExpression ; exp2 : GeneralExpression)
     ---Purpose: Creates the relation <exp1> >= <exp2>.
-    returns mutable GreaterThanOrEqual;
+    returns GreaterThanOrEqual;
 
     IsSatisfied(me)
     returns Boolean;
@@ -37,7 +37,7 @@ is
     ---Purpose: Returns a GeneralRelation after replacement of
     --          NamedUnknowns by an associated expression, and after
     --          values computation.
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NumericError;
     
     Simplify(me : mutable)
@@ -47,7 +47,7 @@ is
     
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     String(me)
     ---Purpose: returns a string representing <me> in a readable way.
diff --git a/src/Expr/Expr_LessThan.cdl b/src/Expr/Expr_LessThan.cdl
index befdf8f90d..7fee776503 100644
--- a/src/Expr/Expr_LessThan.cdl
+++ b/src/Expr/Expr_LessThan.cdl
@@ -28,7 +28,7 @@ is
 
     Create(exp1 : GeneralExpression ; exp2 : GeneralExpression)
     ---Purpose: Creates the relation <exp1> < <exp2>.
-    returns mutable LessThan;
+    returns LessThan;
 
     IsSatisfied(me)
     returns Boolean;
@@ -37,7 +37,7 @@ is
     ---Purpose: Returns a GeneralRelation after replacement of
     --          NamedUnknowns by an associated expression, and after
     --          values computation.
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NumericError;
     
     Simplify(me : mutable)
@@ -47,7 +47,7 @@ is
     
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     String(me)
     ---Purpose: returns a string representing <me> in a readable way.
diff --git a/src/Expr/Expr_LessThanOrEqual.cdl b/src/Expr/Expr_LessThanOrEqual.cdl
index d0990d79dd..1766787584 100644
--- a/src/Expr/Expr_LessThanOrEqual.cdl
+++ b/src/Expr/Expr_LessThanOrEqual.cdl
@@ -28,7 +28,7 @@ is
 
     Create(exp1 : GeneralExpression ; exp2 : GeneralExpression)
     ---Purpose: Creates the relation <exp1> <= <exp2>.
-    returns mutable LessThanOrEqual;
+    returns LessThanOrEqual;
 
     IsSatisfied(me)
     returns Boolean;
@@ -37,7 +37,7 @@ is
     ---Purpose: Returns a GeneralRelation after replacement of
     --          NamedUnknowns by an associated expression, and after
     --          values computation.
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NumericError;
     
     Simplify(me : mutable)
@@ -47,7 +47,7 @@ is
     
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     String(me)
     ---Purpose: returns a string representing <me> in a readable way.
diff --git a/src/Expr/Expr_LogOf10.cdl b/src/Expr/Expr_LogOf10.cdl
index aafb41a0b1..c6cb1e9349 100644
--- a/src/Expr/Expr_LogOf10.cdl
+++ b/src/Expr/Expr_LogOf10.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the base 10 logarithm of <exp>
-    returns mutable LogOf10;
+    returns LogOf10;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_LogOfe.cdl b/src/Expr/Expr_LogOfe.cdl
index 1e60d8c71b..f04596d32f 100644
--- a/src/Expr/Expr_LogOfe.cdl
+++ b/src/Expr/Expr_LogOfe.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the natural logarithm of <exp>
-    returns mutable LogOfe;
+    returns LogOfe;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_NamedConstant.cdl b/src/Expr/Expr_NamedConstant.cdl
index de2f3eba27..62f0bf905f 100644
--- a/src/Expr/Expr_NamedConstant.cdl
+++ b/src/Expr/Expr_NamedConstant.cdl
@@ -33,7 +33,7 @@ is
 
     Create(name : AsciiString; value : Real)
     ---Purpose: Creates a constant value of name <name> and value <value>.
-    returns mutable NamedConstant;
+    returns NamedConstant;
 
     GetValue(me)
     ---C++: inline
@@ -67,7 +67,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     ContainsUnknowns(me) 
     ---Purpose: Tests if <me> contains NamedUnknown.
diff --git a/src/Expr/Expr_NamedFunction.cdl b/src/Expr/Expr_NamedFunction.cdl
index a7a011d601..327e520824 100644
--- a/src/Expr/Expr_NamedFunction.cdl
+++ b/src/Expr/Expr_NamedFunction.cdl
@@ -40,7 +40,7 @@ is
     --          <name> defined by the expression <exp>.
     ---Level : Advanced
     
-    returns mutable NamedFunction;
+    returns NamedFunction;
 
     SetName(me : mutable; newname : AsciiString)
     ---Purpose: Sets the name <newname> to <me>.
@@ -76,7 +76,7 @@ is
 		 
     Copy(me)
     ---Purpose: Returns a copy of <me> with the same form.
-    returns mutable like me;
+    returns like me;
 
     Derivative(me; var : NamedUnknown)
     ---Purpose: Returns Derivative of <me> for variable <var>.
diff --git a/src/Expr/Expr_NamedUnknown.cdl b/src/Expr/Expr_NamedUnknown.cdl
index 64511d2624..332db9c514 100644
--- a/src/Expr/Expr_NamedUnknown.cdl
+++ b/src/Expr/Expr_NamedUnknown.cdl
@@ -36,7 +36,7 @@ raises NotAssigned from Expr,
 is
 
     Create(name : AsciiString)
-    returns mutable NamedUnknown;
+    returns NamedUnknown;
 
     IsAssigned(me)
     ---Purpose: Tests if an expression is assigned to <me>.
@@ -94,7 +94,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     ContainsUnknowns(me) 
     ---Purpose: Tests if <me> contains NamedUnknown.
diff --git a/src/Expr/Expr_NumericValue.cdl b/src/Expr/Expr_NumericValue.cdl
index 18e74fbc00..462b4134fe 100644
--- a/src/Expr/Expr_NumericValue.cdl
+++ b/src/Expr/Expr_NumericValue.cdl
@@ -33,7 +33,7 @@ is
 
     Create(val : Real)
     ---Level: Advanced
-    returns mutable NumericValue;
+    returns NumericValue;
 
     GetValue(me)
     ---Level: Advanced
@@ -69,7 +69,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     ContainsUnknowns(me) 
     ---Purpose: Tests if <me> contains NamedUnknown.
diff --git a/src/Expr/Expr_PolyFunction.cdl b/src/Expr/Expr_PolyFunction.cdl
index 87c0e2d6ea..3dce31c103 100644
--- a/src/Expr/Expr_PolyFunction.cdl
+++ b/src/Expr/Expr_PolyFunction.cdl
@@ -37,7 +37,7 @@ is
 
     Create(func : GeneralFunction;exps : Array1OfGeneralExpression)
     ---Purpose: Creates <me> as <func>(<exps_1>,<exps_2>,...,<exps_n>)
-    returns mutable PolyFunction;
+    returns PolyFunction;
 
     Function(me)
     ---Purpose: Returns the function defining <me>.
@@ -51,7 +51,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Product.cdl b/src/Expr/Expr_Product.cdl
index 22981d09c6..3fd1c7c2b0 100644
--- a/src/Expr/Expr_Product.cdl
+++ b/src/Expr/Expr_Product.cdl
@@ -32,11 +32,11 @@ is
 
     Create(exps : SequenceOfGeneralExpression)
     ---Purpose: Creates the product of all members of sequence <exps>
-    returns mutable Product;
+    returns Product;
 
     Create(exp1,exp2 : GeneralExpression)
     ---Purpose: Creates the product of <exp1> and <exp2>.
-    returns mutable Product;
+    returns Product;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -46,7 +46,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Sign.cdl b/src/Expr/Expr_Sign.cdl
index cb1087d040..5d9d4d70b8 100644
--- a/src/Expr/Expr_Sign.cdl
+++ b/src/Expr/Expr_Sign.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the sign of <exp>.
-    returns mutable Sign;
+    returns Sign;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Sine.cdl b/src/Expr/Expr_Sine.cdl
index 55217b5ecb..3eecea6ecf 100644
--- a/src/Expr/Expr_Sine.cdl
+++ b/src/Expr/Expr_Sine.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the sine of <exp>.
-    returns mutable Sine;
+    returns Sine;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Sinh.cdl b/src/Expr/Expr_Sinh.cdl
index 4997ed7bcb..c62624e562 100644
--- a/src/Expr/Expr_Sinh.cdl
+++ b/src/Expr/Expr_Sinh.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the sinh of <exp>.
-    returns mutable Sinh;
+    returns Sinh;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Square.cdl b/src/Expr/Expr_Square.cdl
index ee9d7011f8..63152db3c9 100644
--- a/src/Expr/Expr_Square.cdl
+++ b/src/Expr/Expr_Square.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the square of <exp>.
-    returns mutable Square;
+    returns Square;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_SquareRoot.cdl b/src/Expr/Expr_SquareRoot.cdl
index 6181956027..bb0605182c 100644
--- a/src/Expr/Expr_SquareRoot.cdl
+++ b/src/Expr/Expr_SquareRoot.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the square root of <exp>
-    returns mutable SquareRoot;
+    returns SquareRoot;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Sum.cdl b/src/Expr/Expr_Sum.cdl
index cbfa3140a9..1743e82809 100644
--- a/src/Expr/Expr_Sum.cdl
+++ b/src/Expr/Expr_Sum.cdl
@@ -33,11 +33,11 @@ is
 
     Create(exps : SequenceOfGeneralExpression)
     ---Purpose: Creates the sum of all the members of sequence <exps>.
-    returns mutable Sum;
+    returns Sum;
 
     Create(exp1,exp2 : GeneralExpression)
     ---Purpose: Creates the sum of <exp1> and <exp2>.
-    returns mutable Sum;
+    returns Sum;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -47,7 +47,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_SystemRelation.cdl b/src/Expr/Expr_SystemRelation.cdl
index 9d023d771b..5e64885b17 100644
--- a/src/Expr/Expr_SystemRelation.cdl
+++ b/src/Expr/Expr_SystemRelation.cdl
@@ -30,7 +30,7 @@ is
     Create(relation : GeneralRelation)
     ---Purpose: Creates a system with one relation
     ---Level : Advanced
-    returns mutable SystemRelation;
+    returns SystemRelation;
 
     Add(me : mutable; relation : GeneralRelation)
     ---Purpose: Appends <relation> in the list of components of <me>. 
@@ -72,7 +72,7 @@ is
     ---Purpose: Returns a GeneralRelation after replacement of
     --          NamedUnknowns by an associated expression, and after
     --          values computation.
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NumericError;
     
     Simplify(me : mutable)
@@ -82,7 +82,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     Contains(me; exp : GeneralExpression)
     ---Purpose: Tests if <me> contains <exp>.
diff --git a/src/Expr/Expr_Tangent.cdl b/src/Expr/Expr_Tangent.cdl
index f2255c1e46..02c388a360 100644
--- a/src/Expr/Expr_Tangent.cdl
+++ b/src/Expr/Expr_Tangent.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the tangent of <exp>.
-    returns mutable Tangent;
+    returns Tangent;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_Tanh.cdl b/src/Expr/Expr_Tanh.cdl
index 119d3f47b0..496865e4c9 100644
--- a/src/Expr/Expr_Tanh.cdl
+++ b/src/Expr/Expr_Tanh.cdl
@@ -31,7 +31,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Creates the hyperbolic tangent of <exp>.
-    returns mutable Tanh;
+    returns Tanh;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -41,7 +41,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_UnaryFunction.cdl b/src/Expr/Expr_UnaryFunction.cdl
index 1d69633af3..82eee5ac35 100644
--- a/src/Expr/Expr_UnaryFunction.cdl
+++ b/src/Expr/Expr_UnaryFunction.cdl
@@ -37,7 +37,7 @@ is
     Create(func : GeneralFunction; exp : GeneralExpression)
     ---Purpose: Creates me as <func>(<exp>).
     --          Raises exception if <func> is not unary.
-    returns mutable UnaryFunction
+    returns UnaryFunction
     raises InvalidFunction;
 
     Function(me)
@@ -52,7 +52,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/Expr/Expr_UnaryMinus.cdl b/src/Expr/Expr_UnaryMinus.cdl
index c30c21691b..967553d3f0 100644
--- a/src/Expr/Expr_UnaryMinus.cdl
+++ b/src/Expr/Expr_UnaryMinus.cdl
@@ -32,7 +32,7 @@ is
 
     Create(exp : GeneralExpression)
     ---Purpose: Create the unary minus of <exp>.
-    returns mutable UnaryMinus;
+    returns UnaryMinus;
 
     ShallowSimplified(me) 
     ---Purpose: Returns a GeneralExpression after a simplification 
@@ -42,7 +42,7 @@ is
 
     Copy(me)
     ---Purpose: Returns a copy of <me> having the same unknowns and functions.
-    returns mutable like me;
+    returns like me;
     
     IsIdentical(me; Other : GeneralExpression)
     ---Purpose: Tests if <me> and <Other> define the same expression.
diff --git a/src/ExprIntrp/ExprIntrp_GenExp.cdl b/src/ExprIntrp/ExprIntrp_GenExp.cdl
index e6eb0ccb49..e79d64bec4 100644
--- a/src/ExprIntrp/ExprIntrp_GenExp.cdl
+++ b/src/ExprIntrp/ExprIntrp_GenExp.cdl
@@ -31,7 +31,7 @@ is
     Create
     ---Purpose: Creates an empty generator
     ---Level: Advanced 
-    returns mutable GenExp is private;
+    returns GenExp is private;
 
     Create( myclass ) returns GenExp;
     
diff --git a/src/ExprIntrp/ExprIntrp_GenFct.cdl b/src/ExprIntrp/ExprIntrp_GenFct.cdl
index 96638fce82..2ac358cabf 100644
--- a/src/ExprIntrp/ExprIntrp_GenFct.cdl
+++ b/src/ExprIntrp/ExprIntrp_GenFct.cdl
@@ -30,7 +30,7 @@ is
 
     Create
     ---Level: Internal 
-    returns mutable GenFct is private;
+    returns GenFct is private;
 
     Create( myclass ) returns GenFct;
         
diff --git a/src/ExprIntrp/ExprIntrp_GenRel.cdl b/src/ExprIntrp/ExprIntrp_GenRel.cdl
index 63b9ec1776..614a8ef0be 100644
--- a/src/ExprIntrp/ExprIntrp_GenRel.cdl
+++ b/src/ExprIntrp/ExprIntrp_GenRel.cdl
@@ -29,7 +29,7 @@ is
     Create
     ---Purpose: Creates an empty generator
     ---Level: Advanced
-    returns mutable GenRel is private;
+    returns GenRel is private;
 
     Create( myclass ) returns GenRel;
     
@@ -49,7 +49,7 @@ is
     ---Purpose: Returns relation generated. Raises an exception if 
     --          IsDone answers false.
     ---Level: Advanced 
-    returns mutable GeneralRelation
+    returns GeneralRelation
     raises NoSuchObject
     is static;
     
diff --git a/src/FEmTool/FEmTool_ProfileMatrix.cdl b/src/FEmTool/FEmTool_ProfileMatrix.cdl
index 21e1081734..a023b1e6fc 100644
--- a/src/FEmTool/FEmTool_ProfileMatrix.cdl
+++ b/src/FEmTool/FEmTool_ProfileMatrix.cdl
@@ -33,7 +33,7 @@ raises
 	 
 is 
     Create(FirstIndexes  :  Array1OfInteger)   
-    returns  mutable  ProfileMatrix  from  FEmTool; 
+    returns  ProfileMatrix  from  FEmTool; 
 
     Init(me:  mutable;  Value  :  Real); 
      
diff --git a/src/FWOSDriver/FWOSDriver_Driver.cdl b/src/FWOSDriver/FWOSDriver_Driver.cdl
index 43c6ef7977..2887fb3f90 100644
--- a/src/FWOSDriver/FWOSDriver_Driver.cdl
+++ b/src/FWOSDriver/FWOSDriver_Driver.cdl
@@ -21,7 +21,7 @@ uses
     ExtendedString from TCollection
 is
     Create
-    returns mutable Driver from FWOSDriver;
+    returns Driver from FWOSDriver;
     ---Purpose: initializes the MetaDatadriver with its specific name.
 
 
diff --git a/src/FWOSDriver/FWOSDriver_DriverFactory.cdl b/src/FWOSDriver/FWOSDriver_DriverFactory.cdl
index 0707f78f4a..1e55093eca 100644
--- a/src/FWOSDriver/FWOSDriver_DriverFactory.cdl
+++ b/src/FWOSDriver/FWOSDriver_DriverFactory.cdl
@@ -19,7 +19,7 @@ class DriverFactory from FWOSDriver inherits MetaDataDriverFactory from CDF
 uses MetaDataDriver from CDF, ExtendedString from TCollection
 
 is
-    Create returns mutable DriverFactory from FWOSDriver;
+    Create returns DriverFactory from FWOSDriver;
     
     Build(me)
     returns MetaDataDriver from CDF;
diff --git a/src/GccInt/GccInt_BCirc.cdl b/src/GccInt/GccInt_BCirc.cdl
index 23cf746ac1..189689a33e 100644
--- a/src/GccInt/GccInt_BCirc.cdl
+++ b/src/GccInt/GccInt_BCirc.cdl
@@ -26,7 +26,7 @@ uses Circ2d from gp,
 
 is
 
-Create(Circ : Circ2d) returns mutable BCirc;
+Create(Circ : Circ2d) returns BCirc;
     	---Purpose: Constructs a bisecting curve whose geometry is the 2D circle Circ.
     
 Circle(me) returns Circ2d from gp
diff --git a/src/GccInt/GccInt_BElips.cdl b/src/GccInt/GccInt_BElips.cdl
index c3de899e82..825b6da390 100644
--- a/src/GccInt/GccInt_BElips.cdl
+++ b/src/GccInt/GccInt_BElips.cdl
@@ -26,7 +26,7 @@ uses Elips2d from gp,
 
 is
 
-Create(Ellipse : Elips2d) returns mutable BElips;
+Create(Ellipse : Elips2d) returns BElips;
     	---Purpose:
     	-- Constructs a bisecting curve whose geometry is the 2D ellipse Ellipse.
     
diff --git a/src/GccInt/GccInt_BHyper.cdl b/src/GccInt/GccInt_BHyper.cdl
index c1aa2e86a8..981dda9bf4 100644
--- a/src/GccInt/GccInt_BHyper.cdl
+++ b/src/GccInt/GccInt_BHyper.cdl
@@ -26,7 +26,7 @@ uses Hypr2d from gp,
 
 is
 
-Create(Hyper : Hypr2d from gp) returns mutable BHyper;
+Create(Hyper : Hypr2d from gp) returns BHyper;
     	---Purpose:
     	-- Constructs a bisecting curve whose geometry is the 2D hyperbola Hyper.
         
diff --git a/src/GccInt/GccInt_BLine.cdl b/src/GccInt/GccInt_BLine.cdl
index 5426066081..59ae64123e 100644
--- a/src/GccInt/GccInt_BLine.cdl
+++ b/src/GccInt/GccInt_BLine.cdl
@@ -26,7 +26,7 @@ uses Lin2d  from gp,
 
 is
 
-Create(Line : Lin2d) returns mutable BLine;
+Create(Line : Lin2d) returns BLine;
     	---Purpose: Constructs a bisecting line whose geometry is the 2D line Line.
     
 Line(me) returns Lin2d from gp
diff --git a/src/GccInt/GccInt_BParab.cdl b/src/GccInt/GccInt_BParab.cdl
index 100203269f..d22ef02a6c 100644
--- a/src/GccInt/GccInt_BParab.cdl
+++ b/src/GccInt/GccInt_BParab.cdl
@@ -26,7 +26,7 @@ uses Parab2d from gp,
 
 is
 
-Create(Parab : Parab2d) returns mutable BParab;
+Create(Parab : Parab2d) returns BParab;
     	---Purpose: Constructs a bisecting curve whose geometry is the 2D parabola Parab.
     
 Parabola(me) returns Parab2d from gp
diff --git a/src/GccInt/GccInt_BPoint.cdl b/src/GccInt/GccInt_BPoint.cdl
index 6af90f6adb..f9bb500837 100644
--- a/src/GccInt/GccInt_BPoint.cdl
+++ b/src/GccInt/GccInt_BPoint.cdl
@@ -25,7 +25,7 @@ uses Pnt2d from gp,
 
 is
 
-Create(Point : Pnt2d) returns mutable BPoint;
+Create(Point : Pnt2d) returns BPoint;
     ---Purpose: Constructs a bisecting object whose geometry is the 2D point Point.
     
 Point(me) returns Pnt2d from gp
diff --git a/src/Geom/Geom_Axis1Placement.cdl b/src/Geom/Geom_Axis1Placement.cdl
index 191e9780cf..a6ebce018d 100644
--- a/src/Geom/Geom_Axis1Placement.cdl
+++ b/src/Geom/Geom_Axis1Placement.cdl
@@ -40,11 +40,11 @@ uses Ax1      from gp,
 is
 
 
-  Create (A1 : Ax1)   returns mutable Axis1Placement;
+  Create (A1 : Ax1)   returns Axis1Placement;
         ---Purpose : Returns a transient copy of A1.
 
 
-  Create (P : Pnt; V : Dir)   returns mutable Axis1Placement;
+  Create (P : Pnt; V : Dir)   returns Axis1Placement;
         ---Purpose :
         --  P is the origin of the axis placement and V is the direction
         --  of the axis placement.
@@ -56,7 +56,7 @@ is
   Reverse (me : mutable);
         ---Purpose : Reverses the direction of the axis placement.
 
-  Reversed (me)  returns mutable Axis1Placement
+  Reversed (me)  returns Axis1Placement
         ---Purpose :  Returns a copy of <me> reversed.
      is static;
      
@@ -67,7 +67,7 @@ is
   Transform (me : mutable; T : Trsf);
     	---Purpose: Applies the transformation T to this axis.
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
 
     	---Purpose: Creates a new object, which is a copy of this axis.
   
diff --git a/src/Geom/Geom_Axis2Placement.cdl b/src/Geom/Geom_Axis2Placement.cdl
index 027a2151dd..f6b7c93867 100644
--- a/src/Geom/Geom_Axis2Placement.cdl
+++ b/src/Geom/Geom_Axis2Placement.cdl
@@ -55,11 +55,11 @@ raises ConstructionError from Standard
 is
 
 
-  Create (A2 : Ax2)  returns mutable Axis2Placement;
+  Create (A2 : Ax2)  returns Axis2Placement;
         ---Purpose : Returns a transient copy of A2.
 
 
-  Create (P : Pnt; N, Vx : Dir)   returns mutable Axis2Placement
+  Create (P : Pnt; N, Vx : Dir)   returns Axis2Placement
 	---Purpose :
         --  P is the origin of the axis placement, N is the main
         --  direction of the axis placement and Vx is the "XDirection".
@@ -139,11 +139,11 @@ is
 
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this coordinate system.
 
 
-  Create (P : Pnt; Vz, Vx, Vy : Dir)   returns mutable Axis2Placement
+  Create (P : Pnt; Vz, Vx, Vy : Dir)   returns Axis2Placement
      is private;
 
 
diff --git a/src/Geom/Geom_BSplineCurve.cdl b/src/Geom/Geom_BSplineCurve.cdl
index ceff24f31f..7334d8207c 100644
--- a/src/Geom/Geom_BSplineCurve.cdl
+++ b/src/Geom/Geom_BSplineCurve.cdl
@@ -140,7 +140,7 @@ is
           Degree         : Integer;
     	  Periodic       : Boolean = Standard_False)
 	  
-  returns mutable BSplineCurve from Geom
+  returns BSplineCurve from Geom
 
         ---Purpose :  Creates a  non-rational B_spline curve   on  the
         --         basis <Knots, Multiplicities> of degree <Degree>.
@@ -181,7 +181,7 @@ is
     	  Periodic       : Boolean = Standard_False; 
 	  CheckRational  : Boolean = Standard_True)
 	  
-  returns mutable BSplineCurve from Geom
+  returns BSplineCurve from Geom
 
         ---Purpose : Creates  a rational B_spline  curve  on the basis
         --         <Knots, Multiplicities> of degree <Degree>.
@@ -971,7 +971,7 @@ is
 	--           |f(t1) - f(t0)| < Tolerance3D
   ;
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this BSpline curve.
     
   InvalidateCache(me : mutable)
diff --git a/src/Geom/Geom_BSplineSurface.cdl b/src/Geom/Geom_BSplineSurface.cdl
index 3bf84756ef..d1ddf3e147 100644
--- a/src/Geom/Geom_BSplineSurface.cdl
+++ b/src/Geom/Geom_BSplineSurface.cdl
@@ -170,7 +170,7 @@ is
           UDegree, VDegree             : Integer;
     	  UPeriodic                    : Boolean = Standard_False;
     	  VPeriodic                    : Boolean = Standard_False)
-     returns mutable BSplineSurface
+     returns BSplineSurface
      
     	---Purpose : Creates  a non-rational b-spline surface (weights
         --         default value is 1.).
@@ -203,7 +203,7 @@ is
           UDegree, VDegree             : Integer;
     	  UPeriodic                    : Boolean = Standard_False;
     	  VPeriodic                    : Boolean = Standard_False)
-     returns mutable BSplineSurface
+     returns BSplineSurface
      
         ---Purpose : Creates  a non-rational b-spline surface (weights
         --         default value is 1.).
@@ -1317,26 +1317,26 @@ is
 
 
 
-  UIso (me; U : Real) returns mutable Curve;
+  UIso (me; U : Real) returns Curve;
         ---Purpose :
         --  Computes the U isoparametric curve. 
         --  A B-spline curve is returned.
 
 
-  VIso (me; V : Real)  returns mutable Curve;
+  VIso (me; V : Real)  returns Curve;
         ---Purpose :
         --  Computes the V isoparametric curve. 
         --  A B-spline curve is returned.
 
 
-  UIso (me; U : Real; CheckRational : Boolean) returns mutable Curve;
+  UIso (me; U : Real; CheckRational : Boolean) returns Curve;
         ---Purpose :
         --  Computes the U isoparametric curve.  
 	--  If CheckRational=False, no try to make it non-rational.
         --  A B-spline curve is returned.
 
 
-  VIso (me; V : Real; CheckRational : Boolean) returns mutable Curve;
+  VIso (me; V : Real; CheckRational : Boolean) returns Curve;
         ---Purpose :
         --  Computes the V isoparametric curve. 
 	--  If CheckRational=False, no try to make it non-rational.
@@ -1374,7 +1374,7 @@ is
       	--          ====> |f (u1,v1) - f (u0,v0)| < Tolerance3D
   ;
   
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
 
     	---Purpose: Creates a new object which is a copy of this BSpline surface.
 
diff --git a/src/Geom/Geom_BezierCurve.cdl b/src/Geom/Geom_BezierCurve.cdl
index ab725a2317..16701f4bf3 100644
--- a/src/Geom/Geom_BezierCurve.cdl
+++ b/src/Geom/Geom_BezierCurve.cdl
@@ -90,7 +90,7 @@ raises ConstructionError from Standard,
 is 
 
   Create (CurvePoles : Array1OfPnt from TColgp)
-    returns mutable BezierCurve
+    returns BezierCurve
         ---Purpose :  Creates a non rational Bezier curve with a set of poles 
         --         CurvePoles.  The weights are defaulted to all being 1.
     	--         Raises ConstructionError if the number of poles is greater than MaxDegree + 1
@@ -101,7 +101,7 @@ is
 
   Create (CurvePoles : Array1OfPnt from TColgp;
     	  PoleWeights : Array1OfReal from TColStd) 
-     returns mutable BezierCurve
+     returns BezierCurve
         ---Purpose :  Creates a rational Bezier curve with the set of poles
         --  CurvePoles and the set of weights  PoleWeights .
         --  If all the weights are identical the curve is considered 
@@ -379,7 +379,7 @@ is
     	-- UTolerance ensures that:
     	-- |t1-t0| < UTolerance ===> |f(t1)-f(t0)| < Tolerance3D
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this Bezier curve.
 
   Init (me : mutable; Poles   :  HArray1OfPnt  from TColgp;
diff --git a/src/Geom/Geom_BezierSurface.cdl b/src/Geom/Geom_BezierSurface.cdl
index 32ba2412ec..0b113b3e1e 100644
--- a/src/Geom/Geom_BezierSurface.cdl
+++ b/src/Geom/Geom_BezierSurface.cdl
@@ -112,7 +112,7 @@ raises ConstructionError from Standard,
 is
 
  Create (SurfacePoles : Array2OfPnt from TColgp)
-    returns mutable BezierSurface
+    returns BezierSurface
         ---Purpose :
         --  Creates a non-rational Bezier surface with a set of poles.
         --  Control points representation :
@@ -133,7 +133,7 @@ is
 
   Create (SurfacePoles : Array2OfPnt  from TColgp;
     	  PoleWeights  : Array2OfReal from TColStd)
-     returns mutable BezierSurface
+     returns BezierSurface
         ---Purpose
         --  Creates a rational Bezier surface with a set of poles and a
         --  set of weights.
@@ -571,7 +571,7 @@ is
         --  NbUPoles - 1
 
 
-  UIso (me; U : Real)  returns mutable Curve;
+  UIso (me; U : Real)  returns Curve;
         ---Purpose :
         --  Computes the U isoparametric curve. For a Bezier surface the
         --  UIso curve is a Bezier curve.
@@ -583,7 +583,7 @@ is
         --  NbVPoles - 1
 
 
-  VIso (me; V : Real)  returns mutable Curve;
+  VIso (me; V : Real)  returns Curve;
         ---Purpose :
         --  Computes the V isoparametric curve. For a Bezier surface the
         --  VIso  curve is a Bezier curve.
@@ -667,7 +667,7 @@ is
   Create (SurfacePoles, SurfaceCoefficients : HArray2OfPnt  from TColgp;
           PoleWeights, CoefficientWeights   : HArray2OfReal from TColStd;
 	  IsURational, IsVRational          : Boolean)
-     returns mutable BezierSurface
+     returns BezierSurface
      is private;
 
 
@@ -687,7 +687,7 @@ is
       	--          ====> |f (u1,v1) - f (u0,v0)| < Tolerance3D
 
   
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this Bezier surface.
 
   Init (me : mutable; Poles   :  HArray2OfPnt  from TColgp;
diff --git a/src/Geom/Geom_CartesianPoint.cdl b/src/Geom/Geom_CartesianPoint.cdl
index 3660727e3d..fd33fcf5d6 100644
--- a/src/Geom/Geom_CartesianPoint.cdl
+++ b/src/Geom/Geom_CartesianPoint.cdl
@@ -30,11 +30,11 @@ uses Ax1       from gp,
 
 is
 
-  Create (P : Pnt)   returns mutable CartesianPoint;
+  Create (P : Pnt)   returns CartesianPoint;
         ---Purpose : Returns a transient copy of P.
 
 
-  Create (X, Y, Z : Real)   returns mutable CartesianPoint;
+  Create (X, Y, Z : Real)   returns CartesianPoint;
 
     	---Purpose: Constructs a point defined by its three Cartesian coordinates X, Y and Z.
 
@@ -85,7 +85,7 @@ is
   Transform (me : mutable; T : Trsf);
     	---Purpose: Applies the transformation T to this point.
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose:  Creates a new object which is a copy of this point.
 
 fields
diff --git a/src/Geom/Geom_Circle.cdl b/src/Geom/Geom_Circle.cdl
index a81ce9f40c..0f5e9cd524 100644
--- a/src/Geom/Geom_Circle.cdl
+++ b/src/Geom/Geom_Circle.cdl
@@ -63,11 +63,11 @@ is
 
 
 
-  Create (C : Circ)   returns mutable Circle;
+  Create (C : Circ)   returns Circle;
     	---Purpose :  Constructs a circle by conversion of the gp_Circ circle C.
 
 
-  Create (A2 : Ax2; Radius : Real)  returns mutable Circle
+  Create (A2 : Ax2; Radius : Real)  returns Circle
         ---Purpose : Constructs a circle of radius Radius, where A2 locates the circle and
     	--   defines its orientation in 3D space such that:
     	--   - the center of the circle is the origin of A2,
@@ -170,7 +170,7 @@ is
     	---Purpose: Applies the transformation T to this circle.
 
        
-  Copy (me)  returns mutable like me
+  Copy (me)  returns like me
   is redefined static;
     	---Purpose: Creates a new object which is a copy of this circle.
 
diff --git a/src/Geom/Geom_ConicalSurface.cdl b/src/Geom/Geom_ConicalSurface.cdl
index fc9c671b8a..d015b82cf6 100644
--- a/src/Geom/Geom_ConicalSurface.cdl
+++ b/src/Geom/Geom_ConicalSurface.cdl
@@ -65,7 +65,7 @@ raises ConstructionError from Standard,
 is
 
   Create (A3 : Ax3; Ang : Real; Radius : Real) 
-     returns mutable ConicalSurface
+     returns ConicalSurface
         ---Purpose :
         --  A3 defines the local coordinate system of the conical surface.
         --  Ang is the conical surface semi-angle ]0, PI/2[.
@@ -84,7 +84,7 @@ is
         --  Ang >= PI/2 - Resolution
 
 
-  Create (C : Cone)   returns mutable ConicalSurface;
+  Create (C : Cone)   returns ConicalSurface;
         ---Purpose :
         --  Creates a ConicalSurface from a non transient Cone from 
         --  package gp.
@@ -233,14 +233,14 @@ is
         ---Purpose : Returns False.
 
 
-  UIso (me; U : Real)  returns mutable Curve;
+  UIso (me; U : Real)  returns Curve;
         ---Purpose : Builds the U isoparametric line of this cone. The
     	--  origin of this line is on the reference plane of this
     	--  cone (i.e. the plane defined by the origin, "X Direction"
     	--  and "Y Direction" of the local coordinate system of this cone).
         
 
-  VIso (me; V : Real)   returns mutable Curve;
+  VIso (me; V : Real)   returns Curve;
         ---Purpose : Builds the V isoparametric circle of this cone. It is the
     	-- circle on this cone, located in the plane of Z
     	-- coordinate V*cos(Semi-Angle) in the local coordinate system of this
@@ -297,7 +297,7 @@ is
 
   Transform (me : mutable; T : Trsf);
     	---Purpose: Applies the transformation T to this cone.
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
 
     	---Purpose: Creates a new object which is a copy of this cone.
 fields
diff --git a/src/Geom/Geom_Curve.cdl b/src/Geom/Geom_Curve.cdl
index e18e3e69e5..6a8e88e724 100644
--- a/src/Geom/Geom_Curve.cdl
+++ b/src/Geom/Geom_Curve.cdl
@@ -111,7 +111,7 @@ is
      is virtual;  
 
 
-  Reversed (me)  returns mutable like me 
+  Reversed (me)  returns like me 
         ---Purpose : Returns a copy of <me> reversed.
      is static;
 
diff --git a/src/Geom/Geom_CylindricalSurface.cdl b/src/Geom/Geom_CylindricalSurface.cdl
index 42e3a09979..17142a4ad2 100644
--- a/src/Geom/Geom_CylindricalSurface.cdl
+++ b/src/Geom/Geom_CylindricalSurface.cdl
@@ -56,7 +56,7 @@ raises ConstructionError from Standard,
 
 is
 
-  Create (A3 : Ax3; Radius : Real)    returns mutable CylindricalSurface
+  Create (A3 : Ax3; Radius : Real)    returns CylindricalSurface
         ---Purpose :
         --  A3 defines the local coordinate system of the cylindrical surface.
         --  The "ZDirection" of A3 defines the direction of the surface's
@@ -72,7 +72,7 @@ is
 
 
 
-  Create (C : Cylinder)  returns mutable CylindricalSurface;
+  Create (C : Cylinder)  returns CylindricalSurface;
         ---Purpose :
         --  Creates a CylindricalSurface from a non transient Cylinder
         --  from package gp.
@@ -168,14 +168,14 @@ is
         ---Purpose : Returns False.
 
 
-  UIso (me; U : Real)  returns mutable Curve;
+  UIso (me; U : Real)  returns Curve;
         ---Purpose :
         --  The UIso curve is a Line. The location point of this line is
         --  on the placement plane (XAxis, YAxis) of the surface.
         --  This line is parallel to the axis of symmetry of the surface.
 
 
-  VIso (me; V : Real)   returns mutable Curve;
+  VIso (me; V : Real)   returns Curve;
         ---Purpose :
         --  The VIso curve is a circle. The start point of this circle 
         --  (U = 0) is defined with the "XAxis" of the surface.
@@ -222,7 +222,7 @@ is
 
   Transform (me : mutable; T : Trsf);
     	---Purpose:  Applies the transformation T to this cylinder.
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose:  Creates a new object which is a copy of this cylinder.
 fields
 
diff --git a/src/Geom/Geom_Direction.cdl b/src/Geom/Geom_Direction.cdl
index ec8b23e66f..6e7d977752 100644
--- a/src/Geom/Geom_Direction.cdl
+++ b/src/Geom/Geom_Direction.cdl
@@ -32,13 +32,13 @@ raises ConstructionError from Standard
 is
 
 
-  Create (X, Y, Z :Real)  returns mutable Direction
+  Create (X, Y, Z :Real)  returns Direction
         ---Purpose : Creates a unit vector with it 3 cartesian coordinates.
      raises ConstructionError;
         ---Purpose : 
         --  Raised if Sqrt( X*X + Y*Y + Z*Z) <= Resolution from gp.
 
-  Create (V : Dir) returns mutable Direction;
+  Create (V : Dir) returns Direction;
         ---Purpose : Creates a transient copy of <me>.
 
 
@@ -105,7 +105,7 @@ is
         --  parallel
 
 
-  Crossed (me; Other : Vector)  returns mutable like me
+  Crossed (me; Other : Vector)  returns like me
         ---Purpose :
         --  Computes the cross product between <me> and <Other>.
         --  A new direction is returned.
@@ -117,7 +117,7 @@ is
      is static;
      
 
-  CrossCrossed (me; V1, V2 : Vector)   returns mutable like me
+  CrossCrossed (me; V1, V2 : Vector)   returns like me
         ---Purpose :
         --  Computes the triple vector product <me> ^(V1 ^ V2).
      raises ConstructionError
@@ -130,7 +130,7 @@ is
   Transform (me : mutable; T : Trsf);
     	---Purpose: Applies the transformation T to this unit vector, then normalizes it.
   
-  Copy (me) returns mutable like me;
+  Copy (me) returns like me;
     	---Purpose: Creates a new object which is a copy of this unit vector.
 end;
 
diff --git a/src/Geom/Geom_Ellipse.cdl b/src/Geom/Geom_Ellipse.cdl
index bd8c722abe..cb482c401a 100644
--- a/src/Geom/Geom_Ellipse.cdl
+++ b/src/Geom/Geom_Ellipse.cdl
@@ -64,11 +64,11 @@ raises ConstructionError from Standard,
 
 is
 
-  Create (E : Elips)  returns mutable Ellipse;
+  Create (E : Elips)  returns Ellipse;
         ---Purpose : Constructs an ellipse by conversion of the gp_Elips ellipse E.
 
   Create (A2 : Ax2; MajorRadius, MinorRadius : Real)
-     returns mutable Ellipse
+     returns Ellipse
 	---Purpose : Constructs an ellipse
     	--	defined by its major and minor radii, MajorRadius
     	--   and MinorRadius, where A2 locates the ellipse
@@ -247,7 +247,7 @@ is
 
     	---Purpose: Applies the transformation T to this ellipse.
 
-  Copy (me)  returns mutable like me is redefined static;
+  Copy (me)  returns like me is redefined static;
      
     	---Purpose: Creates a new object which is a copy of this ellipse.
 
diff --git a/src/Geom/Geom_Geometry.cdl b/src/Geom/Geom_Geometry.cdl
index b7468bf90b..520b2b8fa7 100644
--- a/src/Geom/Geom_Geometry.cdl
+++ b/src/Geom/Geom_Geometry.cdl
@@ -115,38 +115,38 @@ is
   --  itself. A copy of the object is returned.
 
 
-  Mirrored (me; P : Pnt)              returns mutable like me 
+  Mirrored (me; P : Pnt)              returns like me 
      is static;
 
 
-  Mirrored (me; A1 : Ax1)             returns mutable like me 
+  Mirrored (me; A1 : Ax1)             returns like me 
      is static;
 
 
-  Mirrored (me; A2 : Ax2)             returns mutable like me 
+  Mirrored (me; A2 : Ax2)             returns like me 
       is static;
 
 
-  Rotated (me; A1 : Ax1; Ang : Real)  returns mutable like me 
+  Rotated (me; A1 : Ax1; Ang : Real)  returns like me 
      is static;
 
 
-  Scaled (me; P : Pnt; S : Real)      returns mutable like me 
+  Scaled (me; P : Pnt; S : Real)      returns like me 
      is static;
 
 
-  Transformed (me; T : Trsf)          returns mutable like me
+  Transformed (me; T : Trsf)          returns like me
      is static;
 
 
-  Translated (me; V : Vec)            returns mutable like me
+  Translated (me; V : Vec)            returns like me
      is static;
 
 
-  Translated (me; P1, P2 : Pnt)       returns mutable like me
+  Translated (me; P1, P2 : Pnt)       returns like me
      is static;
 
-  Copy (me)  returns mutable like me                      is deferred;
+  Copy (me)  returns like me                      is deferred;
     	---Purpose: Creates a new object which is a copy of this geometric object.   
 
 
diff --git a/src/Geom/Geom_Hyperbola.cdl b/src/Geom/Geom_Hyperbola.cdl
index a1dd94c947..4f2203e6ca 100644
--- a/src/Geom/Geom_Hyperbola.cdl
+++ b/src/Geom/Geom_Hyperbola.cdl
@@ -84,12 +84,12 @@ raises ConstructionError from Standard,
 
 is
 
- Create (H : Hypr)   returns mutable Hyperbola;
+ Create (H : Hypr)   returns Hyperbola;
         ---Purpose : Constructs a hyperbola by conversion of the gp_Hypr hyperbola H.
        
 
   Create (A2 : Ax2; MajorRadius, MinorRadius : Real)
-     returns mutable Hyperbola
+     returns Hyperbola
     	---Purpose : Constructs a hyperbola defined by its major and
     	-- minor radii, MajorRadius and MinorRadius, where A2 locates the
     	--   hyperbola and defines its orientation in 3D space such that:
@@ -306,7 +306,7 @@ is
     	---Purpose: Applies the transformation T to this hyperbola.
 
 
-  Copy (me)  returns mutable like me is redefined static;
+  Copy (me)  returns like me is redefined static;
 
     	---Purpose: Creates a new object which is a copy of this hyperbola.
 fields
diff --git a/src/Geom/Geom_Line.cdl b/src/Geom/Geom_Line.cdl
index ec4c51a6a1..5aacce7c92 100644
--- a/src/Geom/Geom_Line.cdl
+++ b/src/Geom/Geom_Line.cdl
@@ -46,18 +46,18 @@ is
 
 
 
-  Create (A1 : Ax1)   returns mutable Line;
+  Create (A1 : Ax1)   returns Line;
         ---Purpose :
         --  Creates a line located in 3D space with the axis placement A1.
         --  The Location of A1 is the origin of the line. 
 
 
-  Create (L : Lin)  returns mutable Line;
+  Create (L : Lin)  returns Line;
         ---Purpose :
         --  Creates a line from a non transient line from package gp.
 
 
-  Create (P : Pnt; V : Dir)    returns mutable Line;
+  Create (P : Pnt; V : Dir)    returns Line;
         ---Purpose :
     	-- Constructs a line passing through point P and parallel to vector V
     	--   (P and V are, respectively, the origin and the unit
@@ -199,7 +199,7 @@ is
      is redefined;  
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this line.
 
 
diff --git a/src/Geom/Geom_OffsetCurve.cdl b/src/Geom/Geom_OffsetCurve.cdl
index a94b9d77be..19b5464fc4 100644
--- a/src/Geom/Geom_OffsetCurve.cdl
+++ b/src/Geom/Geom_OffsetCurve.cdl
@@ -85,7 +85,7 @@ is
 
 
   Create (C : Curve from Geom; Offset : Real;  V : Dir)
-     returns mutable OffsetCurve
+     returns OffsetCurve
         ---Purpose :
         --  C is the basis curve, Offset is the distance between <me> and
         --  the basis curve at any point. V defines the fixed reference 
@@ -345,7 +345,7 @@ is
 
 	     
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this offset curve.
 
 fields
diff --git a/src/Geom/Geom_OffsetSurface.cdl b/src/Geom/Geom_OffsetSurface.cdl
index f45d27989e..5dccb5d297 100644
--- a/src/Geom/Geom_OffsetSurface.cdl
+++ b/src/Geom/Geom_OffsetSurface.cdl
@@ -68,7 +68,7 @@ is
 
 
 
-  Create (S : Surface from Geom; Offset : Real)   returns mutable OffsetSurface
+  Create (S : Surface from Geom; Offset : Real)   returns OffsetSurface
         ---Purpose : Constructs a surface offset from the basis surface
     	-- S, where Offset is the distance between the offset
     	-- surface and the basis surface at any point.
@@ -232,10 +232,10 @@ is
 	---Purpose: raises if the surface is not vperiodic.
   is redefined;
 
-  UIso (me; U : Real)  returns mutable Curve;
+  UIso (me; U : Real)  returns Curve;
         ---Purpose : Computes the U isoparametric curve.
 
-  VIso (me; V : Real)  returns mutable Curve;
+  VIso (me; V : Real)  returns Curve;
         ---Purpose : Computes the V isoparametric curve.
 
 
@@ -457,10 +457,10 @@ is
 	--          This methods calls the basis surface method.
      is redefined;  
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this offset surface.  
     
-  Surface (me) returns mutable Surface from Geom;
+  Surface (me) returns Surface from Geom;
       	---Purpose: returns an  equivalent surface of the offset surface
       	--          when  the basis surface   is a canonic  surface or a
       	--          rectangular  limited surface on canonic surface or if
diff --git a/src/Geom/Geom_OsculatingSurface.cdl b/src/Geom/Geom_OsculatingSurface.cdl
index ff4e93f9a9..01de716c34 100644
--- a/src/Geom/Geom_OsculatingSurface.cdl
+++ b/src/Geom/Geom_OsculatingSurface.cdl
@@ -68,7 +68,7 @@ is
     BuildOsculatingSurface (me ; Param : Real;  
                                  UKnot,VKnot : Integer;
                                  BS : BSplineSurface from Geom ;
-                                 L : out mutable  BSplineSurface from Geom) 
+                                 L : out  BSplineSurface from Geom) 
     	---Purpose: returns False if the osculating surface can't be built
     	--          
       returns Boolean  from  Standard
diff --git a/src/Geom/Geom_Parabola.cdl b/src/Geom/Geom_Parabola.cdl
index 2096db51c3..705e6e1112 100644
--- a/src/Geom/Geom_Parabola.cdl
+++ b/src/Geom/Geom_Parabola.cdl
@@ -65,11 +65,11 @@ raises ConstructionError from Standard,
 is
 
 
-  Create (Prb : Parab)   returns mutable Parabola;
+  Create (Prb : Parab)   returns Parabola;
         ---Purpose : Creates a parabola from a non transient one.
 
 
-  Create (A2 : Ax2; Focal : Real)   returns mutable Parabola
+  Create (A2 : Ax2; Focal : Real)   returns Parabola
 	---Purpose :
 	--  Creates a parabola with its local coordinate system "A2"
 	--  and it's focal length "Focal".
@@ -81,7 +81,7 @@ is
 	---Purpose : Raised if Focal < 0.0
 
 
-  Create (D : Ax1; F : Pnt)  returns mutable Parabola;
+  Create (D : Ax1; F : Pnt)  returns Parabola;
         ---Purpose :
         --  D is the directrix of the parabola and F the focus point.
         --  The symmetry axis (XAxis) of the parabola is normal to the
@@ -240,7 +240,7 @@ is
      is redefined static;  
 
 
-  Copy (me)  returns mutable like me
+  Copy (me)  returns like me
    is redefined static;
     	---Purpose: Creates a new object which is a copy of this parabola.
 fields
diff --git a/src/Geom/Geom_Plane.cdl b/src/Geom/Geom_Plane.cdl
index 0c6fd629b2..6b6a2ed974 100644
--- a/src/Geom/Geom_Plane.cdl
+++ b/src/Geom/Geom_Plane.cdl
@@ -62,7 +62,7 @@ is
 
 
 
-  Create (A3 : Ax3)    returns mutable Plane;
+  Create (A3 : Ax3)    returns Plane;
         ---Purpose :
         --  Creates a plane located in 3D space with an axis placement
         --  three axis.  The "ZDirection" of "A3" is the direction normal
@@ -72,18 +72,18 @@ is
         --  curves.
 
 
-  Create (Pl : Pln)  returns mutable Plane;
+  Create (Pl : Pln)  returns Plane;
         ---Purpose :
         --  Creates a plane from a non transient plane from package gp.
 
 
-  Create (P : Pnt; V : Dir)    returns mutable Plane;
+  Create (P : Pnt; V : Dir)    returns Plane;
         ---Purpose :
         --  P is the "Location" point or origin of the plane.
         --  V is the direction normal to the plane.
 
 
-  Create (A, B, C ,D : Real)   returns mutable Plane
+  Create (A, B, C ,D : Real)   returns Plane
         ---Purpose :
         --  Creates a plane from its cartesian equation :
         --  Ax + By + Cz + D = 0.0
@@ -185,13 +185,13 @@ is
         ---Purpose : return False.
 
 
-  UIso (me; U : Real)   returns mutable Curve;
+  UIso (me; U : Real)   returns Curve;
         ---Purpose :
         --  Computes the U isoparametric curve.
         --  This is a Line parallel to the YAxis of the plane.
 
 
-  VIso (me; V : Real)   returns mutable Curve;
+  VIso (me; V : Real)   returns Curve;
         ---Purpose :
         --  Computes the V isoparametric curve.
         --  This is a Line parallel to the XAxis of the plane.
@@ -238,7 +238,7 @@ is
 
     	---Purpose: Applies the transformation T to this plane.
         
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
 
     	---Purpose: Creates a new object which is a copy of this plane.
 end;
diff --git a/src/Geom/Geom_RectangularTrimmedSurface.cdl b/src/Geom/Geom_RectangularTrimmedSurface.cdl
index 8b758f08df..fefc4537c9 100644
--- a/src/Geom/Geom_RectangularTrimmedSurface.cdl
+++ b/src/Geom/Geom_RectangularTrimmedSurface.cdl
@@ -59,7 +59,7 @@ is
   Create (S : Surface from Geom; 
           U1, U2, V1, V2 : Real; 
           USense, VSense : Boolean =  Standard_True)
-     returns mutable RectangularTrimmedSurface
+     returns RectangularTrimmedSurface
         ---Purpose :
         --  The U parametric direction of the surface is oriented from U1
         --  to U2. The V parametric direction of the surface is oriented 
@@ -85,7 +85,7 @@ is
           Param1, Param2 : Real; 
           UTrim          : Boolean;
           Sense          : Boolean = Standard_True)
-     returns mutable RectangularTrimmedSurface
+     returns RectangularTrimmedSurface
         ---Purpose :
         --  The basis surface S is only trim in one parametric direction.
         --  If UTrim = True the surface is trimmed in the U parametric 
@@ -266,11 +266,11 @@ is
         ---Purpose : value and derivatives
 
 
-  UIso (me; U : Real)  returns mutable Curve;
+  UIso (me; U : Real)  returns Curve;
         ---Purpose : computes the U isoparametric curve.
 
 
-  VIso (me; V : Real)   returns mutable Curve;
+  VIso (me; V : Real)   returns Curve;
         ---Purpose : Computes the V isoparametric curve.
 
 
@@ -360,7 +360,7 @@ is
 	--          This methods calls the basis surface method.
      is redefined;  
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this patch.
 fields
 
diff --git a/src/Geom/Geom_SphericalSurface.cdl b/src/Geom/Geom_SphericalSurface.cdl
index 54917b20c8..99d2d5d95a 100644
--- a/src/Geom/Geom_SphericalSurface.cdl
+++ b/src/Geom/Geom_SphericalSurface.cdl
@@ -69,7 +69,7 @@ raises ConstructionError from Standard,
 
 is
 
-  Create (A3 : Ax3; Radius : Real)   returns mutable SphericalSurface
+  Create (A3 : Ax3; Radius : Real)   returns SphericalSurface
         --- Purpose :
         --  A3 is the local coordinate system of the surface.
         --  At the creation the parametrization of the surface is defined
@@ -87,7 +87,7 @@ is
         --- Purpose : Raised if Radius < 0.0.
 
 
-  Create (S : Sphere)   returns mutable SphericalSurface;
+  Create (S : Sphere)   returns SphericalSurface;
         --- Purpose :
         --  Creates a SphericalSurface from a non persistent Sphere from 
         --  package gp.
@@ -168,7 +168,7 @@ is
         --- Purpose : Returns False.
 
 
-  UIso (me; U : Real)   returns mutable Curve;
+  UIso (me; U : Real)   returns Curve;
         --- Purpose : Computes the U isoparametric curve.
         --  The U isoparametric curves of the surface are defined by the 
         --  section of the spherical surface with plane obtained by rotation
@@ -178,7 +178,7 @@ is
         -- Warnings : The radius of this circle can be zero.
 
 
-  VIso (me; V : Real)  returns mutable Curve;
+  VIso (me; V : Real)  returns Curve;
         --- Purpose : Computes the V isoparametric curve.
         --  The V isoparametric curves of the surface  are defined by 
         --  the section of the spherical surface with plane parallel to the
@@ -230,7 +230,7 @@ is
 
   Transform (me : mutable; T : Trsf) ;
     	---Purpose: Applies the transformation T to this sphere.
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this sphere.
 fields 
 
diff --git a/src/Geom/Geom_Surface.cdl b/src/Geom/Geom_Surface.cdl
index cc234486c0..2f89608de4 100644
--- a/src/Geom/Geom_Surface.cdl
+++ b/src/Geom/Geom_Surface.cdl
@@ -66,7 +66,7 @@ is
      is deferred;
 
 
-  UReversed (me)   returns mutable like me
+  UReversed (me)   returns like me
         ---Purpose :
         --  Reverses the U direction of parametrization of <me>. 
         --  The bounds of the surface are not modified.
@@ -91,7 +91,7 @@ is
      is deferred;
 
 
-  VReversed (me)  returns mutable like me
+  VReversed (me)  returns like me
         ---Purpose :
         --  Reverses the V direction of parametrization of <me>.
         --  The bounds of the surface are not modified.
@@ -222,12 +222,12 @@ is
     is virtual;
     
 
-  UIso (me; U : Real)  returns  mutable Curve
+  UIso (me; U : Real)  returns Curve
         ---Purpose : Computes the U isoparametric curve.
      is deferred;
      
 
-  VIso (me; V : Real)  returns mutable Curve
+  VIso (me; V : Real)  returns Curve
         ---Purpose : Computes the V isoparametric curve.
      is deferred;
 
diff --git a/src/Geom/Geom_SurfaceOfLinearExtrusion.cdl b/src/Geom/Geom_SurfaceOfLinearExtrusion.cdl
index 33729a0dec..3c16b37c92 100644
--- a/src/Geom/Geom_SurfaceOfLinearExtrusion.cdl
+++ b/src/Geom/Geom_SurfaceOfLinearExtrusion.cdl
@@ -64,7 +64,7 @@ raises RangeError          from Standard,
 
 is
 
-  Create (C : Curve; V : Dir)   returns mutable SurfaceOfLinearExtrusion;
+  Create (C : Curve; V : Dir)   returns SurfaceOfLinearExtrusion;
         --- Purpose :
         --  V is the direction of extrusion.
         --  C is the extruded curve.
@@ -165,14 +165,14 @@ is
         --- Purpose : IsVPeriodic always returns false.
 
 
-  UIso (me; U : Real)  returns mutable Curve;
+  UIso (me; U : Real)  returns Curve;
         --- Purpose : Computes the U isoparametric curve of this surface
         -- of linear extrusion. This is the line parallel to the
         -- direction of extrusion, passing through the point of
         -- parameter U of the basis curve.
 
 
-  VIso (me; V : Real)   returns mutable Curve;
+  VIso (me; V : Real)   returns Curve;
         --- Purpose : Computes the V isoparametric curve of this surface
         -- of linear extrusion. This curve is obtained by
         -- translating the extruded curve in the direction of
@@ -295,7 +295,7 @@ is
   
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
         ---Purpose: Creates a new object which is a copy of this surface of linear extrusion.
     
 end;  
diff --git a/src/Geom/Geom_SurfaceOfRevolution.cdl b/src/Geom/Geom_SurfaceOfRevolution.cdl
index 5e0fe2d82e..e20d0dbf37 100644
--- a/src/Geom/Geom_SurfaceOfRevolution.cdl
+++ b/src/Geom/Geom_SurfaceOfRevolution.cdl
@@ -76,7 +76,7 @@ raises ConstructionError   from Standard,
 is
 
 
-  Create (C : Curve; A1 : Ax1)   returns mutable SurfaceOfRevolution;
+  Create (C : Curve; A1 : Ax1)   returns SurfaceOfRevolution;
         ---Purpose :
         --  C : is the meridian  or the referenced curve.
         --  A1 is the axis of revolution. 
@@ -263,13 +263,13 @@ is
     	--   surface of revolution is periodic.
 
 
-  UIso (me; U : Real)   returns mutable Curve;
+  UIso (me; U : Real)   returns Curve;
     	---Purpose :  Computes the U isoparametric curve of this surface
     	-- of revolution. It is the curve obtained by rotating the
     	-- meridian through an angle U about the axis of revolution.
 
 
-  VIso (me; V : Real)  returns mutable Curve;
+  VIso (me; V : Real)  returns Curve;
     	---Purpose :  Computes the U isoparametric curve of this surface
     	-- of revolution. It is the curve obtained by rotating the
     	-- meridian through an angle U about the axis of revolution.
@@ -349,7 +349,7 @@ is
 
   Transform (me : mutable; T : Trsf);
     	---Purpose: Applies the transformation T to this surface of revolution.
-   Copy (me)  returns mutable like me;
+   Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this surface of revolution.
 fields
 
diff --git a/src/Geom/Geom_ToroidalSurface.cdl b/src/Geom/Geom_ToroidalSurface.cdl
index 17702230d6..e01d4ce45b 100644
--- a/src/Geom/Geom_ToroidalSurface.cdl
+++ b/src/Geom/Geom_ToroidalSurface.cdl
@@ -78,7 +78,7 @@ raises ConstructionError from Standard,
 is
 
   Create (A3 : Ax3; MajorRadius, MinorRadius : Real)
-     returns mutable ToroidalSurface
+     returns ToroidalSurface
         ---Purpose :
         --  A3 is the local coordinate system of the surface.
         --  The orientation of increasing V parametric value is defined 
@@ -94,7 +94,7 @@ is
         --  Raised if MinorRadius < 0.0 or if MajorRadius < 0.0
 
 
-  Create (T : Torus)  returns mutable ToroidalSurface;
+  Create (T : Torus)  returns ToroidalSurface;
         ---Purpose :
         --  Creates a ToroidalSurface from a non transient Torus from 
         --  package gp.
@@ -195,7 +195,7 @@ is
         ---Purpose : Returns True.
 
 
-  UIso (me; U : Real)   returns mutable Curve;
+  UIso (me; U : Real)   returns Curve;
         ---Purpose : Computes the U isoparametric curve.
         --  
         --  For a toroidal surface the UIso curve is a circle.
@@ -206,7 +206,7 @@ is
         --  MinorRadius = 0.0
 
 
-  VIso (me; V : Real)   returns mutable Curve;
+  VIso (me; V : Real)   returns Curve;
         ---Purpose : Computes the V isoparametric curve.
         --  
         --  For a ToroidalSurface the VIso curve is a circle.
@@ -262,7 +262,7 @@ is
     	---Purpose: Applies the transformation T to this torus.
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this torus.
 fields
 
diff --git a/src/Geom/Geom_Transformation.cdl b/src/Geom/Geom_Transformation.cdl
index 23eccf7d75..c990517999 100644
--- a/src/Geom/Geom_Transformation.cdl
+++ b/src/Geom/Geom_Transformation.cdl
@@ -67,11 +67,11 @@ raises ConstructionError from Standard,
 is
 
 
-  Create   returns mutable Transformation;
+  Create   returns Transformation;
         ---Purpose : Creates an identity transformation.
 
 
-  Create (T : Trsf)  returns mutable Transformation;
+  Create (T : Trsf)  returns Transformation;
         ---Purpose :  Creates a transient copy of T.
 
 
@@ -194,7 +194,7 @@ is
         --  package gp.
 
 
-  Inverted (me)    returns mutable Transformation
+  Inverted (me)    returns Transformation
      raises ConstructionError;
         ---Purpose :
         --  Raised if the the transformation is singular. This means that 
@@ -206,7 +206,7 @@ is
 
 
 	
-  Multiplied (me; Other : Transformation)  returns mutable Transformation;
+  Multiplied (me; Other : Transformation)  returns Transformation;
         ---Purpose :
         --  Computes the transformation composed with Other and <me>.
         --  <me> * Other.
@@ -251,7 +251,7 @@ is
 
 
 
-  Copy (me)  returns mutable Transformation;
+  Copy (me)  returns Transformation;
     	---Purpose: Creates a new object which is a copy of this transformation.    
 fields
 
diff --git a/src/Geom/Geom_TrimmedCurve.cdl b/src/Geom/Geom_TrimmedCurve.cdl
index 0cb811d092..bf632273c1 100644
--- a/src/Geom/Geom_TrimmedCurve.cdl
+++ b/src/Geom/Geom_TrimmedCurve.cdl
@@ -47,7 +47,7 @@ is
 
 
   Create (C : Curve; U1, U2 : Real; Sense : Boolean = Standard_True)
-     returns mutable TrimmedCurve
+     returns TrimmedCurve
         ---Purpose : Constructs a trimmed curve from the basis curve C
     	-- which is limited between parameter values U1 and U2.
     	-- Note: - U1 can be greater or less than U2; in both cases,
@@ -284,7 +284,7 @@ is
 	--          This methods calls the basis curve method.
      is redefined;  
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this trimmed curve.
     
 fields
diff --git a/src/Geom/Geom_Vector.cdl b/src/Geom/Geom_Vector.cdl
index 34f93c39c7..e2f5617a95 100644
--- a/src/Geom/Geom_Vector.cdl
+++ b/src/Geom/Geom_Vector.cdl
@@ -38,7 +38,7 @@ is
         ---Purpose : Reverses the vector <me>.
 
 
-  Reversed (me) returns mutable like me
+  Reversed (me) returns like me
         ---Purpose : 
         --  Returns a copy of <me> reversed.
      is static;
@@ -111,7 +111,7 @@ is
      is deferred;
      
 
-  Crossed (me; Other : Vector)  returns mutable like me
+  Crossed (me; Other : Vector)  returns like me
         ---Purpose :
         --  Computes the cross product between <me> and <Other>.
         --  A new direction is returned.
@@ -134,7 +134,7 @@ is
      is deferred;
      
 
-  CrossCrossed (me; V1, V2 : Vector)   returns mutable like me
+  CrossCrossed (me; V1, V2 : Vector)   returns like me
         ---Purpose :
         --  Computes the triple vector product <me> ^(V1 ^ V2).
      raises ConstructionError
diff --git a/src/Geom/Geom_VectorWithMagnitude.cdl b/src/Geom/Geom_VectorWithMagnitude.cdl
index 150d5ec83e..5ddcb0162a 100644
--- a/src/Geom/Geom_VectorWithMagnitude.cdl
+++ b/src/Geom/Geom_VectorWithMagnitude.cdl
@@ -29,15 +29,15 @@ raises ConstructionError from Standard
 
 is
 
-  Create (V : Vec) returns mutable VectorWithMagnitude;
+  Create (V : Vec) returns VectorWithMagnitude;
         ---Purpose : Creates a transient copy of V.
 
 
-  Create (X, Y, Z : Real)   returns mutable VectorWithMagnitude;
+  Create (X, Y, Z : Real)   returns VectorWithMagnitude;
         ---Purpose : Creates a vector with three cartesian coordinates. 
 
 
-  Create (P1, P2 : Pnt)   returns mutable VectorWithMagnitude;
+  Create (P1, P2 : Pnt)   returns VectorWithMagnitude;
         ---Purpose :
         --  Creates a vector from the point P1 to the point P2.
         --  The magnitude of the vector is the distance between P1 and P2
@@ -77,7 +77,7 @@ is
         --  Adds the Vector Other to <me>.
 
 
-  Added (me; Other : Vector)  returns mutable VectorWithMagnitude
+  Added (me; Other : Vector)  returns VectorWithMagnitude
         ---Purpose :
         --  Adds the vector Other to <me>.
 
@@ -90,7 +90,7 @@ is
         --  <me> ^ Other.
 
 
-  Crossed (me; Other : Vector)  returns mutable like me
+  Crossed (me; Other : Vector)  returns like me
         ---Purpose :
         --  Computes the cross product  between <me> and Other 
         --  <me> ^ Other. A new vector is returned.
@@ -102,7 +102,7 @@ is
         --  Computes the triple vector product  <me> ^ (V1 ^ V2).
 
 
-  CrossCrossed (me; V1, V2 : Vector)   returns mutable like me
+  CrossCrossed (me; V1, V2 : Vector)   returns like me
         ---Purpose :
         --  Computes the triple vector product  <me> ^ (V1 ^ V2).
         --  A new vector is returned.
@@ -113,13 +113,13 @@ is
         ---Purpose : Divides <me> by a scalar.
 
 
-  Divided (me; Scalar : Real)  returns mutable VectorWithMagnitude
+  Divided (me; Scalar : Real)  returns VectorWithMagnitude
         ---Purpose :
         --  Divides <me> by a scalar. A new vector is returned.
      is static;
 
 
-  Multiplied (me; Scalar : Real)  returns mutable VectorWithMagnitude
+  Multiplied (me; Scalar : Real)  returns VectorWithMagnitude
         ---Purpose :
         --  Computes the product of the vector <me> by a scalar.
         --  A new vector is returned.
@@ -139,7 +139,7 @@ is
         --  Resolution from package gp.
 
 
-  Normalized (me)  returns mutable VectorWithMagnitude
+  Normalized (me)  returns VectorWithMagnitude
         ---Purpose : Returns a copy of <me> Normalized.
      raises ConstructionError
         ---Purpose :
@@ -152,7 +152,7 @@ is
         ---Purpose : Subtracts the Vector Other to <me>.
 
 
-  Subtracted (me; Other : Vector)  returns mutable VectorWithMagnitude
+  Subtracted (me; Other : Vector)  returns VectorWithMagnitude
         ---Purpose :
         --  Subtracts the vector Other to <me>. A new vector is returned.
 
@@ -165,7 +165,7 @@ is
     	---Purpose: Applies the transformation T to this vector.
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this vector.
 
 end;
diff --git a/src/Geom2d/Geom2d_AxisPlacement.cdl b/src/Geom2d/Geom2d_AxisPlacement.cdl
index e0a4be1828..ab362fc6cf 100644
--- a/src/Geom2d/Geom2d_AxisPlacement.cdl
+++ b/src/Geom2d/Geom2d_AxisPlacement.cdl
@@ -40,17 +40,17 @@ uses Ax2d   from gp,
 
 is
 
-  Create (A : Ax2d)  returns mutable AxisPlacement;
+  Create (A : Ax2d)  returns AxisPlacement;
         --- Purpose : Constructs an axis by conversion of the gp_Ax2d axis A.
 
 
-  Create (P : Pnt2d; V : Dir2d)  returns mutable AxisPlacement;
+  Create (P : Pnt2d; V : Dir2d)  returns AxisPlacement;
 	--- Purpose : Constructs an axis from a given origin P and unit vector V.
        
 
   Reverse (me : mutable);
 
-  Reversed (me)  returns mutable AxisPlacement  is static;
+  Reversed (me)  returns AxisPlacement  is static;
     	---Purpose: Reverses the unit vector of this axis.
     	-- Note:
     	-- - Reverse assigns the result to this axis, while
@@ -99,7 +99,7 @@ is
     	---Purpose: Applies the transformation T to this axis.
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
   
     	---Purpose: Creates a new object which is a copy of this axis.     
 fields
diff --git a/src/Geom2d/Geom2d_BSplineCurve.cdl b/src/Geom2d/Geom2d_BSplineCurve.cdl
index 6d122a5321..ddf9a7c721 100644
--- a/src/Geom2d/Geom2d_BSplineCurve.cdl
+++ b/src/Geom2d/Geom2d_BSplineCurve.cdl
@@ -145,7 +145,7 @@ is
           Degree         : Integer;
     	  Periodic       : Boolean = Standard_False)
 	  
-  returns mutable BSplineCurve from Geom2d
+  returns BSplineCurve from Geom2d
 
         ---Purpose :  Creates a  non-rational B_spline curve   on  the
         --         basis <Knots, Multiplicities> of degree <Degree>.
@@ -184,7 +184,7 @@ is
           Degree         : Integer;
     	  Periodic       : Boolean = Standard_False)
 	  
-  returns mutable BSplineCurve from Geom2d
+  returns BSplineCurve from Geom2d
 
         ---Purpose : Creates  a rational B_spline  curve  on the basis
         --         <Knots, Multiplicities> of degree <Degree>.
@@ -982,7 +982,7 @@ is
 	--           |f(t1) - f(t0)| < ToleranceUV
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this BSpline curve.  
     
   UpdateKnots(me : mutable)
diff --git a/src/Geom2d/Geom2d_BezierCurve.cdl b/src/Geom2d/Geom2d_BezierCurve.cdl
index 6d4ab873a9..3a715fde2c 100644
--- a/src/Geom2d/Geom2d_BezierCurve.cdl
+++ b/src/Geom2d/Geom2d_BezierCurve.cdl
@@ -93,7 +93,7 @@ is
 
 
 
-  Create (CurvePoles : Array1OfPnt2d from TColgp) returns mutable BezierCurve
+  Create (CurvePoles : Array1OfPnt2d from TColgp) returns BezierCurve
         --- Purpose :
         --  Creates a non rational Bezier curve with a set of poles :
         --  CurvePoles.  The weights are defaulted to all being 1. 
@@ -104,7 +104,7 @@ is
 
   Create (CurvePoles  : Array1OfPnt2d from TColgp;
     	  PoleWeights : Array1OfReal from TColStd) 
-     returns mutable BezierCurve
+     returns BezierCurve
         --- Purpose :
         --  Creates a rational Bezier curve with the set of poles
         --  CurvePoles and the set of weights  PoleWeights .
@@ -361,7 +361,7 @@ is
 	--           | t1 - t0| < Utolerance ===> 
 	--           |f(t1) - f(t0)| < ToleranceUV
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this Bezier curve.     
 
   Init (me : mutable; Poles   :  HArray1OfPnt2d  from TColgp;
diff --git a/src/Geom2d/Geom2d_CartesianPoint.cdl b/src/Geom2d/Geom2d_CartesianPoint.cdl
index 2c69dc5751..97aa6ee7a0 100644
--- a/src/Geom2d/Geom2d_CartesianPoint.cdl
+++ b/src/Geom2d/Geom2d_CartesianPoint.cdl
@@ -30,11 +30,11 @@ uses Ax2d       from gp,
 
 is
 
-  Create (P : Pnt2d)   returns mutable CartesianPoint;
+  Create (P : Pnt2d)   returns CartesianPoint;
         --- Purpose : Returns a persistent copy of P.
 
 
-  Create (X, Y : Real)   returns mutable CartesianPoint;
+  Create (X, Y : Real)   returns CartesianPoint;
 
 
 
@@ -78,7 +78,7 @@ is
 
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
      
 fields
 
diff --git a/src/Geom2d/Geom2d_Circle.cdl b/src/Geom2d/Geom2d_Circle.cdl
index 781a7dc20a..5e4b61f545 100644
--- a/src/Geom2d/Geom2d_Circle.cdl
+++ b/src/Geom2d/Geom2d_Circle.cdl
@@ -59,13 +59,13 @@ raises ConstructionError from Standard,
 is
 
 
-  Create (C : Circ2d)   returns mutable Circle;
+  Create (C : Circ2d)   returns Circle;
 	--- Purpose :  Constructs a circle by conversion of the gp_Circ2d circle C.
 
 
   Create (A : Ax2d; Radius : Real;
           Sense: Boolean from Standard = Standard_True)  
-  returns mutable Circle
+  returns Circle
         --- Purpose : Constructs a circle of radius Radius, whose center is the origin of axis
     	--   A; A is the "X Axis" of the local coordinate system
     	--   of the circle; this coordinate system is direct if
@@ -75,7 +75,7 @@ is
      raises ConstructionError;
 
 
-  Create (A : Ax22d; Radius : Real)  returns mutable Circle
+  Create (A : Ax22d; Radius : Real)  returns Circle
         --- Purpose : Constructs a circle
 	-- of radius Radius, where the coordinate system A
     	--   locates the circle and defines its orientation in the plane such that:
@@ -168,7 +168,7 @@ is
 ---Purpose: Applies the transformation T to this circle.
 
        
-  Copy (me)  returns mutable like me
+  Copy (me)  returns like me
      is redefined static;
 ---Purpose: Creates a new object which is a copy of this circle.
     
diff --git a/src/Geom2d/Geom2d_Curve.cdl b/src/Geom2d/Geom2d_Curve.cdl
index 9cfa55f277..f6edb649a1 100644
--- a/src/Geom2d/Geom2d_Curve.cdl
+++ b/src/Geom2d/Geom2d_Curve.cdl
@@ -99,7 +99,7 @@ is
     	-- redefined (for example, on a line).
      is virtual;  
 
-  Reversed (me)  returns mutable like me 
+  Reversed (me)  returns like me 
         --- Purpose : Creates a reversed duplicate Changes the orientation of this curve. The first and
     	-- last parameters are not changed, but the parametric
     	-- direction of the curve is reversed.
diff --git a/src/Geom2d/Geom2d_Direction.cdl b/src/Geom2d/Geom2d_Direction.cdl
index 827860da7d..1950474eb2 100644
--- a/src/Geom2d/Geom2d_Direction.cdl
+++ b/src/Geom2d/Geom2d_Direction.cdl
@@ -32,13 +32,13 @@ raises ConstructionError from Standard
 is
 
 
-  Create (X, Y :Real)  returns mutable Direction
+  Create (X, Y :Real)  returns Direction
         --- Purpose : Creates a unit vector with it 2 cartesian coordinates.
      raises ConstructionError;
         --- Purpose : 
         --  Raised if Sqrt( X*X + Y*Y) <= Resolution from gp.
 
-  Create (V : Dir2d) returns mutable Direction;
+  Create (V : Dir2d) returns Direction;
         --- Purpose : Creates a persistent copy of <me>.
 
 
@@ -97,7 +97,7 @@ is
     	---Purpose: Applies the transformation T to this unit vector, then normalizes it.
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object which is a copy of this unit vector.     
 end;
 
diff --git a/src/Geom2d/Geom2d_Ellipse.cdl b/src/Geom2d/Geom2d_Ellipse.cdl
index bbbf01c814..0b8110420b 100644
--- a/src/Geom2d/Geom2d_Ellipse.cdl
+++ b/src/Geom2d/Geom2d_Ellipse.cdl
@@ -62,14 +62,14 @@ raises ConstructionError from Standard,
 is
 
 
-  Create (E : Elips2d)  returns mutable Ellipse;
+  Create (E : Elips2d)  returns Ellipse;
         --- Purpose :
         --  Creates an ellipse by conversion of the gp_Elips2d ellipse E.
 
 
   Create (MajorAxis : Ax2d; MajorRadius, MinorRadius : Real;
           Sense: Boolean from Standard = Standard_True)
-     returns mutable Ellipse
+     returns Ellipse
     	--- Purpose :  Creates an ellipse defined by its major and minor radii,
     	--   MajorRadius and MinorRadius, and positioned
     	--   in the plane by its major axis MajorAxis; the
@@ -89,7 +89,7 @@ is
 
 
   Create (Axis : Ax22d; MajorRadius, MinorRadius : Real)
-     returns mutable Ellipse
+     returns Ellipse
     	--- Purpose : Creates an ellipse defined by its major and minor radii,
     	--   MajorRadius and MinorRadius, where the
     	--   coordinate system Axis locates the ellipse and
@@ -270,7 +270,7 @@ is
 
     	---Purpose: Applies the transformation T to this ellipse.
 
-  Copy (me)  returns mutable like me
+  Copy (me)  returns like me
      is redefined static;
     	---Purpose: Creates a new object which is a copy of this ellipse.     
 fields
diff --git a/src/Geom2d/Geom2d_Geometry.cdl b/src/Geom2d/Geom2d_Geometry.cdl
index 15a728b45e..c5be2bc906 100644
--- a/src/Geom2d/Geom2d_Geometry.cdl
+++ b/src/Geom2d/Geom2d_Geometry.cdl
@@ -102,28 +102,28 @@ is
 
 
 
-  Mirrored (me; P : Pnt2d)            returns mutable like me
+  Mirrored (me; P : Pnt2d)            returns like me
   is static;
 
-  Mirrored (me; A : Ax2d)             returns mutable like me
+  Mirrored (me; A : Ax2d)             returns like me
   is static;
 
-  Rotated (me; P : Pnt2d; Ang : Real)  returns mutable like me
+  Rotated (me; P : Pnt2d; Ang : Real)  returns like me
   is static;
 
-  Scaled (me; P : Pnt2d; S : Real)     returns mutable like me
+  Scaled (me; P : Pnt2d; S : Real)     returns like me
   is static;
 
-  Transformed (me; T : Trsf2d)        returns mutable like me
+  Transformed (me; T : Trsf2d)        returns like me
   is static;
 
-  Translated (me; V : Vec2d)          returns mutable like me
+  Translated (me; V : Vec2d)          returns like me
   is static;
 
-  Translated (me; P1, P2 : Pnt2d)     returns mutable like me
+  Translated (me; P1, P2 : Pnt2d)     returns like me
   is static;
 
-  Copy (me)  returns mutable like me is deferred;
+  Copy (me)  returns like me is deferred;
   
      
 end;
diff --git a/src/Geom2d/Geom2d_Hyperbola.cdl b/src/Geom2d/Geom2d_Hyperbola.cdl
index 694bc57943..4c32611d91 100644
--- a/src/Geom2d/Geom2d_Hyperbola.cdl
+++ b/src/Geom2d/Geom2d_Hyperbola.cdl
@@ -84,13 +84,13 @@ raises ConstructionError from Standard,
 
 is
 
-  Create (H : Hypr2d)   returns mutable Hyperbola;
+  Create (H : Hypr2d)   returns Hyperbola;
         --- Purpose : Creates  an Hyperbola from a non persistent one from package gp
 
 
   Create (MajorAxis : Ax2d; MajorRadius, MinorRadius : Real;
           Sense: Boolean from Standard = Standard_True)
-     returns mutable Hyperbola
+     returns Hyperbola
 	--- Purpose :
 	--  MajorAxis is the "XAxis" of the hyperbola.
 	--  The YAxis is in the direct sense if "Sense" is True;
@@ -100,7 +100,7 @@ is
 	--- Purpose : Raised if MajorRadius < 0.0 or if MinorRadius < 0.0
 
   Create (Axis : Ax22d; MajorRadius, MinorRadius : Real)
-     returns mutable Hyperbola
+     returns Hyperbola
 	--- Purpose :
 	--  The XDirection of "Axis" is the "XAxis" of the hyperbola and 
 	--  the YDirection of "Axis" is the "YAxis".
@@ -323,7 +323,7 @@ is
 
     	---Purpose: Applies the transformation T to this hyperbola.
 
-  Copy (me)  returns mutable like me is redefined static;
+  Copy (me)  returns like me is redefined static;
     	---Purpose: Creates a new object which is a copy of this hyperbola.
         
 fields
diff --git a/src/Geom2d/Geom2d_Line.cdl b/src/Geom2d/Geom2d_Line.cdl
index fb0ccbab4c..99d9f1d024 100644
--- a/src/Geom2d/Geom2d_Line.cdl
+++ b/src/Geom2d/Geom2d_Line.cdl
@@ -48,18 +48,18 @@ raises RangeError  from Standard
 
 is
 
-  Create (A : Ax2d)   returns mutable Line;
+  Create (A : Ax2d)   returns Line;
         --- Purpose :
         --  Creates a line located in 2D space with the axis placement A.
         --  The Location of A is the origin of the line. 
 
 
-  Create (L : Lin2d)  returns mutable Line;
+  Create (L : Lin2d)  returns Line;
         --- Purpose :
         --  Creates a line by conversion of the gp_Lin2d line L.
 
 
-  Create (P : Pnt2d; V : Dir2d)    returns mutable Line;
+  Create (P : Pnt2d; V : Dir2d)    returns Line;
         --- Purpose : Constructs a line passing through point P and parallel to
     	--   vector V (P and V are, respectively, the origin
     	--   and the unit vector of the positioning axis of the line).
@@ -195,7 +195,7 @@ is
 
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object, which is a copy of this line. 
     
 fields
diff --git a/src/Geom2d/Geom2d_OffsetCurve.cdl b/src/Geom2d/Geom2d_OffsetCurve.cdl
index 6af4a2cb76..cca2edb526 100644
--- a/src/Geom2d/Geom2d_OffsetCurve.cdl
+++ b/src/Geom2d/Geom2d_OffsetCurve.cdl
@@ -77,7 +77,7 @@ raises ConstructionError   from Standard,
 is
 
 
-  Create (C : Curve from Geom2d; Offset : Real)   returns mutable OffsetCurve
+  Create (C : Curve from Geom2d; Offset : Real)   returns OffsetCurve
         --- Purpose : Constructs a curve offset from the basis curve C,
     	-- where Offset is the distance between the offset
     	-- curve and the basis curve at any point.
@@ -328,7 +328,7 @@ is
 
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	---Purpose: Creates a new object, which is a copy of this offset curve.     
 fields
 
diff --git a/src/Geom2d/Geom2d_Parabola.cdl b/src/Geom2d/Geom2d_Parabola.cdl
index 0d2412c2ff..6781738f5e 100644
--- a/src/Geom2d/Geom2d_Parabola.cdl
+++ b/src/Geom2d/Geom2d_Parabola.cdl
@@ -60,13 +60,13 @@ is
 
 
 
-  Create (Prb : Parab2d)   returns mutable Parabola;
+  Create (Prb : Parab2d)   returns Parabola;
         --- Purpose : Creates a parabola from a non persistent one.
 
 
   Create (MirrorAxis : Ax2d; Focal : Real;
           Sense: Boolean from Standard = Standard_True)   
-  returns mutable Parabola
+  returns Parabola
 	--- Purpose :
 	--  Creates a parabola with its "MirrorAxis" and it's focal 
 	--  length "Focal".
@@ -77,7 +77,7 @@ is
      raises ConstructionError;
 	--- Purpose : Raised if Focal < 0.0
 
-  Create (Axis : Ax22d; Focal : Real)   returns mutable Parabola
+  Create (Axis : Ax22d; Focal : Real)   returns Parabola
 	--- Purpose :
 	--  Creates a parabola with its Axis and it's focal 
 	--  length "Focal".
@@ -89,7 +89,7 @@ is
 	--- Purpose : Raised if Focal < 0.0
 
 
-  Create (D : Ax2d; F : Pnt2d)  returns mutable Parabola;
+  Create (D : Ax2d; F : Pnt2d)  returns Parabola;
         --- Purpose :
         --  D is the directrix of the parabola and F the focus point.
         --  The symmetry axis "XAxis" of the parabola is normal to the
@@ -222,7 +222,7 @@ is
      is redefined static;  
 
 
-  Copy (me)  returns mutable like me
+  Copy (me)  returns like me
   is redefined static;
     	---Purpose: Creates a new object, which is a copy of this parabola.     
 fields
diff --git a/src/Geom2d/Geom2d_Transformation.cdl b/src/Geom2d/Geom2d_Transformation.cdl
index 6cec6c5fac..5024e7ce1f 100644
--- a/src/Geom2d/Geom2d_Transformation.cdl
+++ b/src/Geom2d/Geom2d_Transformation.cdl
@@ -63,11 +63,11 @@ raises ConstructionError from Standard,
 is
 
 
-  Create   returns mutable Transformation;
+  Create   returns Transformation;
         --- Purpose : Creates an identity transformation.
 
 
-  Create (T : Trsf2d)  returns mutable Transformation;
+  Create (T : Trsf2d)  returns Transformation;
         --- Purpose :  Creates a persistent copy of T.
 
 
@@ -173,14 +173,14 @@ is
         --  package gp.
 
 
-  Inverted (me)    returns mutable Transformation 
+  Inverted (me)    returns Transformation 
     	raises  ConstructionError;
     	---Purpose: Computes the inverse of this transformation and creates a new one.
         --  Raises ConstructionError  if the the transformation is singular. This means that 
         --  the ScaleFactor is lower or equal to Resolution from package gp.
 
     	
-  Multiplied (me; Other : Transformation)  returns mutable Transformation;
+  Multiplied (me; Other : Transformation)  returns Transformation;
         --- Purpose :
         --  Computes the transformation composed with Other and <me>.
         --  <me> * Other.
@@ -229,7 +229,7 @@ is
 
 
 
-  Copy (me)  returns mutable Transformation;
+  Copy (me)  returns Transformation;
     	--- Purpose: Creates a new object, which is a copy of this transformation.
     
 fields
diff --git a/src/Geom2d/Geom2d_TrimmedCurve.cdl b/src/Geom2d/Geom2d_TrimmedCurve.cdl
index a98b253eb6..e79cabcbb3 100644
--- a/src/Geom2d/Geom2d_TrimmedCurve.cdl
+++ b/src/Geom2d/Geom2d_TrimmedCurve.cdl
@@ -44,7 +44,7 @@ raises ConstructionError   from Standard,
 is
 
   Create (C : Curve; U1, U2 : Real; Sense : Boolean = Standard_True)
-     returns mutable TrimmedCurve
+     returns TrimmedCurve
         --- Purpose :
         --  Creates a trimmed curve from the basis curve C limited between 
         --  U1 and U2.
@@ -280,7 +280,7 @@ is
 
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
 ---Purpose:
 -- Creates a new object, which is a copy of this trimmed curve. 
     
diff --git a/src/Geom2d/Geom2d_Vector.cdl b/src/Geom2d/Geom2d_Vector.cdl
index 225a4097c5..0f5b5e0abe 100644
--- a/src/Geom2d/Geom2d_Vector.cdl
+++ b/src/Geom2d/Geom2d_Vector.cdl
@@ -36,7 +36,7 @@ is
         --- Purpose : Reverses the vector <me>.
 
 
-  Reversed (me) returns mutable like me
+  Reversed (me) returns like me
         --- Purpose : Returns a copy of <me> reversed.
      is static;
 
diff --git a/src/Geom2d/Geom2d_VectorWithMagnitude.cdl b/src/Geom2d/Geom2d_VectorWithMagnitude.cdl
index 48e80293d2..cd6ce9db56 100644
--- a/src/Geom2d/Geom2d_VectorWithMagnitude.cdl
+++ b/src/Geom2d/Geom2d_VectorWithMagnitude.cdl
@@ -30,15 +30,15 @@ raises ConstructionError from Standard
 is
 
 
-  Create (V : Vec2d) returns mutable VectorWithMagnitude;
+  Create (V : Vec2d) returns VectorWithMagnitude;
         --- Purpose : Creates a persistent copy of V.
 
 
-  Create (X, Y : Real)   returns mutable VectorWithMagnitude;
+  Create (X, Y : Real)   returns VectorWithMagnitude;
         --- Purpose : Creates a vector with two cartesian coordinates. 
 
 
-  Create (P1, P2 : Pnt2d)   returns mutable VectorWithMagnitude;
+  Create (P1, P2 : Pnt2d)   returns VectorWithMagnitude;
         --- Purpose :
         --  Creates a vector from the point P1 to the point P2.
         --  The magnitude of the vector is the distance between P1 and P2
@@ -75,7 +75,7 @@ is
         ---C++: alias operator +=
 
 
-  Added (me; Other : Vector)  returns mutable VectorWithMagnitude
+  Added (me; Other : Vector)  returns VectorWithMagnitude
         --- Purpose :
         --  Adds the vector Other to <me>.
         ---C++: alias operator +
@@ -94,14 +94,14 @@ is
         ---C++: alias operator /=
 
 
-  Divided (me; Scalar : Real)  returns mutable VectorWithMagnitude
+  Divided (me; Scalar : Real)  returns VectorWithMagnitude
         --- Purpose :
         --  Divides <me> by a scalar. A new vector is returned.
         ---C++: alias operator /
      is static;
 
 
-  Multiplied (me; Scalar : Real)  returns mutable VectorWithMagnitude
+  Multiplied (me; Scalar : Real)  returns VectorWithMagnitude
         --- Purpose :
         --  Computes the product of the vector <me> by a scalar.
         --  A new vector is returned.
@@ -125,7 +125,7 @@ is
         --  Resolution from package gp.
 
 
-  Normalized (me)  returns mutable VectorWithMagnitude
+  Normalized (me)  returns VectorWithMagnitude
         --- Purpose : Returns a copy of <me> Normalized.
      raises ConstructionError
         --- Purpose :
@@ -139,7 +139,7 @@ is
         ---C++: alias operator -=
 
 
-  Subtracted (me; Other : Vector)  returns mutable VectorWithMagnitude
+  Subtracted (me; Other : Vector)  returns VectorWithMagnitude
         --- Purpose :
         --  Subtracts the vector Other to <me>. A new vector is returned.
         ---C++: alias operator -
@@ -151,7 +151,7 @@ is
     	---Purpose: Applies the transformation T to this vector.
 
 
-  Copy (me)  returns mutable like me;
+  Copy (me)  returns like me;
     	--- Purpose: Creates a new object which is a copy of this vector.    
 end;
 
diff --git a/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cdl b/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cdl
index 9c76e87ccb..4375bb3775 100644
--- a/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cdl
+++ b/src/Geom2dAdaptor/Geom2dAdaptor_HCurve.cdl
@@ -29,14 +29,14 @@ raises
 
 is
 
-    Create returns mutable HCurve from Geom2dAdaptor;
+    Create returns HCurve from Geom2dAdaptor;
     
-    Create( AS : Curve from Geom2dAdaptor) returns mutable HCurve from Geom2dAdaptor;
+    Create( AS : Curve from Geom2dAdaptor) returns HCurve from Geom2dAdaptor;
 
-    Create( S : Curve from Geom2d) returns mutable HCurve from Geom2dAdaptor;
+    Create( S : Curve from Geom2d) returns HCurve from Geom2dAdaptor;
     
     Create( S : Curve from Geom2d; UFirst,ULast : Real) 
-    returns  mutable HCurve from Geom2dAdaptor
+    returns HCurve from Geom2dAdaptor
     raises ConstructionError from Standard;
     	---Purpose: ConstructionError is raised if UFirst>ULast or VFirst>VLast
 
diff --git a/src/Geom2dConvert/Geom2dConvert.cdl b/src/Geom2dConvert/Geom2dConvert.cdl
index e61bde61d2..30af5c5f7f 100644
--- a/src/Geom2dConvert/Geom2dConvert.cdl
+++ b/src/Geom2dConvert/Geom2dConvert.cdl
@@ -70,7 +70,7 @@ is
   SplitBSplineCurve (C               : BSplineCurve from Geom2d; 
                      FromK1, ToK2    : Integer;
                      SameOrientation : Boolean = Standard_True)
-     returns mutable BSplineCurve from Geom2d
+     returns BSplineCurve from Geom2d
         --- Purpose : 
         --  This method computes the arc of B-spline curve between the two 
         --  knots FromK1 and ToK2.  If C is periodic the arc has the same
@@ -97,7 +97,7 @@ is
                      FromU1, ToU2        : Real;
                      ParametricTolerance : Real;
                      SameOrientation     : Boolean = Standard_True)
-     returns mutable BSplineCurve from Geom2d
+     returns BSplineCurve from Geom2d
         --- Purpose :
         --  This function computes the segment of B-spline curve between the 
         --  parametric values FromU1, ToU2.
@@ -121,7 +121,7 @@ is
   CurveToBSplineCurve (C : Curve from Geom2d ;
     	    	       Parameterisation : ParameterisationType from Convert 
     	    	    	= Convert_TgtThetaOver2)
-     returns mutable BSplineCurve from Geom2d
+     returns BSplineCurve from Geom2d
         --- Purpose : This function converts a non infinite curve from
         --   Geom into a  B-spline curve.  C must  be  an ellipse or a
         --   circle or a trimmed conic  or a trimmed  line or a Bezier
diff --git a/src/Geom2dConvert/Geom2dConvert_BSplineCurveToBezierCurve.cdl b/src/Geom2dConvert/Geom2dConvert_BSplineCurveToBezierCurve.cdl
index 374151ef10..95bd39fb0d 100644
--- a/src/Geom2dConvert/Geom2dConvert_BSplineCurveToBezierCurve.cdl
+++ b/src/Geom2dConvert/Geom2dConvert_BSplineCurveToBezierCurve.cdl
@@ -75,7 +75,7 @@ is
     raises DomainError;
    
         
-    Arc (me : in out; Index : Integer)    returns mutable BezierCurve
+    Arc (me : in out; Index : Integer)    returns BezierCurve
         --- Purpose :Constructs and returns the Bezier curve of index
     	-- Index to the table of adjacent Bezier arcs
     	-- computed by this algorithm.
diff --git a/src/Geom2dToIGES/Geom2dToIGES_Geom2dCurve.cdl b/src/Geom2dToIGES/Geom2dToIGES_Geom2dCurve.cdl
index 3be425d9f8..84898e34f0 100644
--- a/src/Geom2dToIGES/Geom2dToIGES_Geom2dCurve.cdl
+++ b/src/Geom2dToIGES/Geom2dToIGES_Geom2dCurve.cdl
@@ -64,7 +64,7 @@ is
                      start : Curve from Geom2d;
 		     Udeb  : Real  from Standard;
 		     Ufin  : Real  from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert  an Entity from Geom2d to IGES. If this
     --            Entity could not be converted, this member returns a NullEntity.
 
diff --git a/src/Geom2dToIGES/Geom2dToIGES_Geom2dPoint.cdl b/src/Geom2dToIGES/Geom2dToIGES_Geom2dPoint.cdl
index 6a95dd84ef..2499029641 100644
--- a/src/Geom2dToIGES/Geom2dToIGES_Geom2dPoint.cdl
+++ b/src/Geom2dToIGES/Geom2dToIGES_Geom2dPoint.cdl
@@ -41,13 +41,13 @@ is
 
     Transfer2dPoint            (me    : in out;
                                 start : Point from Geom2d)
-    	 returns mutable Point from IGESGeom;
+    	 returns Point from IGESGeom;
     ---Purpose :  Transfert  a  Point from Geom to IGES. If this
     --            Entity could not be converted, this member returns a NullEntity.
 
     Transfer2dPoint            (me    : in out;
                                 start : CartesianPoint from Geom2d)
-    	 returns mutable Point from IGESGeom;
+    	 returns Point from IGESGeom;
     ---Purpose :  Transfert  a  CartesianPoint from Geom to IGES. If this
     --            Entity could not be converted, this member returns a NullEntity.
 
diff --git a/src/Geom2dToIGES/Geom2dToIGES_Geom2dVector.cdl b/src/Geom2dToIGES/Geom2dToIGES_Geom2dVector.cdl
index 29fbac55a8..373a68becb 100644
--- a/src/Geom2dToIGES/Geom2dToIGES_Geom2dVector.cdl
+++ b/src/Geom2dToIGES/Geom2dToIGES_Geom2dVector.cdl
@@ -43,7 +43,7 @@ is
 
     Transfer2dVector   (me    : in out;
                         start : Vector from Geom2d)
-    	 returns mutable Direction from IGESGeom;
+    	 returns Direction from IGESGeom;
     ---Purpose :  Transfert  a  GeometryEntity which  answer True  to  the
     --            member : BRepToIGES::IsGeomVector(Geometry).  If this
     --            Entity could not be converted, this member returns a NullEntity.
@@ -51,12 +51,12 @@ is
 
     Transfer2dVector   (me    : in out;
                         start : VectorWithMagnitude from Geom2d)
-    	 returns mutable Direction from IGESGeom;
+    	 returns Direction from IGESGeom;
 
 
     Transfer2dVector   (me    : in out;
                         start : Direction from Geom2d)
-    	 returns mutable Direction from IGESGeom;
+    	 returns Direction from IGESGeom;
 
 
 end Geom2dVector;
diff --git a/src/GeomAdaptor/GeomAdaptor_HCurve.cdl b/src/GeomAdaptor/GeomAdaptor_HCurve.cdl
index 9862b82506..6ca5ab10cf 100644
--- a/src/GeomAdaptor/GeomAdaptor_HCurve.cdl
+++ b/src/GeomAdaptor/GeomAdaptor_HCurve.cdl
@@ -29,17 +29,17 @@ raises
 
 is
 
-    Create returns mutable HCurve from GeomAdaptor;
+    Create returns HCurve from GeomAdaptor;
     	---C++: inline
     
-    Create( AS : Curve from GeomAdaptor) returns mutable HCurve from GeomAdaptor;
+    Create( AS : Curve from GeomAdaptor) returns HCurve from GeomAdaptor;
     	---C++: inline
 
-    Create( S : Curve from Geom) returns mutable HCurve from GeomAdaptor;
+    Create( S : Curve from Geom) returns HCurve from GeomAdaptor;
     	---C++: inline
     
     Create( S : Curve from Geom; UFirst,ULast : Real) 
-    returns  mutable HCurve from GeomAdaptor
+    returns HCurve from GeomAdaptor
     	---Purpose: ConstructionError is raised if UFirst>ULast or VFirst>VLast
     	---C++: inline
     raises ConstructionError from Standard;
diff --git a/src/GeomAdaptor/GeomAdaptor_HSurface.cdl b/src/GeomAdaptor/GeomAdaptor_HSurface.cdl
index 82260d9909..0ca55fc2ff 100644
--- a/src/GeomAdaptor/GeomAdaptor_HSurface.cdl
+++ b/src/GeomAdaptor/GeomAdaptor_HSurface.cdl
@@ -29,19 +29,19 @@ raises
 
 is
 
-    Create returns mutable HSurface from GeomAdaptor;
+    Create returns HSurface from GeomAdaptor;
     	---C++: inline
     
-    Create( AS : Surface from GeomAdaptor) returns mutable HSurface from GeomAdaptor;
+    Create( AS : Surface from GeomAdaptor) returns HSurface from GeomAdaptor;
     	---C++: inline
 
-    Create( S : Surface from Geom) returns mutable HSurface from GeomAdaptor;
+    Create( S : Surface from Geom) returns HSurface from GeomAdaptor;
     	---C++: inline
     
     Create( S : Surface from Geom; UFirst,ULast,VFirst,VLast : Real; 
     	    TolU  :  Real  =  0.0; 
             TolV  :  Real  =  0.0) 
-    returns  mutable HSurface from GeomAdaptor
+    returns HSurface from GeomAdaptor
     raises ConstructionError from Standard;
     	---Purpose: ConstructionError is raised if UFirst>ULast or VFirst>VLast
     	---C++: inline
diff --git a/src/GeomConvert/GeomConvert.cdl b/src/GeomConvert/GeomConvert.cdl
index f300e5f6e5..e3330579f6 100644
--- a/src/GeomConvert/GeomConvert.cdl
+++ b/src/GeomConvert/GeomConvert.cdl
@@ -109,7 +109,7 @@ is
   SplitBSplineCurve (C               : BSplineCurve from Geom; 
                      FromK1, ToK2    : Integer;
                      SameOrientation : Boolean = Standard_True)
-     returns mutable BSplineCurve from Geom
+     returns BSplineCurve from Geom
          --- Purpose : 
          --  This method computes the arc of B-spline curve between the two 
          --  knots FromK1 and ToK2.  If C is periodic the arc has the same
@@ -133,7 +133,7 @@ is
                      FromU1, ToU2        : Real;
                      ParametricTolerance : Real;
                      SameOrientation     : Boolean = Standard_True)
-     returns mutable BSplineCurve from Geom
+     returns BSplineCurve from Geom
         --- Purpose :
         --  This function computes the segment of B-spline curve between the 
         --  parametric values FromU1, ToU2.
@@ -158,7 +158,7 @@ is
                        FromUK1, ToUK2, FromVK1, ToVK2 : Integer; 
                        SameUOrientation : Boolean = Standard_True;
                        SameVOrientation : Boolean = Standard_True)
-     returns mutable BSplineSurface from Geom
+     returns BSplineSurface from Geom
         --- Purpose : 
         --  Computes the B-spline surface patche between the knots values
         --  FromUK1, ToUK2, FromVK1, ToVK2.
@@ -182,7 +182,7 @@ is
                        FromK1, ToK2    : Integer;
                        USplit          : Boolean;
                        SameOrientation : Boolean = Standard_True)
-     returns mutable BSplineSurface from Geom
+     returns BSplineSurface from Geom
         --- Purpose : 
         --  This method splits a B-spline surface patche between the
         --  knots values FromK1, ToK2 in one direction.
@@ -204,7 +204,7 @@ is
                        ParametricTolerance        : Real;
                        SameUOrientation           : Boolean = Standard_True;
                        SameVOrientation           : Boolean = Standard_True)
-     returns mutable BSplineSurface from Geom
+     returns BSplineSurface from Geom
         --- Purpose :
         --  This method computes the B-spline surface patche between the
         --  parametric values FromU1, ToU2, FromV1, ToV2.
@@ -233,7 +233,7 @@ is
                        USplit               : Boolean; 
                        ParametricTolerance  : Real;
                        SameOrientation      : Boolean = Standard_True)
-     returns mutable BSplineSurface from Geom
+     returns BSplineSurface from Geom
         --- Purpose : 
         --  This method splits the B-spline surface S in one direction
         --  between the parametric values FromParam1, ToParam2.
@@ -258,7 +258,7 @@ is
   CurveToBSplineCurve (C                : Curve from Geom ;
     	    	       Parameterisation : ParameterisationType from Convert 
     	    	       =  Convert_TgtThetaOver2)
-     returns mutable BSplineCurve from Geom
+     returns BSplineCurve from Geom
         --- Purpose : This function converts a non infinite curve from
         --  Geom into a  B-spline curve.  C must be   an ellipse or  a
         --  circle  or a trimmed conic  or a trimmed  line or a Bezier
@@ -328,7 +328,7 @@ is
       	    ConstructionError;
 	
   SurfaceToBSplineSurface (S : Surface from Geom)
-     returns mutable BSplineSurface from Geom
+     returns BSplineSurface from Geom
         --- Purpose : 
         --  This algorithm converts a non infinite surface from Geom
         --  into a B-spline surface.
diff --git a/src/GeomConvert/GeomConvert_BSplineCurveToBezierCurve.cdl b/src/GeomConvert/GeomConvert_BSplineCurveToBezierCurve.cdl
index 2b31fe3b67..078f177e54 100644
--- a/src/GeomConvert/GeomConvert_BSplineCurveToBezierCurve.cdl
+++ b/src/GeomConvert/GeomConvert_BSplineCurveToBezierCurve.cdl
@@ -65,7 +65,7 @@ is
     raises DomainError;
       
 
-    Arc (me : in out; Index : Integer)    returns mutable BezierCurve
+    Arc (me : in out; Index : Integer)    returns BezierCurve
         --- Purpose : Constructs and returns the Bezier curve of index
     	-- Index to the table of adjacent Bezier arcs
     	-- computed by this algorithm.
diff --git a/src/GeomConvert/GeomConvert_BSplineSurfaceToBezierSurface.cdl b/src/GeomConvert/GeomConvert_BSplineSurfaceToBezierSurface.cdl
index ae048eed99..5dc840fa1a 100644
--- a/src/GeomConvert/GeomConvert_BSplineSurfaceToBezierSurface.cdl
+++ b/src/GeomConvert/GeomConvert_BSplineSurfaceToBezierSurface.cdl
@@ -90,7 +90,7 @@ is
       
 
     Patch (me : in out; UIndex, VIndex : Integer)
-    returns mutable BezierSurface
+    returns BezierSurface
         --- Purpose : Constructs and returns the Bezier surface of indices
     	-- (UIndex, VIndex) to the patch grid computed on the
     	-- BSpline surface analyzed by this algorithm.
diff --git a/src/GeomFill/GeomFill_BoundWithSurf.cdl b/src/GeomFill/GeomFill_BoundWithSurf.cdl
index 43f9d34c6c..62622f6e61 100644
--- a/src/GeomFill/GeomFill_BoundWithSurf.cdl
+++ b/src/GeomFill/GeomFill_BoundWithSurf.cdl
@@ -35,7 +35,7 @@ is
     Create(CurveOnSurf : CurveOnSurface from Adaptor3d;
            Tol3d       : Real from Standard;
     	   Tolang      : Real from Standard)
-    returns mutable BoundWithSurf from GeomFill;
+    returns BoundWithSurf from GeomFill;
     	---Purpose:
     	-- Constructs a boundary object defined by the 3d curve CurveOnSurf.
     	-- The surface to be filled along this boundary will be in the
diff --git a/src/GeomFill/GeomFill_CoonsAlgPatch.cdl b/src/GeomFill/GeomFill_CoonsAlgPatch.cdl
index a28485a55e..5db378c5bd 100644
--- a/src/GeomFill/GeomFill_CoonsAlgPatch.cdl
+++ b/src/GeomFill/GeomFill_CoonsAlgPatch.cdl
@@ -33,7 +33,7 @@ is
     --          constructed blending functions are linear.
     --  Warning: No control is done on the bounds.
     --          B1/B3 and B2/B4 must be same range and well oriented.
-    returns mutable CoonsAlgPatch  from  GeomFill;
+    returns CoonsAlgPatch  from  GeomFill;
 
     Func(me;
          f1,f2 : out Function from Law)
diff --git a/src/GeomFill/GeomFill_DegeneratedBound.cdl b/src/GeomFill/GeomFill_DegeneratedBound.cdl
index ac2770c3ba..b05e607cab 100644
--- a/src/GeomFill/GeomFill_DegeneratedBound.cdl
+++ b/src/GeomFill/GeomFill_DegeneratedBound.cdl
@@ -28,7 +28,7 @@ is
     	   First, Last : Real from Standard;
            Tol3d       : Real from Standard;
     	   Tolang      : Real from Standard)
-    returns mutable DegeneratedBound from GeomFill;
+    returns DegeneratedBound from GeomFill;
 
     Value(me; 
           U : Real from Standard) 
diff --git a/src/GeomFill/GeomFill_Line.cdl b/src/GeomFill/GeomFill_Line.cdl
index ad42383d01..788b92e548 100644
--- a/src/GeomFill/GeomFill_Line.cdl
+++ b/src/GeomFill/GeomFill_Line.cdl
@@ -23,10 +23,10 @@ inherits TShared from MMgt
 
 is
 
-    Create returns mutable Line from GeomFill;
+    Create returns Line from GeomFill;
 
     Create(NbPoints : Integer from Standard)
-    returns mutable Line from GeomFill;
+    returns Line from GeomFill;
 
     NbPoints(me)
     returns Integer from Standard
diff --git a/src/GeomFill/GeomFill_SimpleBound.cdl b/src/GeomFill/GeomFill_SimpleBound.cdl
index bbb3c66699..5ae42d5582 100644
--- a/src/GeomFill/GeomFill_SimpleBound.cdl
+++ b/src/GeomFill/GeomFill_SimpleBound.cdl
@@ -31,7 +31,7 @@ is
     Create(Curve  : HCurve from Adaptor3d;
            Tol3d  : Real from Standard;
     	   Tolang : Real from Standard)
-    returns mutable SimpleBound from GeomFill;
+    returns SimpleBound from GeomFill;
 
     	--- Purpose:
     	-- Constructs the boundary object defined by the 3d curve.
diff --git a/src/GeomFill/GeomFill_TgtOnCoons.cdl b/src/GeomFill/GeomFill_TgtOnCoons.cdl
index 32b71292df..02cb471339 100644
--- a/src/GeomFill/GeomFill_TgtOnCoons.cdl
+++ b/src/GeomFill/GeomFill_TgtOnCoons.cdl
@@ -27,7 +27,7 @@ uses
 is
     Create(K : CoonsAlgPatch from GeomFill;
            I : Integer from Standard)
-    returns mutable TgtOnCoons from GeomFill;
+    returns TgtOnCoons from GeomFill;
 
     Value(me; W : Real from Standard)
     returns Vec from gp;
diff --git a/src/GeomPlate/GeomPlate_Surface.cdl b/src/GeomPlate/GeomPlate_Surface.cdl
index 330d5db7ca..dbaf9df3ac 100644
--- a/src/GeomPlate/GeomPlate_Surface.cdl
+++ b/src/GeomPlate/GeomPlate_Surface.cdl
@@ -52,7 +52,7 @@ is
        
     
   Create ( Surfinit : Surface from  Geom; Surfinter :  Plate  from  Plate)   
-  returns  mutable  Surface  from  GeomPlate ;
+  returns  Surface  from  GeomPlate ;
   
   UReverse (me : mutable)
         ---Purpose :
@@ -198,11 +198,11 @@ is
 	---Purpose: raises if the surface is not vperiodic.
     is redefined;
 
-  UIso (me; U : Real)  returns  mutable Curve
+  UIso (me; U : Real)  returns Curve
         ---Purpose : Computes the U isoparametric curve.
      	;
 
-  VIso (me; V : Real)  returns mutable Curve
+  VIso (me; V : Real)  returns Curve
         ---Purpose : Computes the V isoparametric curve.
     ;
 
@@ -283,7 +283,7 @@ is
         ---Purpose : Raised if Nu + Nv < 1 or Nu < 0 or Nv < 0.
     ;  
 
-  Copy (me)  returns mutable like me; 
+  Copy (me)  returns like me; 
 
   Transform (me : mutable; T : Trsf) ;
         ---Purpose :
diff --git a/src/GeomToIGES/GeomToIGES_GeomCurve.cdl b/src/GeomToIGES/GeomToIGES_GeomCurve.cdl
index 493aff5d0c..ef5706f3e8 100644
--- a/src/GeomToIGES/GeomToIGES_GeomCurve.cdl
+++ b/src/GeomToIGES/GeomToIGES_GeomCurve.cdl
@@ -64,7 +64,7 @@ is
                    start : Curve from Geom;
 		   Udeb  : Real  from Standard;
 		   Ufin  : Real  from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
     ---Purpose :  Transfert  a  GeometryEntity which  answer True  to  the
     --            member : BRepToIGES::IsGeomCurve(Geometry).  If this
     --            Entity could not be converted, this member returns a NullEntity.
@@ -74,77 +74,77 @@ is
                    start : BoundedCurve from Geom;
 		   Udeb  : Real         from Standard;
 		   Ufin  : Real         from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                    start : BSplineCurve from Geom;
 		   Udeb  : Real         from Standard;
 		   Ufin  : Real         from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                    start : BezierCurve from Geom;
           	   Udeb  : Real        from Standard;
 		   Ufin  : Real        from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 	 
     TransferCurve (me    : in out;
                    start : TrimmedCurve from Geom;
           	   Udeb  : Real        from Standard;
 		   Ufin  : Real        from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                    start : Conic from Geom;
 		   Udeb  : Real  from Standard;
 		   Ufin  : Real  from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                     start : Circle from Geom;
  		    Udeb  : Real   from Standard;
 		    Ufin  : Real   from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                    start : Ellipse from Geom;
 		   Udeb  : Real    from Standard;
 		   Ufin  : Real    from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                    start : Hyperbola from Geom;
 		   Udeb  : Real      from Standard;
 		   Ufin  : Real      from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                    start : Line from Geom;
 		   Udeb  : Real from Standard;
 		   Ufin  : Real from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                    start : Parabola from Geom;
 	           Udeb  : Real     from Standard;
 		   Ufin  : Real     from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
     TransferCurve (me    : in out;
                    start : OffsetCurve from Geom;
  		   Udeb  : Real        from Standard;
 		   Ufin  : Real        from Standard)
-    	 returns mutable IGESEntity from IGESData;
+    	 returns IGESEntity from IGESData;
 
 
 end GeomCurve;
diff --git a/src/GeomToIGES/GeomToIGES_GeomPoint.cdl b/src/GeomToIGES/GeomToIGES_GeomPoint.cdl
index 338a8b405a..b3d407cd4f 100644
--- a/src/GeomToIGES/GeomToIGES_GeomPoint.cdl
+++ b/src/GeomToIGES/GeomToIGES_GeomPoint.cdl
@@ -41,13 +41,13 @@ is
 
     TransferPoint            (me    : in out;
                               start : Point from Geom)
-    	 returns mutable Point from IGESGeom;
+    	 returns Point from IGESGeom;
     ---Purpose :  Transfert  a  Point from Geom to IGES. If this
     --            Entity could not be converted, this member returns a NullEntity.
 
     TransferPoint            (me    : in out;
                               start : CartesianPoint from Geom)
-    	 returns mutable Point from IGESGeom;
+    	 returns Point from IGESGeom;
     ---Purpose :  Transfert  a  CartesianPoint from Geom to IGES. If this
     --            Entity could not be converted, this member returns a NullEntity.
 
diff --git a/src/GeomToIGES/GeomToIGES_GeomSurface.cdl b/src/GeomToIGES/GeomToIGES_GeomSurface.cdl
index a44b2f3dd5..0863102041 100644
--- a/src/GeomToIGES/GeomToIGES_GeomSurface.cdl
+++ b/src/GeomToIGES/GeomToIGES_GeomSurface.cdl
@@ -73,7 +73,7 @@ is
 			    Ufin  : Real    from Standard;
 			    Vdeb  : Real    from Standard;
 			    Vfin  : Real    from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
     	---Purpose: Transfert  a  GeometryEntity which  answer True  to  the
     	--          member : BRepToIGES::IsGeomSurface(Geometry).  If this
     	--          Entity could not be converted, this member returns a NullEntity.
@@ -85,7 +85,7 @@ is
 			    Ufin  : Real           from Standard;
 			    Vdeb  : Real           from Standard;
 			    Vfin  : Real           from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -94,7 +94,7 @@ is
 			    Ufin  : Real           from Standard;
 			    Vdeb  : Real           from Standard;
 			    Vfin  : Real           from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
     TransferSurface        (me    : in out;
                             start : BezierSurface from Geom;
@@ -102,7 +102,7 @@ is
 			    Ufin  : Real          from Standard;
 			    Vdeb  : Real          from Standard;
 			    Vfin  : Real          from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
     TransferSurface        (me    : in out;
                             start : RectangularTrimmedSurface from Geom;
@@ -110,7 +110,7 @@ is
 			    Ufin  : Real                      from Standard;
 			    Vdeb  : Real                      from Standard;
 			    Vfin  : Real                      from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -119,7 +119,7 @@ is
 		            Ufin  : Real              from Standard;
 		            Vdeb  : Real              from Standard;
 		            Vfin  : Real              from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -128,7 +128,7 @@ is
           		    Ufin  : Real  from Standard;
 		            Vdeb  : Real  from Standard;
 		            Vfin  : Real  from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
     
 
     TransferSurface        (me    : in out;
@@ -137,7 +137,7 @@ is
 		            Ufin  : Real               from Standard;
 		            Vdeb  : Real               from Standard;
 		            Vfin  : Real               from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -146,7 +146,7 @@ is
 			    Ufin  : Real           from Standard;
 			    Vdeb  : Real           from Standard;
 			    Vfin  : Real           from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -155,7 +155,7 @@ is
 		            Ufin  : Real             from Standard;
 		            Vdeb  : Real             from Standard;
 		            Vfin  : Real             from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -164,7 +164,7 @@ is
 			    Ufin  : Real            from Standard;
 		            Vdeb  : Real            from Standard;
 		            Vfin  : Real            from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -173,7 +173,7 @@ is
 			    Ufin  : Real         from Standard;
 			    Vdeb  : Real         from Standard;
 			    Vfin  : Real         from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -182,7 +182,7 @@ is
 	   	    	    Ufin  : Real                     from Standard;
 	         	    Vdeb  : Real                     from Standard;
 		            Vfin  : Real                     from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -191,7 +191,7 @@ is
 			    Ufin  : Real                from Standard;
 			    Vdeb  : Real                from Standard;
 			    Vfin  : Real                from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferSurface        (me    : in out;
@@ -200,7 +200,7 @@ is
 			    Ufin  : Real          from Standard;
 			    Vdeb  : Real          from Standard;
 			    Vfin  : Real          from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     -- Methods for translating sufraces in BRep IGES
@@ -212,7 +212,7 @@ is
           		    Ufin  : Real  from Standard;
 		            Vdeb  : Real  from Standard;
 		            Vfin  : Real  from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
 
     TransferCylindricalSurface(me   : in out;
@@ -221,7 +221,7 @@ is
           		       Ufin : Real  from Standard;
 		               Vdeb : Real  from Standard;
 		               Vfin : Real  from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
     
     
     TransferConicalSurface(me   : in out;
@@ -230,7 +230,7 @@ is
           		   Ufin : Real  from Standard;
 		           Vdeb : Real  from Standard;
 		           Vfin : Real  from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
     
     
     TransferSphericalSurface(me   : in out;
@@ -239,7 +239,7 @@ is
           		     Ufin : Real  from Standard;
 		             Vdeb : Real  from Standard;
 		             Vfin : Real  from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
     
     
     TransferToroidalSurface(me   : in out;
@@ -248,7 +248,7 @@ is
           		    Ufin : Real  from Standard;
 		            Vdeb : Real  from Standard;
 		            Vfin : Real  from Standard)
-    returns mutable IGESEntity from IGESData;
+    returns IGESEntity from IGESData;
 
     -- Methods for setting and obtaining fields.
     
diff --git a/src/GeomToIGES/GeomToIGES_GeomVector.cdl b/src/GeomToIGES/GeomToIGES_GeomVector.cdl
index c961604154..0415f40ef2 100644
--- a/src/GeomToIGES/GeomToIGES_GeomVector.cdl
+++ b/src/GeomToIGES/GeomToIGES_GeomVector.cdl
@@ -42,7 +42,7 @@ is
 
     TransferVector   (me    : in out;
                       start : Vector from Geom)
-    	 returns mutable Direction from IGESGeom;
+    	 returns Direction from IGESGeom;
     ---Purpose :  Transfert  a  GeometryEntity which  answer True  to  the
     --            member : BRepToIGES::IsGeomVector(Geometry).  If this
     --            Entity could not be converted, this member returns a NullEntity.
@@ -50,12 +50,12 @@ is
 
     TransferVector   (me    : in out;
                       start : VectorWithMagnitude from Geom)
-    	 returns mutable Direction from IGESGeom;
+    	 returns Direction from IGESGeom;
 
 
     TransferVector   (me    : in out;
                       start : Direction from Geom)
-    	 returns mutable Direction from IGESGeom;
+    	 returns Direction from IGESGeom;
 
 
 end GeomVector;
diff --git a/src/GeomTools/GeomTools_UndefinedTypeHandler.cdl b/src/GeomTools/GeomTools_UndefinedTypeHandler.cdl
index da5262ae3e..e834723f1e 100644
--- a/src/GeomTools/GeomTools_UndefinedTypeHandler.cdl
+++ b/src/GeomTools/GeomTools_UndefinedTypeHandler.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-    Create returns mutable UndefinedTypeHandler from GeomTools;
+    Create returns UndefinedTypeHandler from GeomTools;
     
     -- Curve
     
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPoints.cdl b/src/Graphic3d/Graphic3d_ArrayOfPoints.cdl
index 665d008800..459a4b0211 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPoints.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfPoints.cdl
@@ -19,7 +19,7 @@ is
   -- constructor
   Create (maxVertexs: Integer from Standard;
           hasVColors: Boolean from Standard = Standard_False)
-  returns mutable ArrayOfPoints from Graphic3d;
+  returns ArrayOfPoints from Graphic3d;
   ---Purpose: Creates an array of points,
   -- a single pixel point is drawn at each vertex.
   -- The array must be filled using the AddVertex(Point) method. 
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPolygons.cdl b/src/Graphic3d/Graphic3d_ArrayOfPolygons.cdl
index 4a6a366bc3..5947f07599 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPolygons.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolygons.cdl
@@ -25,7 +25,7 @@ is
                 hasVColors: Boolean from Standard = Standard_False;
                 hasBColors: Boolean from Standard = Standard_False;
                 hasTexels: Boolean from Standard = Standard_False)
-	returns mutable ArrayOfPolygons from Graphic3d;
+	returns ArrayOfPolygons from Graphic3d;
         ---Purpose: Creates an array of polygons,
 	-- a polygon can be filled as:
 	-- 1) creating a single polygon defined with his vertexs.
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPolylines.cdl b/src/Graphic3d/Graphic3d_ArrayOfPolylines.cdl
index fe8a82a071..f0a7d0cda9 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPolylines.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfPolylines.cdl
@@ -23,7 +23,7 @@ is
                 maxEdges: Integer from Standard = 0;
                 hasVColors: Boolean from Standard = Standard_False;
                 hasBColors: Boolean from Standard = Standard_False)
-	returns mutable ArrayOfPolylines from Graphic3d;
+	returns ArrayOfPolylines from Graphic3d;
         ---Purpose: Creates an array of polylines,
         -- a polyline can be filled as:
         -- 1) creating a single polyline defined with his vertexs.
diff --git a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl
index b0562814ac..c19aa03d0e 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfPrimitives.cdl
@@ -59,7 +59,7 @@ is
                 hasVColors: Boolean from Standard;
                 hasBColors: Boolean from Standard;
                 hasTexels: Boolean from Standard)
-    returns mutable ArrayOfPrimitives from Graphic3d
+    returns ArrayOfPrimitives from Graphic3d
         raises  InitialisationError from Graphic3d;
     ---Purpose:  Warning
     -- You must use a coherent set of AddVertex() methods according to the
diff --git a/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cdl b/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cdl
index 35ff3bbefe..efd12f612e 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangleStrips.cdl
@@ -24,7 +24,7 @@ is
                 hasVColors: Boolean from Standard = Standard_False;
                 hasSColors: Boolean from Standard = Standard_False;
                 hasTexels: Boolean from Standard = Standard_False)
-	returns mutable ArrayOfQuadrangleStrips from Graphic3d;
+	returns ArrayOfQuadrangleStrips from Graphic3d;
         ---Purpose: Creates an array of quadrangle strips,
 	-- a polygon can be filled as:
 	-- 1) creating a single strip defined with his vertexs.
diff --git a/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cdl b/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cdl
index f5e6be59c0..7316322269 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfQuadrangles.cdl
@@ -32,7 +32,7 @@ is
                 hasVNormals: Boolean from Standard = Standard_False;
                 hasVColors: Boolean from Standard = Standard_False;
                 hasTexels: Boolean from Standard = Standard_False)
-	returns mutable ArrayOfQuadrangles from Graphic3d;
+	returns ArrayOfQuadrangles from Graphic3d;
         ---Purpose: Creates an array of quadrangles,
 	-- a quadrangle can be filled as:
 	-- 1) creating a set of quadrangles defined with his vertexs.
diff --git a/src/Graphic3d/Graphic3d_ArrayOfSegments.cdl b/src/Graphic3d/Graphic3d_ArrayOfSegments.cdl
index a9d74cee63..5b3daef983 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfSegments.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfSegments.cdl
@@ -21,7 +21,7 @@ is
                 maxVertexs: Integer from Standard;
 		maxEdges: Integer from Standard = 0;
                 hasVColors: Boolean from Standard = Standard_False)
-	returns mutable ArrayOfSegments from Graphic3d;
+	returns ArrayOfSegments from Graphic3d;
         ---Purpose: Creates an array of segments,
 	-- a segment can be filled as:
 	-- 1) creating a set of segments defined with his vertexs.
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cdl b/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cdl
index 4d9d447e1f..60ea54bc13 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleFans.cdl
@@ -24,7 +24,7 @@ is
                 hasVColors: Boolean from Standard = Standard_False;
                 hasFColors: Boolean from Standard = Standard_False;
                 hasTexels: Boolean from Standard = Standard_False)
-	returns mutable ArrayOfTriangleFans from Graphic3d;
+	returns ArrayOfTriangleFans from Graphic3d;
         ---Purpose: Creates an array of triangle fans,
         -- a polygon can be filled as:
         -- 1) creating a single fan defined with his vertexs.
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cdl b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cdl
index 07a3351ced..39711de824 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangleStrips.cdl
@@ -24,7 +24,7 @@ is
                 hasVColors: Boolean from Standard = Standard_False;
                 hasSColors: Boolean from Standard = Standard_False;
                 hasTexels: Boolean from Standard = Standard_False)
-	returns mutable ArrayOfTriangleStrips from Graphic3d;
+	returns ArrayOfTriangleStrips from Graphic3d;
         ---Purpose: Creates an array of triangle strips,
         -- a polygon can be filled as:
         -- 1) creating a single strip defined with his vertexs.
diff --git a/src/Graphic3d/Graphic3d_ArrayOfTriangles.cdl b/src/Graphic3d/Graphic3d_ArrayOfTriangles.cdl
index fc78e9df27..c0a6e6c367 100644
--- a/src/Graphic3d/Graphic3d_ArrayOfTriangles.cdl
+++ b/src/Graphic3d/Graphic3d_ArrayOfTriangles.cdl
@@ -23,7 +23,7 @@ is
                 hasVNormals: Boolean from Standard = Standard_False;
                 hasVColors: Boolean from Standard = Standard_False;
                 hasTexels: Boolean from Standard = Standard_False)
-	returns mutable ArrayOfTriangles from Graphic3d;
+	returns ArrayOfTriangles from Graphic3d;
         ---Purpose: Creates an array of triangles,
         -- a triangle can be filled as:
         -- 1) creating a set of triangles defined with his vertexs.
diff --git a/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl b/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
index 627561db99..09ee7eb582 100644
--- a/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
+++ b/src/Graphic3d/Graphic3d_AspectFillArea3d.cdl
@@ -52,7 +52,7 @@ uses
 is
 
         Create
-                returns mutable AspectFillArea3d from Graphic3d;
+                returns AspectFillArea3d from Graphic3d;
         ---Level: Public
         ---Purpose: Creates a context table for fill area primitives
         --          defined with the following default values:
@@ -79,7 +79,7 @@ is
                  EdgeWidth      : Real from Standard;
                  FrontMaterial  : MaterialAspect from Graphic3d;
                  BackMaterial   : MaterialAspect from Graphic3d )
-                returns mutable AspectFillArea3d from Graphic3d;
+                returns AspectFillArea3d from Graphic3d;
 
         ---Level: Public
         ---Purpose: Creates a context table for fill area primitives
diff --git a/src/Graphic3d/Graphic3d_AspectLine3d.cdl b/src/Graphic3d/Graphic3d_AspectLine3d.cdl
index e155335edc..b321d10eb9 100644
--- a/src/Graphic3d/Graphic3d_AspectLine3d.cdl
+++ b/src/Graphic3d/Graphic3d_AspectLine3d.cdl
@@ -31,7 +31,7 @@ uses
 is
 
 	Create
-		returns mutable AspectLine3d from Graphic3d;
+		returns AspectLine3d from Graphic3d;
 	---Level: Public
 	---Purpose: Creates a context table for line primitives
 	--	    defined with the following default values:
@@ -43,7 +43,7 @@ is
 	Create ( AColor	: Color from Quantity;
 		 AType	: TypeOfLine from Aspect;
 		 AWidth	: Real from Standard )
-		returns mutable AspectLine3d from Graphic3d;
+		returns AspectLine3d from Graphic3d;
 	---Level: Public
 	---Purpose: Creates a context table for line primitives
 	--	    defined with the specified values.
diff --git a/src/Graphic3d/Graphic3d_AspectMarker3d.cdl b/src/Graphic3d/Graphic3d_AspectMarker3d.cdl
index 37932da2a4..a5c5565749 100644
--- a/src/Graphic3d/Graphic3d_AspectMarker3d.cdl
+++ b/src/Graphic3d/Graphic3d_AspectMarker3d.cdl
@@ -37,7 +37,7 @@ uses
 is
 
   Create
-  returns mutable AspectMarker3d from Graphic3d;
+  returns AspectMarker3d from Graphic3d;
   ---Level: Public
   ---Purpose: Creates a context table for marker primitives
   --          defined with the following default values:
@@ -49,19 +49,19 @@ is
   Create (theType             : TypeOfMarker from Aspect;
           theColor            : Color from Quantity;
           theScale            : Real from Standard)
-  returns mutable AspectMarker3d from Graphic3d;
+  returns AspectMarker3d from Graphic3d;
 
   Create (theColor            : Color from Quantity;
           theWidth            : Integer from Standard;
           theHeight           : Integer from Standard;
           theTextureBitmap    : HArray1OfByte from TColStd)
-  returns mutable AspectMarker3d from Graphic3d;
+  returns AspectMarker3d from Graphic3d;
   ---Level: Public
   ---Purpose: Creates a context table for marker primitives
   --          defined with the specified values.
 
   Create (theTextureImage     : PixMap_Handle from Image)
-  returns mutable AspectMarker3d from Graphic3d;
+  returns AspectMarker3d from Graphic3d;
   ---Level: Public
   ---Purpose: Creates a context table for marker primitives
   --          defined with the specified values.
diff --git a/src/Graphic3d/Graphic3d_AspectText3d.cdl b/src/Graphic3d/Graphic3d_AspectText3d.cdl
index ba8e46f326..3923253a70 100644
--- a/src/Graphic3d/Graphic3d_AspectText3d.cdl
+++ b/src/Graphic3d/Graphic3d_AspectText3d.cdl
@@ -46,7 +46,7 @@ raises
 is
 
     Create
-        returns mutable AspectText3d from Graphic3d;
+        returns AspectText3d from Graphic3d;
     ---Level: Public
     ---Purpose: Creates a context table for text primitives
     --      defined with the following default values:
@@ -64,7 +64,7 @@ is
              ASpace             : Real from Standard;
              AStyle             : TypeOfStyleText from Aspect = Aspect_TOST_NORMAL;
              ADisplayType       : TypeOfDisplayText from Aspect = Aspect_TODT_NORMAL )
-        returns mutable AspectText3d from Graphic3d
+        returns AspectText3d from Graphic3d
     ---Level: Public
     ---Purpose: Creates a context table for text primitives
     --      defined with the specified values.
diff --git a/src/Graphic3d/Graphic3d_GraphicDriver.cdl b/src/Graphic3d/Graphic3d_GraphicDriver.cdl
index 5794670f63..0541027e6c 100644
--- a/src/Graphic3d/Graphic3d_GraphicDriver.cdl
+++ b/src/Graphic3d/Graphic3d_GraphicDriver.cdl
@@ -99,7 +99,7 @@ raises
 
 is
         Initialize ( AShrName       : CString from Standard )
-                returns mutable GraphicDriver from Graphic3d;
+                returns GraphicDriver from Graphic3d;
         ---Level: Public
         ---Purpose: Initialises the Driver
 
diff --git a/src/Graphic3d/Graphic3d_Group.cdl b/src/Graphic3d/Graphic3d_Group.cdl
index 4590b5c45f..e13e816665 100644
--- a/src/Graphic3d/Graphic3d_Group.cdl
+++ b/src/Graphic3d/Graphic3d_Group.cdl
@@ -101,7 +101,7 @@ deferred class Group from Graphic3d inherits TShared
     
     is
         Initialize (theStructure : Structure from Graphic3d)
-            returns mutable Group from Graphic3d;
+            returns Group from Graphic3d;
         ---Level: Public
         ---Purpose: Creates a group in the structure <AStructure>.
     
@@ -482,7 +482,7 @@ deferred class Group from Graphic3d inherits TShared
         ---Category: Inquire methods
     
         Structure ( me )
-            returns mutable Structure from Graphic3d
+            returns Structure from Graphic3d
             is static;
         ---Level: Public
         ---Purpose: Returns the structure containing the group <me>.
diff --git a/src/Graphic3d/Graphic3d_Structure.cdl b/src/Graphic3d/Graphic3d_Structure.cdl
index ac60b380c5..b3d0207af3 100644
--- a/src/Graphic3d/Graphic3d_Structure.cdl
+++ b/src/Graphic3d/Graphic3d_Structure.cdl
@@ -87,7 +87,7 @@ is
 	------------------------
 
   Create (theManager : StructureManager from Graphic3d)
-  returns mutable Structure from Graphic3d;
+  returns Structure from Graphic3d;
   ---Level: Public
   ---Purpose: Creates a graphic object in the manager theManager.
   -- It will appear in all the views of the visualiser.
@@ -96,7 +96,7 @@ is
 
   Create (theManager : StructureManager from Graphic3d;
           thePrs     : Structure        from Graphic3d)
-  returns mutable Structure from Graphic3d;
+  returns Structure from Graphic3d;
   ---Level: Public
   ---Purpose: Creates a shadow link to existing graphic object.
 
diff --git a/src/Graphic3d/Graphic3d_Texture1Dmanual.cdl b/src/Graphic3d/Graphic3d_Texture1Dmanual.cdl
index ad7129ced3..dc254e3aa7 100644
--- a/src/Graphic3d/Graphic3d_Texture1Dmanual.cdl
+++ b/src/Graphic3d/Graphic3d_Texture1Dmanual.cdl
@@ -29,13 +29,13 @@ uses
 
 is
 
-  Create (theFileName : AsciiString from TCollection) returns mutable Texture1Dmanual from Graphic3d;
+  Create (theFileName : AsciiString from TCollection) returns Texture1Dmanual from Graphic3d;
   ---Purpose: Creates a texture from the file FileName.
 
-  Create (theNOT : NameOfTexture1D from Graphic3d) returns mutable Texture1Dmanual from Graphic3d;
+  Create (theNOT : NameOfTexture1D from Graphic3d) returns Texture1Dmanual from Graphic3d;
   ---Purpose: Create a texture from a predefined texture name set.
 
-  Create (thePixMap : PixMap_Handle from Image) returns mutable Texture1Dmanual from Graphic3d;
+  Create (thePixMap : PixMap_Handle from Image) returns Texture1Dmanual from Graphic3d;
   ---Purpose: Creates a texture from the pixmap.
 
 end Texture1Dmanual;
diff --git a/src/Graphic3d/Graphic3d_Texture1Dsegment.cdl b/src/Graphic3d/Graphic3d_Texture1Dsegment.cdl
index eb7ba4fc56..2f9447051e 100644
--- a/src/Graphic3d/Graphic3d_Texture1Dsegment.cdl
+++ b/src/Graphic3d/Graphic3d_Texture1Dsegment.cdl
@@ -31,13 +31,13 @@ uses
 
 is
 
-  Create (theFileName : AsciiString from TCollection) returns mutable Texture1Dsegment from Graphic3d;
+  Create (theFileName : AsciiString from TCollection) returns Texture1Dsegment from Graphic3d;
   ---Purpose: Creates a texture from a file
 
-  Create (theNOT : NameOfTexture1D from Graphic3d) returns mutable Texture1Dsegment from Graphic3d;
+  Create (theNOT : NameOfTexture1D from Graphic3d) returns Texture1Dsegment from Graphic3d;
   ---Purpose: Creates a texture from a predefined texture name set.
 
-  Create (thePixMap : PixMap_Handle from Image) returns mutable Texture1Dsegment from Graphic3d;
+  Create (thePixMap : PixMap_Handle from Image) returns Texture1Dsegment from Graphic3d;
   ---Purpose: Creates a texture from the pixmap.
 
   SetSegment (me : mutable;
diff --git a/src/Graphic3d/Graphic3d_Texture2Dmanual.cdl b/src/Graphic3d/Graphic3d_Texture2Dmanual.cdl
index 8a24579b0d..278a447e75 100644
--- a/src/Graphic3d/Graphic3d_Texture2Dmanual.cdl
+++ b/src/Graphic3d/Graphic3d_Texture2Dmanual.cdl
@@ -30,13 +30,13 @@ uses
 
 is
 
-  Create (theFileName : AsciiString from TCollection) returns mutable Texture2Dmanual from Graphic3d;
+  Create (theFileName : AsciiString from TCollection) returns Texture2Dmanual from Graphic3d;
   ---Purpose: Creates a texture from a file
 
-  Create (theNOT : NameOfTexture2D from Graphic3d) returns mutable Texture2Dmanual from Graphic3d;
+  Create (theNOT : NameOfTexture2D from Graphic3d) returns Texture2Dmanual from Graphic3d;
   ---Purpose: Creates a texture from a predefined texture name set.
 
-  Create (thePixMap : PixMap_Handle from Image) returns mutable Texture2Dmanual from Graphic3d;
+  Create (thePixMap : PixMap_Handle from Image) returns Texture2Dmanual from Graphic3d;
   ---Purpose: Creates a texture from the pixmap.
 
 end Texture2Dmanual;
diff --git a/src/Graphic3d/Graphic3d_Texture2Dplane.cdl b/src/Graphic3d/Graphic3d_Texture2Dplane.cdl
index b27d9b1e3d..a6d2ec1f55 100644
--- a/src/Graphic3d/Graphic3d_Texture2Dplane.cdl
+++ b/src/Graphic3d/Graphic3d_Texture2Dplane.cdl
@@ -30,13 +30,13 @@ uses
 
 is
 
-  Create (theFileName : AsciiString from TCollection) returns mutable Texture2Dplane from Graphic3d;
+  Create (theFileName : AsciiString from TCollection) returns Texture2Dplane from Graphic3d;
   ---Purpose: Creates a texture from a file
 
-  Create (theNOT : NameOfTexture2D from Graphic3d) returns mutable Texture2Dplane from Graphic3d;
+  Create (theNOT : NameOfTexture2D from Graphic3d) returns Texture2Dplane from Graphic3d;
   ---Purpose: Creates a texture from a predefined texture name set.
 
-  Create (thePixMap : PixMap_Handle from Image) returns mutable Texture2Dplane from Graphic3d;
+  Create (thePixMap : PixMap_Handle from Image) returns Texture2Dplane from Graphic3d;
   ---Purpose: Creates a texture from the pixmap.
 
   SetPlaneS (me : mutable; A, B, C, D : ShortReal from Standard);
diff --git a/src/Graphic3d/Graphic3d_TextureEnv.cdl b/src/Graphic3d/Graphic3d_TextureEnv.cdl
index 43fc35e0d5..b2cf10910b 100644
--- a/src/Graphic3d/Graphic3d_TextureEnv.cdl
+++ b/src/Graphic3d/Graphic3d_TextureEnv.cdl
@@ -31,10 +31,10 @@ raises
 
 is
 
-  Create (theFileName : AsciiString from TCollection) returns  mutable TextureEnv from Graphic3d;
+  Create (theFileName : AsciiString from TCollection) returns TextureEnv from Graphic3d;
   ---Purpose: Creates an environment texture from a file.
 
-  Create (theName : NameOfTextureEnv from Graphic3d) returns mutable TextureEnv from Graphic3d;
+  Create (theName : NameOfTextureEnv from Graphic3d) returns TextureEnv from Graphic3d;
   ---Purpose: Creates an environment texture from a predefined texture name set.
 
   Name (me) returns NameOfTextureEnv from Graphic3d;
diff --git a/src/HLRAlgo/HLRAlgo_EdgesBlock.cdl b/src/HLRAlgo/HLRAlgo_EdgesBlock.cdl
index 4f08386341..c25d92c936 100644
--- a/src/HLRAlgo/HLRAlgo_EdgesBlock.cdl
+++ b/src/HLRAlgo/HLRAlgo_EdgesBlock.cdl
@@ -40,7 +40,7 @@ uses
 is
     Create(NbEdges : Integer)
 	---Purpose: Create a Block of Edges for a wire.
-    returns mutable EdgesBlock from HLRAlgo;
+    returns EdgesBlock from HLRAlgo;
     
     NbEdges(me) returns Integer from Standard
     	---C++: inline
diff --git a/src/HLRAlgo/HLRAlgo_PolyAlgo.cdl b/src/HLRAlgo/HLRAlgo_PolyAlgo.cdl
index 9474cc04d0..722d695e51 100644
--- a/src/HLRAlgo/HLRAlgo_PolyAlgo.cdl
+++ b/src/HLRAlgo/HLRAlgo_PolyAlgo.cdl
@@ -30,7 +30,7 @@ uses
     
 is
     Create
-    returns mutable PolyAlgo from HLRAlgo;
+    returns PolyAlgo from HLRAlgo;
     
     Init(me : mutable; HShell : HArray1OfTransient from TColStd)
     is static;
diff --git a/src/HLRAlgo/HLRAlgo_PolyData.cdl b/src/HLRAlgo/HLRAlgo_PolyData.cdl
index cfe25e4715..2d5f8f34bc 100644
--- a/src/HLRAlgo/HLRAlgo_PolyData.cdl
+++ b/src/HLRAlgo/HLRAlgo_PolyData.cdl
@@ -29,7 +29,7 @@ uses
     EdgeStatus       from HLRAlgo
 
 is
-    Create returns mutable PolyData from HLRAlgo;
+    Create returns PolyData from HLRAlgo;
 
     HNodes(me : mutable; HNodes : HArray1OfXYZ from TColgp)
     is static;
diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalData.cdl b/src/HLRAlgo/HLRAlgo_PolyInternalData.cdl
index b261fa0cf6..f8dcdeb386 100644
--- a/src/HLRAlgo/HLRAlgo_PolyInternalData.cdl
+++ b/src/HLRAlgo/HLRAlgo_PolyInternalData.cdl
@@ -30,7 +30,7 @@ uses
 
 is
     Create(nbNod, nbTri : Integer from Standard)
-    returns mutable PolyInternalData from HLRAlgo;
+    returns PolyInternalData from HLRAlgo;
     
     UpdateLinks(me    : mutable;
                 TData : out Address from Standard;
diff --git a/src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl b/src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl
index 646bb1b700..26b0166d2e 100644
--- a/src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl
+++ b/src/HLRAlgo/HLRAlgo_PolyInternalNode.cdl
@@ -21,7 +21,7 @@ uses
     Integer from Standard
     
 is
-    Create returns mutable PolyInternalNode from HLRAlgo; 
+    Create returns PolyInternalNode from HLRAlgo; 
     	---C++: inline
     
     Indices(me) returns Address from Standard
diff --git a/src/HLRAlgo/HLRAlgo_PolyShellData.cdl b/src/HLRAlgo/HLRAlgo_PolyShellData.cdl
index 24a6a13c4e..ada2877d66 100644
--- a/src/HLRAlgo/HLRAlgo_PolyShellData.cdl
+++ b/src/HLRAlgo/HLRAlgo_PolyShellData.cdl
@@ -26,7 +26,7 @@ uses
 
 is
     Create(nbFace : Integer from Standard)
-    returns mutable PolyShellData from HLRAlgo;
+    returns PolyShellData from HLRAlgo;
 
     UpdateGlobalMinMax(me        : mutable;
                        TotMinMax : Address from Standard)
diff --git a/src/HLRAlgo/HLRAlgo_WiresBlock.cdl b/src/HLRAlgo/HLRAlgo_WiresBlock.cdl
index 4aafd9f912..7166b41c94 100644
--- a/src/HLRAlgo/HLRAlgo_WiresBlock.cdl
+++ b/src/HLRAlgo/HLRAlgo_WiresBlock.cdl
@@ -33,7 +33,7 @@ uses
 is
     Create(NbWires : Integer from Standard)
 	---Purpose: Create a Block of Blocks.
-    returns mutable WiresBlock from HLRAlgo;
+    returns WiresBlock from HLRAlgo;
 
     NbWires(me) returns Integer from Standard
     is static;
diff --git a/src/HLRBRep/HLRBRep_Algo.cdl b/src/HLRBRep/HLRBRep_Algo.cdl
index cd9d505074..0f0c902e93 100644
--- a/src/HLRBRep/HLRBRep_Algo.cdl
+++ b/src/HLRBRep/HLRBRep_Algo.cdl
@@ -53,7 +53,7 @@ uses
     Shape   from TopoDS
 
 is
-    Create returns mutable Algo from HLRBRep;
+    Create returns Algo from HLRBRep;
     	---Purpose: Constructs an empty framework for the
     	-- calculation of visible and hidden lines of a shape in a projection.
     	-- Use the function:
@@ -62,7 +62,7 @@ is
     	-- -   Update to compute the outlines of the shape, and
     	-- -   Hide to compute the visible and hidden lines of the shape.
     
-    Create(A : Algo from HLRBRep) returns mutable Algo from HLRBRep;
+    Create(A : Algo from HLRBRep) returns Algo from HLRBRep;
 
     Add(me : mutable; S     : Shape   from TopoDS;
     	    	      SData : TShared from MMgt;
diff --git a/src/HLRBRep/HLRBRep_AreaLimit.cdl b/src/HLRBRep/HLRBRep_AreaLimit.cdl
index f77524b7f1..7dacbb2297 100644
--- a/src/HLRBRep/HLRBRep_AreaLimit.cdl
+++ b/src/HLRBRep/HLRBRep_AreaLimit.cdl
@@ -34,7 +34,7 @@ Create(V            : Intersection from HLRAlgo;
        StateAfter   : State        from TopAbs;
        EdgeBefore   : State        from TopAbs;
        EdgeAfter    : State        from TopAbs)
-returns mutable AreaLimit from HLRBRep;
+returns AreaLimit from HLRBRep;
     ---Purpose: The previous and next field are set to NULL.
     
 StateBefore(me : mutable; St : State from TopAbs)
@@ -77,10 +77,10 @@ is static;
 EdgeAfter(me) returns State from TopAbs
 is static;
 
-Previous(me) returns mutable AreaLimit from HLRBRep
+Previous(me) returns AreaLimit from HLRBRep
 is static;
 
-Next(me) returns mutable AreaLimit from HLRBRep
+Next(me) returns AreaLimit from HLRBRep
 is static;
 	
 Clear(me : mutable)
diff --git a/src/HLRBRep/HLRBRep_Data.cdl b/src/HLRBRep/HLRBRep_Data.cdl
index 718d39957a..df5bf12750 100644
--- a/src/HLRBRep/HLRBRep_Data.cdl
+++ b/src/HLRBRep/HLRBRep_Data.cdl
@@ -61,7 +61,7 @@ is
     Create(NV, NE, NF : Integer from Standard)
 	---Purpose: Create an  empty data structure  of <NV> vertices,
 	--          <NE> edges and <NF> faces.
-    returns mutable Data from HLRBRep;
+    returns Data from HLRBRep;
     
     Write(me : mutable; DS       : Data    from HLRBRep;
                         dv,de,df : Integer from Standard)
diff --git a/src/HLRBRep/HLRBRep_InternalAlgo.cdl b/src/HLRBRep/HLRBRep_InternalAlgo.cdl
index 162fc0f3b5..ab9320b153 100644
--- a/src/HLRBRep/HLRBRep_InternalAlgo.cdl
+++ b/src/HLRBRep/HLRBRep_InternalAlgo.cdl
@@ -32,10 +32,10 @@ raises
     OutOfRange   from Standard
     
 is
-    Create returns mutable InternalAlgo from HLRBRep;
+    Create returns InternalAlgo from HLRBRep;
     
     Create(A : InternalAlgo from HLRBRep)
-    returns mutable InternalAlgo from HLRBRep;
+    returns InternalAlgo from HLRBRep;
     
     Projector(me: mutable; P : Projector from HLRAlgo)
 	---Purpose: set the projector.
diff --git a/src/HLRBRep/HLRBRep_PolyAlgo.cdl b/src/HLRBRep/HLRBRep_PolyAlgo.cdl
index 9e68cc24ea..aa9de4fadb 100644
--- a/src/HLRBRep/HLRBRep_PolyAlgo.cdl
+++ b/src/HLRBRep/HLRBRep_PolyAlgo.cdl
@@ -92,7 +92,7 @@ raises
     
 is
     Create
-    returns mutable PolyAlgo from HLRBRep;
+    returns PolyAlgo from HLRBRep;
     	---Purpose: Constructs an empty framework for the
     	-- calculation of the visible and hidden lines of a shape in a projection.
     	-- Use the functions:
@@ -103,10 +103,10 @@ is
     	-- The shape or shapes to be visualized must have already been triangulated.
         
     Create(A : PolyAlgo from HLRBRep)
-    returns mutable PolyAlgo from HLRBRep;
+    returns PolyAlgo from HLRBRep;
 
     Create(S : Shape from TopoDS)
-    returns mutable PolyAlgo from HLRBRep;
+    returns PolyAlgo from HLRBRep;
     
     NbShapes(me) returns Integer from Standard
 	---C++: inline
diff --git a/src/HLRBRep/HLRBRep_ShapeToHLR.cdl b/src/HLRBRep/HLRBRep_ShapeToHLR.cdl
index 7d9e17d848..13d76d0787 100644
--- a/src/HLRBRep/HLRBRep_ShapeToHLR.cdl
+++ b/src/HLRBRep/HLRBRep_ShapeToHLR.cdl
@@ -40,7 +40,7 @@ is
 		   
     ExploreFace(myclass;
                 S      :         OutLiner          from HLRTopoBRep;
-                DS     : mutable Data              from HLRBRep;
+                DS     : Data              from HLRBRep;
 	        FM     :         IndexedMapOfShape from TopTools;
 	        EM     :         IndexedMapOfShape from TopTools;
 		i      : in out  Integer           from Standard;
@@ -50,7 +50,7 @@ is
 
     ExploreShape(myclass;
                  S    :         OutLiner          from HLRTopoBRep;
-                 DS   : mutable Data              from HLRBRep;
+                 DS   : Data              from HLRBRep;
 		 FM   :         IndexedMapOfShape from TopTools; 
 		 EM   :         IndexedMapOfShape from TopTools) 
     is private;
diff --git a/src/HLRTest/HLRTest_DrawableEdgeTool.cdl b/src/HLRTest/HLRTest_DrawableEdgeTool.cdl
index 7385d7adf2..1def3542c1 100644
--- a/src/HLRTest/HLRTest_DrawableEdgeTool.cdl
+++ b/src/HLRTest/HLRTest_DrawableEdgeTool.cdl
@@ -33,7 +33,7 @@ is
            Rg1Line : Boolean from Standard;
            RgNLine : Boolean from Standard;
            ViewId  : Integer from Standard)
-    returns mutable DrawableEdgeTool from HLRTest;
+    returns DrawableEdgeTool from HLRTest;
     
     DrawOn(me; D : in out Display from Draw);
     
diff --git a/src/HLRTest/HLRTest_DrawablePolyEdgeTool.cdl b/src/HLRTest/HLRTest_DrawablePolyEdgeTool.cdl
index df0e112044..23eca60a7b 100644
--- a/src/HLRTest/HLRTest_DrawablePolyEdgeTool.cdl
+++ b/src/HLRTest/HLRTest_DrawablePolyEdgeTool.cdl
@@ -29,7 +29,7 @@ is
     Create(Alg    : PolyAlgo from HLRBRep;
            ViewId : Integer  from Standard;
            Debug  : Boolean  from Standard = Standard_False)
-    returns mutable DrawablePolyEdgeTool from HLRTest;
+    returns DrawablePolyEdgeTool from HLRTest;
     
     Show(me : mutable)
     	---C++: inline
diff --git a/src/HLRTest/HLRTest_OutLiner.cdl b/src/HLRTest/HLRTest_OutLiner.cdl
index 6fe141398e..f90de68e9b 100644
--- a/src/HLRTest/HLRTest_OutLiner.cdl
+++ b/src/HLRTest/HLRTest_OutLiner.cdl
@@ -26,7 +26,7 @@ uses
 
 is
     Create(S : Shape from TopoDS)
-    returns mutable OutLiner from HLRTest; 
+    returns OutLiner from HLRTest; 
     
     OutLiner(me) returns OutLiner from HLRTopoBRep;
 	---C++: inline
@@ -34,7 +34,7 @@ is
     DrawOn(me; dis : in out Display from Draw);
 	---Purpose: Does nothhing,
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
     is redefined;
 	
diff --git a/src/HLRTest/HLRTest_Projector.cdl b/src/HLRTest/HLRTest_Projector.cdl
index e70d5e41b0..f7841127a3 100644
--- a/src/HLRTest/HLRTest_Projector.cdl
+++ b/src/HLRTest/HLRTest_Projector.cdl
@@ -25,7 +25,7 @@ uses
 
 is
     Create(P : Projector from HLRAlgo)
-    returns mutable Projector from HLRTest; 
+    returns Projector from HLRTest; 
     
     Projector(me) returns Projector from HLRAlgo;
 	---C++: return const &
@@ -34,7 +34,7 @@ is
     DrawOn(me; dis : in out Display from Draw);
 	---Purpose: Does nothhing,
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
 	---Purpose: For variable copy.
     is redefined;
 	
diff --git a/src/HLRTest/HLRTest_ShapeData.cdl b/src/HLRTest/HLRTest_ShapeData.cdl
index f09cdd55f8..073d610b21 100644
--- a/src/HLRTest/HLRTest_ShapeData.cdl
+++ b/src/HLRTest/HLRTest_ShapeData.cdl
@@ -23,7 +23,7 @@ uses
     
 is
     Create(CVis,COVis,CIVis,CHid,COHid,CIHid : Color from Draw)
-    returns mutable ShapeData from HLRTest; 
+    returns ShapeData from HLRTest; 
     
     VisibleColor(me: mutable; CVis : Color from Draw)
     	---C++: inline
diff --git a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cdl b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cdl
index aed19483f3..a9229152ed 100644
--- a/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cdl
+++ b/src/HLRTopoBRep/HLRTopoBRep_OutLiner.cdl
@@ -25,14 +25,14 @@ uses
     MapOfShapeTool from BRepTopAdaptor
 is
     Create
-    returns mutable OutLiner from HLRTopoBRep;
+    returns OutLiner from HLRTopoBRep;
 
     Create (OriSh : Shape from TopoDS)
-    returns mutable OutLiner from HLRTopoBRep;
+    returns OutLiner from HLRTopoBRep;
 
     Create (OriS : Shape from TopoDS;
             OutS : Shape from TopoDS)
-    returns mutable OutLiner from HLRTopoBRep;
+    returns OutLiner from HLRTopoBRep;
 
     OriginalShape(me : mutable; OriS : Shape from TopoDS)
     	---C++: inline
diff --git a/src/HeaderSection/HeaderSection_FileDescription.cdl b/src/HeaderSection/HeaderSection_FileDescription.cdl
index 665098cf0f..c31cf03c9f 100644
--- a/src/HeaderSection/HeaderSection_FileDescription.cdl
+++ b/src/HeaderSection/HeaderSection_FileDescription.cdl
@@ -24,21 +24,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable FileDescription;
+	Create returns FileDescription;
 	---Purpose: Returns a FileDescription
 
 	Init (me : mutable;
-	      aDescription : mutable HArray1OfHAsciiString from Interface;
-	      aImplementationLevel : mutable HAsciiString from TCollection);
+	      aDescription : HArray1OfHAsciiString from Interface;
+	      aImplementationLevel : HAsciiString from TCollection);
 
 	-- Specific Methods for Field Data Access --
 
-	SetDescription(me : mutable; aDescription : mutable HArray1OfHAsciiString);
-	Description (me) returns mutable HArray1OfHAsciiString;
-	DescriptionValue (me; num : Integer) returns mutable HAsciiString;
+	SetDescription(me : mutable; aDescription : HArray1OfHAsciiString);
+	Description (me) returns HArray1OfHAsciiString;
+	DescriptionValue (me; num : Integer) returns HAsciiString;
 	NbDescription (me) returns Integer;
-	SetImplementationLevel(me : mutable; aImplementationLevel : mutable HAsciiString);
-	ImplementationLevel (me) returns mutable HAsciiString;
+	SetImplementationLevel(me : mutable; aImplementationLevel : HAsciiString);
+	ImplementationLevel (me) returns HAsciiString;
 
 fields
 
diff --git a/src/HeaderSection/HeaderSection_FileName.cdl b/src/HeaderSection/HeaderSection_FileName.cdl
index 9a7be51769..e46cdda33b 100644
--- a/src/HeaderSection/HeaderSection_FileName.cdl
+++ b/src/HeaderSection/HeaderSection_FileName.cdl
@@ -24,38 +24,38 @@ uses
 	HArray1OfHAsciiString from Interface
 is
 
-	Create returns mutable FileName;
+	Create returns FileName;
 	---Purpose: Returns a FileName
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aTimeStamp : mutable HAsciiString from TCollection;
-	      aAuthor : mutable HArray1OfHAsciiString from Interface;
-	      aOrganization : mutable HArray1OfHAsciiString from Interface;
-	      aPreprocessorVersion : mutable HAsciiString from TCollection;
-	      aOriginatingSystem : mutable HAsciiString from TCollection;
-	      aAuthorisation : mutable HAsciiString from TCollection);
+	      aName : HAsciiString from TCollection;
+	      aTimeStamp : HAsciiString from TCollection;
+	      aAuthor : HArray1OfHAsciiString from Interface;
+	      aOrganization : HArray1OfHAsciiString from Interface;
+	      aPreprocessorVersion : HAsciiString from TCollection;
+	      aOriginatingSystem : HAsciiString from TCollection;
+	      aAuthorisation : HAsciiString from TCollection);
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetTimeStamp(me : mutable; aTimeStamp : mutable HAsciiString);
-	TimeStamp (me) returns mutable HAsciiString;
-	SetAuthor(me : mutable; aAuthor : mutable HArray1OfHAsciiString);
-	Author (me) returns mutable HArray1OfHAsciiString;
-	AuthorValue (me; num : Integer) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetTimeStamp(me : mutable; aTimeStamp : HAsciiString);
+	TimeStamp (me) returns HAsciiString;
+	SetAuthor(me : mutable; aAuthor : HArray1OfHAsciiString);
+	Author (me) returns HArray1OfHAsciiString;
+	AuthorValue (me; num : Integer) returns HAsciiString;
 	NbAuthor (me) returns Integer;
-	SetOrganization(me : mutable; aOrganization : mutable HArray1OfHAsciiString);
-	Organization (me) returns mutable HArray1OfHAsciiString;
-	OrganizationValue (me; num : Integer) returns mutable HAsciiString;
+	SetOrganization(me : mutable; aOrganization : HArray1OfHAsciiString);
+	Organization (me) returns HArray1OfHAsciiString;
+	OrganizationValue (me; num : Integer) returns HAsciiString;
 	NbOrganization (me) returns Integer;
-	SetPreprocessorVersion(me : mutable; aPreprocessorVersion : mutable HAsciiString);
-	PreprocessorVersion (me) returns mutable HAsciiString;
-	SetOriginatingSystem(me : mutable; aOriginatingSystem : mutable HAsciiString);
-	OriginatingSystem (me) returns mutable HAsciiString;
-	SetAuthorisation(me : mutable; aAuthorisation : mutable HAsciiString);
-	Authorisation (me) returns mutable HAsciiString;
+	SetPreprocessorVersion(me : mutable; aPreprocessorVersion : HAsciiString);
+	PreprocessorVersion (me) returns HAsciiString;
+	SetOriginatingSystem(me : mutable; aOriginatingSystem : HAsciiString);
+	OriginatingSystem (me) returns HAsciiString;
+	SetAuthorisation(me : mutable; aAuthorisation : HAsciiString);
+	Authorisation (me) returns HAsciiString;
 
 fields
 
diff --git a/src/HeaderSection/HeaderSection_FileSchema.cdl b/src/HeaderSection/HeaderSection_FileSchema.cdl
index 9dcdebe773..08d00707f4 100644
--- a/src/HeaderSection/HeaderSection_FileSchema.cdl
+++ b/src/HeaderSection/HeaderSection_FileSchema.cdl
@@ -24,17 +24,17 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable FileSchema;
+	Create returns FileSchema;
 	---Purpose: Returns a FileSchema
 
 	Init (me : mutable;
-	      aSchemaIdentifiers : mutable HArray1OfHAsciiString from Interface);
+	      aSchemaIdentifiers : HArray1OfHAsciiString from Interface);
 
 	-- Specific Methods for Field Data Access --
 
-	SetSchemaIdentifiers(me : mutable; aSchemaIdentifiers : mutable HArray1OfHAsciiString);
-	SchemaIdentifiers (me) returns mutable HArray1OfHAsciiString;
-	SchemaIdentifiersValue (me; num : Integer) returns mutable HAsciiString;
+	SetSchemaIdentifiers(me : mutable; aSchemaIdentifiers : HArray1OfHAsciiString);
+	SchemaIdentifiers (me) returns HArray1OfHAsciiString;
+	SchemaIdentifiersValue (me; num : Integer) returns HAsciiString;
 	NbSchemaIdentifiers (me) returns Integer;
 
 fields
diff --git a/src/HeaderSection/HeaderSection_HeaderRecognizer.cdl b/src/HeaderSection/HeaderSection_HeaderRecognizer.cdl
index 77ff209da3..b564e593ae 100644
--- a/src/HeaderSection/HeaderSection_HeaderRecognizer.cdl
+++ b/src/HeaderSection/HeaderSection_HeaderRecognizer.cdl
@@ -24,7 +24,7 @@ uses AsciiString from TCollection
 
 is
 
-    Create returns mutable HeaderRecognizer ;
+    Create returns HeaderRecognizer ;
 
     Eval (me : mutable ; key : AsciiString from TCollection)  is protected;
     ---Purpose: Recognizes data types of Header STEP Standard
diff --git a/src/HeaderSection/HeaderSection_Protocol.cdl b/src/HeaderSection/HeaderSection_Protocol.cdl
index ede4aa2034..1cd100093d 100644
--- a/src/HeaderSection/HeaderSection_Protocol.cdl
+++ b/src/HeaderSection/HeaderSection_Protocol.cdl
@@ -22,7 +22,7 @@ uses Protocol from Interface,
      CString from Standard
 
 is
-	Create returns mutable Protocol from HeaderSection;
+	Create returns Protocol from HeaderSection;
 	TypeNumber (me; atype : any Type) returns Integer is redefined;
 	---Purpose :Returns a Case Number for each of the HeaderSection Entities
 	SchemaName(me) returns CString from Standard is redefined;
diff --git a/src/IFSelect/IFSelect.cdl b/src/IFSelect/IFSelect.cdl
index e8be04e18a..5ae39bd016 100644
--- a/src/IFSelect/IFSelect.cdl
+++ b/src/IFSelect/IFSelect.cdl
@@ -227,7 +227,7 @@ is
     --           case of Error on Writing. <file> gives the name of the File
     --           to be produced (this avoids to export the class SessionFile).
 
-    RestoreSession (WS : mutable WorkSession; file : CString) returns Boolean;
+    RestoreSession (WS : WorkSession; file : CString) returns Boolean;
     ---Purpose : Restore the state of a WorkSession from IFSelect, by using a
     --           SessionFile from IFSelect. Returns True if Done, False in
     --           case of Error on Writing. <file> gives the name of the File
diff --git a/src/IFSelect/IFSelect_Act.cdl b/src/IFSelect/IFSelect_Act.cdl
index 78e99ab2ea..5cb69ae6fd 100644
--- a/src/IFSelect/IFSelect_Act.cdl
+++ b/src/IFSelect/IFSelect_Act.cdl
@@ -42,11 +42,11 @@ raises DomainError
 
 is
 
-    Create (name, help : CString; func : ActFunc) returns mutable Act;
+    Create (name, help : CString; func : ActFunc) returns Act;
     ---Purpose : Creates an Act with a name, help and a function
     --           mode (Add or AddSet) is given when recording
 
-    Do   (me : mutable; number : Integer; pilot : mutable SessionPilot)
+    Do   (me : mutable; number : Integer; pilot : SessionPilot)
     	returns ReturnStatus;
     ---Purpose : Execution of Command Line. remark that <number> is senseless
     --           because each Act brings one and only one function
diff --git a/src/IFSelect/IFSelect_Activator.cdl b/src/IFSelect/IFSelect_Activator.cdl
index eee3e62426..1d76a93b55 100644
--- a/src/IFSelect/IFSelect_Activator.cdl
+++ b/src/IFSelect/IFSelect_Activator.cdl
@@ -95,7 +95,7 @@ is
 
 
     Select (myclass; command : CString;
-    	number : out Integer; actor : out mutable Activator)
+    	number : out Integer; actor : out Activator)
 	    returns Boolean;
     ---Purpose : Selects, for a Command given by its title, an actor with its
     --           command number. Returns True if found, False else
@@ -115,7 +115,7 @@ is
     Initialize;
     ---Purpose : Sets the default values
 
-    Do   (me : mutable; number : Integer; pilot : mutable SessionPilot)
+    Do   (me : mutable; number : Integer; pilot : SessionPilot)
     	returns ReturnStatus  is deferred;
     ---Purpose : Tries to execute a Command Line. <number> is the number of the
     --           command for this Activator. It Must forecast to record the
diff --git a/src/IFSelect/IFSelect_AppliedModifiers.cdl b/src/IFSelect/IFSelect_AppliedModifiers.cdl
index cc09edae93..0354614434 100644
--- a/src/IFSelect/IFSelect_AppliedModifiers.cdl
+++ b/src/IFSelect/IFSelect_AppliedModifiers.cdl
@@ -40,11 +40,11 @@ uses  GeneralModifier, SequenceOfGeneralModifier,
 
 is
 
-    Create (nbmax,nbent : Integer) returns mutable AppliedModifiers;
+    Create (nbmax,nbent : Integer) returns AppliedModifiers;
     ---Purpose : Creates an AppliedModifiers, ready to record up to <nbmax>
     --           modifiers, on a model of <nbent> entities
 
-    AddModif (me : mutable; modif : mutable GeneralModifier) returns Boolean;
+    AddModif (me : mutable; modif : GeneralModifier) returns Boolean;
     ---Purpose : Records a modifier. By default, it is to apply on all a
     --           produced file. Further calls to AddNum will restrict this.
     --           Returns True if done, False if too many modifiers are already
@@ -61,7 +61,7 @@ is
     ---Purpose : Returns the count of recorded modifiers
 
     Item (me : mutable; num : Integer;
-    	  modif : out mutable GeneralModifier; entcount : out Integer)
+    	  modif : out GeneralModifier; entcount : out Integer)
 	    returns Boolean;
     ---Purpose : Returns the description for applied modifier n0 <num> :
     --           the modifier itself, and the count of entities to be applied
diff --git a/src/IFSelect/IFSelect_BasicDumper.cdl b/src/IFSelect/IFSelect_BasicDumper.cdl
index e84b34d766..c259e95576 100644
--- a/src/IFSelect/IFSelect_BasicDumper.cdl
+++ b/src/IFSelect/IFSelect_BasicDumper.cdl
@@ -24,7 +24,7 @@ uses Transient, AsciiString from TCollection, SessionFile
 
 is
 
-    Create returns mutable BasicDumper;
+    Create returns BasicDumper;
     ---Purpose : Creates a BasicDumper and puts it into the Library of Dumper
 
     WriteOwn (me; file : in out SessionFile; item : Transient) returns Boolean;
@@ -32,7 +32,7 @@ is
     --           Returns True if <item> has been processed, False else
 
     ReadOwn  (me; file : in out SessionFile;
-    	    type : AsciiString from TCollection; item : out mutable Transient)
+    	    type : AsciiString from TCollection; item : out Transient)
     	returns Boolean;
     ---Purpose : Recognizes and Read Own Parameters for Types of package
     --           IFSelect. Returns True if done and <item> created, False else
diff --git a/src/IFSelect/IFSelect_CheckCounter.cdl b/src/IFSelect/IFSelect_CheckCounter.cdl
index 9672ed471b..fc19869f56 100644
--- a/src/IFSelect/IFSelect_CheckCounter.cdl
+++ b/src/IFSelect/IFSelect_CheckCounter.cdl
@@ -25,7 +25,7 @@ uses CheckIterator, InterfaceModel, SignText from MoniTool
 
 is
 
-    Create (withlist : Boolean = Standard_False) returns mutable CheckCounter;
+    Create (withlist : Boolean = Standard_False) returns CheckCounter;
     ---Purpose : Creates a CheckCounter, empty ready to work
 
     SetSignature (me : mutable; sign : SignText);
diff --git a/src/IFSelect/IFSelect_ContextWrite.cdl b/src/IFSelect/IFSelect_ContextWrite.cdl
index b67b0a56ee..3a3d0fdf5f 100644
--- a/src/IFSelect/IFSelect_ContextWrite.cdl
+++ b/src/IFSelect/IFSelect_ContextWrite.cdl
@@ -36,7 +36,7 @@ raises NoSuchObject
 is
 
     Create (model : InterfaceModel; proto : Protocol;
-    	    applieds : mutable AppliedModifiers;  filename : CString)
+    	    applieds : AppliedModifiers;  filename : CString)
     	returns ContextWrite;
     ---Purpose : Prepares a ContextWrite with these informations :
     --           - the model which is to be written
@@ -48,7 +48,7 @@ is
     --             the model is considered
 
     Create (hgraph : HGraph; proto : Protocol;
-    	    applieds : mutable AppliedModifiers;  filename : CString)
+    	    applieds : AppliedModifiers;  filename : CString)
     	returns ContextWrite;
     ---Purpose : Same as above but with an already computed Graph
 
@@ -61,7 +61,7 @@ is
     FileName (me) returns CString;
     ---Purpose : Returns the File Name
 
-    AppliedModifiers (me) returns mutable AppliedModifiers;
+    AppliedModifiers (me) returns AppliedModifiers;
     ---Purpose : Returns the object AppliedModifiers
 
     Graph (me : in out) returns Graph;
@@ -80,7 +80,7 @@ is
     --           Then, it prepares the list of entities to consider, if any
     --           Returns False if <numod> out of range
 
-    FileModifier (me) returns mutable GeneralModifier;
+    FileModifier (me) returns GeneralModifier;
     ---Purpose : Returns the currently active File Modifier. Cast to be done
     --           Null if not properly set : must be test IsNull after casting
 
diff --git a/src/IFSelect/IFSelect_DispGlobal.cdl b/src/IFSelect/IFSelect_DispGlobal.cdl
index 7f2c8b1355..cbb2202ec6 100644
--- a/src/IFSelect/IFSelect_DispGlobal.cdl
+++ b/src/IFSelect/IFSelect_DispGlobal.cdl
@@ -23,7 +23,7 @@ uses AsciiString from TCollection, Graph, SubPartsIterator
 
 is
 
-    Create returns mutable DispGlobal;
+    Create returns DispGlobal;
     ---Purpose : Creates a DispGlobal
 
     Label (me) returns AsciiString from TCollection;
diff --git a/src/IFSelect/IFSelect_DispPerCount.cdl b/src/IFSelect/IFSelect_DispPerCount.cdl
index 4f47a15623..d41558626a 100644
--- a/src/IFSelect/IFSelect_DispPerCount.cdl
+++ b/src/IFSelect/IFSelect_DispPerCount.cdl
@@ -27,13 +27,13 @@ raises InterfaceError
 
 is
 
-    Create returns mutable DispPerCount;
+    Create returns DispPerCount;
     ---Purpose : Creates a DispPerCount with no Count (default value 1)
 
-    Count (me) returns mutable IntParam;
+    Count (me) returns IntParam;
     ---Purpose : Returns the Count Parameter used for splitting
 
-    SetCount (me : mutable; count : mutable IntParam);
+    SetCount (me : mutable; count : IntParam);
     ---Purpose : Sets a new Parameter for Count
 
     CountValue (me) returns Integer;
diff --git a/src/IFSelect/IFSelect_DispPerFiles.cdl b/src/IFSelect/IFSelect_DispPerFiles.cdl
index 48bb1aef4f..b7e3db7c70 100644
--- a/src/IFSelect/IFSelect_DispPerFiles.cdl
+++ b/src/IFSelect/IFSelect_DispPerFiles.cdl
@@ -30,13 +30,13 @@ raises InterfaceError
 
 is
 
-    Create returns mutable DispPerFiles;
+    Create returns DispPerFiles;
     ---Purpose : Creates a DispPerFiles with no Count (default value 1 file)
 
-    Count (me) returns mutable IntParam;
+    Count (me) returns IntParam;
     ---Purpose : Returns the Count Parameter used for splitting
 
-    SetCount (me : mutable; count : mutable IntParam);
+    SetCount (me : mutable; count : IntParam);
     ---Purpose : Sets a new Parameter for Count
 
     CountValue (me) returns Integer;
diff --git a/src/IFSelect/IFSelect_DispPerOne.cdl b/src/IFSelect/IFSelect_DispPerOne.cdl
index 678d4771fb..d0ea685d41 100644
--- a/src/IFSelect/IFSelect_DispPerOne.cdl
+++ b/src/IFSelect/IFSelect_DispPerOne.cdl
@@ -24,7 +24,7 @@ uses AsciiString from TCollection, Graph, SubPartsIterator
 
 is
 
-    Create returns mutable DispPerOne;
+    Create returns DispPerOne;
     ---Purpose : Creates a DispPerOne
 
     Label (me) returns AsciiString from TCollection;
diff --git a/src/IFSelect/IFSelect_DispPerSignature.cdl b/src/IFSelect/IFSelect_DispPerSignature.cdl
index b80499ee61..5c6ea88279 100644
--- a/src/IFSelect/IFSelect_DispPerSignature.cdl
+++ b/src/IFSelect/IFSelect_DispPerSignature.cdl
@@ -25,14 +25,14 @@ raises InterfaceError
 
 is
 
-    Create returns mutable DispPerSignature;
+    Create returns DispPerSignature;
     ---Purpose : Creates a DispPerSignature with no SignCounter (by default,
     --           produces only one packet)
 
-    SignCounter (me) returns mutable SignCounter;
+    SignCounter (me) returns SignCounter;
     ---Purpose : Returns the SignCounter used for splitting
 
-    SetSignCounter (me : mutable; sign : mutable SignCounter);
+    SetSignCounter (me : mutable; sign : SignCounter);
     ---Purpose : Sets a SignCounter for sort
     --           Remark : it is set to record lists of entities, not only counts
 
diff --git a/src/IFSelect/IFSelect_Dispatch.cdl b/src/IFSelect/IFSelect_Dispatch.cdl
index f8183c4eb4..ca4a04f717 100644
--- a/src/IFSelect/IFSelect_Dispatch.cdl
+++ b/src/IFSelect/IFSelect_Dispatch.cdl
@@ -40,7 +40,7 @@ raises InterfaceError
 
 is
 
-    SetRootName (me : mutable; name : mutable HAsciiString);
+    SetRootName (me : mutable; name : HAsciiString);
     ---Purpose : Sets a Root Name as an HAsciiString
     --           To reset it, give a Null Handle (then, a ShareOut will have
     --           to define the Default Root Name)
@@ -55,10 +55,10 @@ is
     ---C++ : return const &
 
 
-    SetFinalSelection (me : mutable; sel : mutable Selection);
+    SetFinalSelection (me : mutable; sel : Selection);
     ---Purpose : Stores (or Changes) the Final Selection for a Dispatch
 
-    FinalSelection (me) returns mutable Selection;
+    FinalSelection (me) returns Selection;
     ---Purpose : Returns the Final Selection of a Dispatch
     -- we 'd like : C++ : return const &
 
diff --git a/src/IFSelect/IFSelect_Editor.cdl b/src/IFSelect/IFSelect_Editor.cdl
index a44ee15bed..29c8ea8507 100644
--- a/src/IFSelect/IFSelect_Editor.cdl
+++ b/src/IFSelect/IFSelect_Editor.cdl
@@ -129,7 +129,7 @@ is
     --           Default returns a Null Handle, because many Editors have
     --           no list to edit. To be redefined as required
 
-    Load  (me; form : mutable EditForm; ent : Transient; model : InterfaceModel)
+    Load  (me; form : EditForm; ent : Transient; model : InterfaceModel)
     	returns Boolean  is deferred;
     ---Purpose : Loads original values from some data, to an EditForm
     --           Remark: <ent> may be Null, this means all <model> is concerned
@@ -137,7 +137,7 @@ is
     --           And both <ent> and <model> may be Null, for a full static
     --           editor
 
-    Update (me; form : mutable EditForm; num : Integer;
+    Update (me; form : EditForm; num : Integer;
     	    newval : HAsciiString; enforce : Boolean)
     	returns Boolean  is virtual;
     ---Purpose : Updates the EditForm when a parameter is modified
@@ -150,7 +150,7 @@ is
     --           If a parameter commands the value of other ones, when it is
     --           modified, it is necessary to touch them by Touch from EditForm
 
-    UpdateList (me; form : mutable EditForm; num : Integer;
+    UpdateList (me; form : EditForm; num : Integer;
     	    newlist : HSequenceOfHAsciiString; enforce : Boolean)
     	returns Boolean  is virtual;
     ---Purpose : Acts as Update, but when the value is a list
diff --git a/src/IFSelect/IFSelect_GeneralModifier.cdl b/src/IFSelect/IFSelect_GeneralModifier.cdl
index 40c6cd9849..d079a18c8b 100644
--- a/src/IFSelect/IFSelect_GeneralModifier.cdl
+++ b/src/IFSelect/IFSelect_GeneralModifier.cdl
@@ -80,7 +80,7 @@ is
     --           If Dispatch(me) is Null, returns True. Else, checks <disp>
 
 
-    SetSelection (me : mutable; sel : mutable Selection);
+    SetSelection (me : mutable; sel : Selection);
     ---Purpose : Sets a Selection : a Model is treated if it contains one or
     --           more Entities designated by the Selection
 
@@ -90,7 +90,7 @@ is
     HasSelection (me) returns Boolean;
     ---Purpose : Returns True if a Selection is set as an additionnal criterium
 
-    Selection (me) returns mutable Selection;
+    Selection (me) returns Selection;
     ---Purpose : Returns the Selection, or a Null Handle if not set
 
 
diff --git a/src/IFSelect/IFSelect_GraphCounter.cdl b/src/IFSelect/IFSelect_GraphCounter.cdl
index 37b2cf5cff..c993be65ea 100644
--- a/src/IFSelect/IFSelect_GraphCounter.cdl
+++ b/src/IFSelect/IFSelect_GraphCounter.cdl
@@ -29,7 +29,7 @@ uses HSequenceOfTransient from TColStd,
 is
 
     Create (withmap  : Boolean = Standard_True;
-            withlist : Boolean = Standard_False) returns mutable GraphCounter;
+            withlist : Boolean = Standard_False) returns GraphCounter;
     ---Purpose : Creates a GraphCounter, without applied selection
 
     Applied (me) returns SelectDeduct;
diff --git a/src/IFSelect/IFSelect_IntParam.cdl b/src/IFSelect/IFSelect_IntParam.cdl
index c5710d2301..325bd722c4 100644
--- a/src/IFSelect/IFSelect_IntParam.cdl
+++ b/src/IFSelect/IFSelect_IntParam.cdl
@@ -35,7 +35,7 @@ uses Integer, CString, AsciiString
 
 is
  
-    Create returns mutable IntParam;
+    Create returns IntParam;
     ---Purpose : Creates an IntParam. Initial value is set to zer
 
     SetStaticName (me : mutable; statname : CString);
diff --git a/src/IFSelect/IFSelect_ModelCopier.cdl b/src/IFSelect/IFSelect_ModelCopier.cdl
index 7fd5a34a2d..038e1895d2 100644
--- a/src/IFSelect/IFSelect_ModelCopier.cdl
+++ b/src/IFSelect/IFSelect_ModelCopier.cdl
@@ -63,7 +63,7 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable ModelCopier;
+    Create returns ModelCopier;
     ---Purpose : Creates an empty ModelCopier
 
     SetShareOut (me : mutable; sho : ShareOut);
@@ -94,7 +94,7 @@ is
     --           Returns True if Done, False else : if <num> is out of range
 
     SetAppliedModifiers (me : mutable; num : Integer;
-    	applied : mutable AppliedModifiers) returns Boolean;
+    	applied : AppliedModifiers) returns Boolean;
     ---Purpose : Sets a list of File Modifiers to be applied on a file
 
     ClearAppliedModifiers (me : mutable; num : Integer) returns Boolean;
@@ -161,8 +161,8 @@ is
 		     filename : AsciiString from TCollection;
 		     dispnum, numod : Integer;
 		     TC       : in out CopyTool;
-		     newmod   : out mutable InterfaceModel;
-		     applied  : out mutable AppliedModifiers;
+		     newmod   : out InterfaceModel;
+		     applied  : out AppliedModifiers;
 		     checks   : out CheckIterator)
 	is protected;
     ---Purpose : Performs the Copy of a unitary Packet
@@ -200,7 +200,7 @@ is
     CopiedRemaining (me : mutable; G    : Graph;
 		     WL : WorkLibrary;
     	      	     TC : in out CopyTool;
-		     newmod   : out mutable InterfaceModel);
+		     newmod   : out InterfaceModel);
     ---Purpose : Produces a Model copied from the Remaining List as <newmod>
     --           <newmod> is a Null Handle if this list is empty
     --           <WL> performs the copy by using <TC>
@@ -228,17 +228,17 @@ is
     ---Purpose : Returns the File Name for a file given its rank
     --           It is empty after a call to ClearFile on same <num>
 
-    FileModel (me; num : Integer) returns mutable InterfaceModel;
+    FileModel (me; num : Integer) returns InterfaceModel;
     ---Purpose : Returns the content of a file before sending, under the form
     --           of an InterfaceModel, given its rank
 
-    AppliedModifiers (me; num : Integer) returns mutable AppliedModifiers;
+    AppliedModifiers (me; num : Integer) returns AppliedModifiers;
     ---Purpose : Returns the list of File Modifiers to be applied on a file
     --           when it will be sent, as computed by CopiedModel :
     --           If it is a null handle, no File Modifier has to be applied.
 
 
-    BeginSentFiles (me : mutable; sho : mutable ShareOut; record : Boolean);
+    BeginSentFiles (me : mutable; sho : ShareOut; record : Boolean);
     ---Purpose : Begins a sequence of recording the really sent files
     --           <sho> : the default file numbering is cleared
     --           If <record> is False, clears the list and stops recording
diff --git a/src/IFSelect/IFSelect_ModelModifier.cdl b/src/IFSelect/IFSelect_ModelModifier.cdl
index 49058b97ae..7e97b30cd3 100644
--- a/src/IFSelect/IFSelect_ModelModifier.cdl
+++ b/src/IFSelect/IFSelect_ModelModifier.cdl
@@ -45,7 +45,7 @@ is
     --           <maychangegraph>
 
     Perform (me; ctx  : in out ContextModif;
-    	     target   : mutable InterfaceModel;
+    	     target   : InterfaceModel;
     	     protocol : Protocol from Interface;
     	     TC       : in out CopyTool);
     ---Purpose : The inherited Perform does the required cast (and refuses to
@@ -53,7 +53,7 @@ is
     --           Performing
 
     PerformProtocol (me; ctx : in out ContextModif;
-    	     target : mutable Model;
+    	     target : Model;
     	     proto  : Proto;
     	     TC     : in out CopyTool)  is virtual;
     ---Purpose : Specific Perform with Protocol. It is defined to let the
@@ -62,7 +62,7 @@ is
     --           requires Protocol.
 
     Performing (me; ctx : in out ContextModif;
-    	     target : mutable Model;
+    	     target : Model;
     	     TC     : in out CopyTool)  is deferred;
     ---Purpose : Specific Perform, without Protocol. If Performing with
     --           Protocol is redefined, Performing without Protocol must
diff --git a/src/IFSelect/IFSelect_ModifEditForm.cdl b/src/IFSelect/IFSelect_ModifEditForm.cdl
index e7891a57c9..abf4df87e4 100644
--- a/src/IFSelect/IFSelect_ModifEditForm.cdl
+++ b/src/IFSelect/IFSelect_ModifEditForm.cdl
@@ -24,14 +24,14 @@ uses CString, AsciiString from TCollection,
 
 is
 
-    Create (editform : EditForm) returns mutable ModifEditForm;
+    Create (editform : EditForm) returns ModifEditForm;
     ---Purpose : Creates a ModifEditForm. It may not change the graph
 
     EditForm (me) returns EditForm;
     ---Purpose : Returns the EditForm
 
     Perform (me; ctx  : in out ContextModif;
-    	     target   : mutable InterfaceModel;
+    	     target   : InterfaceModel;
     	     protocol : Protocol from Interface;
     	     TC       : in out CopyTool);
     ---Purpose : Acts by applying an EditForm to entities, selected or all model
diff --git a/src/IFSelect/IFSelect_ModifReorder.cdl b/src/IFSelect/IFSelect_ModifReorder.cdl
index 72c7385263..b9bb4f26fd 100644
--- a/src/IFSelect/IFSelect_ModifReorder.cdl
+++ b/src/IFSelect/IFSelect_ModifReorder.cdl
@@ -27,13 +27,13 @@ uses CString, AsciiString from TCollection,
 
 is
 
-    Create (rootlast : Boolean = Standard_True) returns mutable ModifReorder;
+    Create (rootlast : Boolean = Standard_True) returns ModifReorder;
     ---Purpose : Creates a ModifReorder. It may change the graph (it does !)
     --           If <rootlast> is True (D), roots are set at the end of packets
     --           Else, they are set at beginning (as done by AddWithRefs)
 
     Perform (me; ctx  : in out ContextModif;
-    	     target   : mutable InterfaceModel;
+    	     target   : InterfaceModel;
     	     protocol : Protocol from Interface;
     	     TC       : in out CopyTool);
     ---Purpose : Acts by computing orders (by method All from ShareTool) then
diff --git a/src/IFSelect/IFSelect_Modifier.cdl b/src/IFSelect/IFSelect_Modifier.cdl
index 1e25981d7a..40222dfb3f 100644
--- a/src/IFSelect/IFSelect_Modifier.cdl
+++ b/src/IFSelect/IFSelect_Modifier.cdl
@@ -32,7 +32,7 @@ is
     --           <maychangegraph>
 
     Perform (me; ctx  : in out ContextModif;
-    	     target   : mutable InterfaceModel;
+    	     target   : InterfaceModel;
     	     protocol : Protocol from Interface;
     	     TC       : in out CopyTool) is deferred;
     ---Purpose : This deferred method defines the action specific to each class
diff --git a/src/IFSelect/IFSelect_PacketList.cdl b/src/IFSelect/IFSelect_PacketList.cdl
index e0926f1ef5..64761b5518 100644
--- a/src/IFSelect/IFSelect_PacketList.cdl
+++ b/src/IFSelect/IFSelect_PacketList.cdl
@@ -32,7 +32,7 @@ raises InterfaceError
 
 is
 
-    Create (model : InterfaceModel) returns mutable PacketList;
+    Create (model : InterfaceModel) returns PacketList;
     ---Purpose : Creates a PackList, empty, ready to receive entities from a
     --           given Model
 
diff --git a/src/IFSelect/IFSelect_SelectAnyList.cdl b/src/IFSelect/IFSelect_SelectAnyList.cdl
index eb3f438dfd..8e5b039f33 100644
--- a/src/IFSelect/IFSelect_SelectAnyList.cdl
+++ b/src/IFSelect/IFSelect_SelectAnyList.cdl
@@ -61,22 +61,22 @@ is
     --           If <ent> has not required type, returned value must be Zero
 
 
-    SetRange (me : mutable; rankfrom, rankto : mutable IntParam);
+    SetRange (me : mutable; rankfrom, rankto : IntParam);
     ---Purpose : Sets a Range for numbers, with a lower and a upper limits
 
-    SetOne  (me : mutable; rank : mutable IntParam);
+    SetOne  (me : mutable; rank : IntParam);
     ---Purpose : Sets a unique number (only one Entity will be sorted as True)
 
-    SetFrom (me : mutable; rankfrom : mutable IntParam);
+    SetFrom (me : mutable; rankfrom : IntParam);
     ---Purpose : Sets a Lower limit but no upper limit
 
-    SetUntil (me : mutable; rankto : mutable IntParam);
+    SetUntil (me : mutable; rankto : IntParam);
     ---Purpose : Sets an Upper limit but no lower limit (equivalent to lower 1)
 
     HasLower (me) returns Boolean;
     ---Purpose : Returns True if a Lower limit is defined
 
-    Lower (me) returns mutable IntParam;
+    Lower (me) returns IntParam;
     ---Purpose : Returns Lower limit (if there is; else, value is senseless)
 
     LowerValue (me) returns Integer;
@@ -85,7 +85,7 @@ is
     HasUpper (me) returns Boolean;
     ---Purpose : Returns True if a Lower limit is defined
 
-    Upper (me) returns mutable IntParam;
+    Upper (me) returns IntParam;
     ---Purpose : Returns Upper limit (if there is; else, value is senseless)
 
     UpperValue (me) returns Integer;
diff --git a/src/IFSelect/IFSelect_SelectCombine.cdl b/src/IFSelect/IFSelect_SelectCombine.cdl
index 25750c492c..ce92cb64e8 100644
--- a/src/IFSelect/IFSelect_SelectCombine.cdl
+++ b/src/IFSelect/IFSelect_SelectCombine.cdl
@@ -32,7 +32,7 @@ is
     NbInputs (me) returns Integer;
     ---Purpose : Returns the count of Input Selections
 
-    Input (me; num : Integer) returns mutable Selection;
+    Input (me; num : Integer) returns Selection;
     ---Purpose : Returns an Input Selection, given its rank in the list
 
     InputRank (me; sel : Selection) returns Integer;
@@ -42,7 +42,7 @@ is
     --           - == 0  if <sel> is not an input for <me>
     --           - >  0  if <sel> is an input for <me>
 
-    Add (me : mutable; sel : mutable Selection; atnum : Integer = 0);
+    Add (me : mutable; sel : Selection; atnum : Integer = 0);
     ---Purpose : Adds a Selection to the filling list
     --           By default, adds it to the end of the list
     --           A Positive rank less then NbInputs gives an insertion rank
diff --git a/src/IFSelect/IFSelect_SelectControl.cdl b/src/IFSelect/IFSelect_SelectControl.cdl
index 99a3ce08b7..4e3f9bd31e 100644
--- a/src/IFSelect/IFSelect_SelectControl.cdl
+++ b/src/IFSelect/IFSelect_SelectControl.cdl
@@ -34,7 +34,7 @@ uses  SelectionIterator
 
 is
 
-    MainInput    (me) returns mutable Selection;
+    MainInput    (me) returns Selection;
     ---Purpose : Returns the Main Input Selection
 
     HasSecondInput (me) returns Boolean;
@@ -42,13 +42,13 @@ is
     --           Thus, Result can be computed differently if there is a
     --           Control Input or if there is none
 
-    SecondInput (me) returns mutable Selection;
+    SecondInput (me) returns Selection;
     ---Purpose : Returns the Control Input Selection, or a Null Handle
 
-    SetMainInput    (me : mutable; sel : mutable Selection);
+    SetMainInput    (me : mutable; sel : Selection);
     ---Purpose : Sets a Selection to be the Main Input
 
-    SetSecondInput (me : mutable; sel : mutable Selection);
+    SetSecondInput (me : mutable; sel : Selection);
     ---Purpose : Sets a Selection to be the Control Input
 
 
diff --git a/src/IFSelect/IFSelect_SelectDeduct.cdl b/src/IFSelect/IFSelect_SelectDeduct.cdl
index a560684613..48e33376d8 100644
--- a/src/IFSelect/IFSelect_SelectDeduct.cdl
+++ b/src/IFSelect/IFSelect_SelectDeduct.cdl
@@ -36,10 +36,10 @@ raises InterfaceError
 
 is
 
-    SetInput (me : mutable; sel : mutable Selection);
+    SetInput (me : mutable; sel : Selection);
     ---Purpose : Defines or Changes the Input Selection
 
-    Input (me) returns mutable Selection;
+    Input (me) returns Selection;
     ---Purpose : Returns the Input Selection
 
     HasInput (me) returns Boolean;
diff --git a/src/IFSelect/IFSelect_SelectDiff.cdl b/src/IFSelect/IFSelect_SelectDiff.cdl
index 4555bba1ce..6c62ce8356 100644
--- a/src/IFSelect/IFSelect_SelectDiff.cdl
+++ b/src/IFSelect/IFSelect_SelectDiff.cdl
@@ -23,7 +23,7 @@ uses AsciiString from TCollection, EntityIterator, Graph
 
 is
 
-    Create returns mutable SelectDiff;
+    Create returns SelectDiff;
     ---Purpose : Creates an empty SelectDiff
 
 
diff --git a/src/IFSelect/IFSelect_SelectEntityNumber.cdl b/src/IFSelect/IFSelect_SelectEntityNumber.cdl
index 3b3cc6135b..6db6f39696 100644
--- a/src/IFSelect/IFSelect_SelectEntityNumber.cdl
+++ b/src/IFSelect/IFSelect_SelectEntityNumber.cdl
@@ -26,13 +26,13 @@ uses AsciiString from TCollection, EntityIterator, Graph, IntParam
 
 is
 
-    Create  returns mutable SelectEntityNumber;
+    Create  returns SelectEntityNumber;
     ---Purpose : Creates a SelectEntityNumber, initially with no specified Number
 
-    SetNumber (me : mutable; num : mutable IntParam);
+    SetNumber (me : mutable; num : IntParam);
     ---Purpose : Sets Entity Number to be taken (initially, none is set : 0)
 
-    Number (me) returns mutable IntParam;
+    Number (me) returns IntParam;
     ---Purpose : Returns specified Number (as a Parameter)
 
     RootResult (me; G : Graph) returns EntityIterator;
diff --git a/src/IFSelect/IFSelect_SelectErrorEntities.cdl b/src/IFSelect/IFSelect_SelectErrorEntities.cdl
index 112639a72e..5e23fdda00 100644
--- a/src/IFSelect/IFSelect_SelectErrorEntities.cdl
+++ b/src/IFSelect/IFSelect_SelectErrorEntities.cdl
@@ -25,7 +25,7 @@ uses AsciiString from TCollection, InterfaceModel
 
 is
 
-    Create returns mutable SelectErrorEntities;
+    Create returns SelectErrorEntities;
     ---Purpose : Creates a SelectErrorEntities
 
     Sort (me; rank : Integer; ent : Transient; model : InterfaceModel)
diff --git a/src/IFSelect/IFSelect_SelectFlag.cdl b/src/IFSelect/IFSelect_SelectFlag.cdl
index 4d4cb634d9..59d7948b4a 100644
--- a/src/IFSelect/IFSelect_SelectFlag.cdl
+++ b/src/IFSelect/IFSelect_SelectFlag.cdl
@@ -27,7 +27,7 @@ uses AsciiString from TCollection, InterfaceModel, Graph, EntityIterator
 
 is
 
-    Create (flagname : CString) returns mutable SelectFlag;
+    Create (flagname : CString) returns SelectFlag;
     ---Purpose : Creates a Select Flag, to query a flag designated by its name
 
     FlagName (me) returns CString;
diff --git a/src/IFSelect/IFSelect_SelectIncorrectEntities.cdl b/src/IFSelect/IFSelect_SelectIncorrectEntities.cdl
index 382fcdc4a4..458623e484 100644
--- a/src/IFSelect/IFSelect_SelectIncorrectEntities.cdl
+++ b/src/IFSelect/IFSelect_SelectIncorrectEntities.cdl
@@ -26,7 +26,7 @@ uses AsciiString from TCollection, InterfaceModel, Graph, EntityIterator
 
 is
 
-    Create returns mutable SelectIncorrectEntities;
+    Create returns SelectIncorrectEntities;
     ---Purpose : Creates a SelectIncorrectEntities
     --           i.e. a SelectFlag("Incorrect")
 
diff --git a/src/IFSelect/IFSelect_SelectIntersection.cdl b/src/IFSelect/IFSelect_SelectIntersection.cdl
index 3487bd26f0..74103140a6 100644
--- a/src/IFSelect/IFSelect_SelectIntersection.cdl
+++ b/src/IFSelect/IFSelect_SelectIntersection.cdl
@@ -23,7 +23,7 @@ uses AsciiString from TCollection, EntityIterator, Graph
 
 is
 
-    Create returns mutable SelectIntersection;
+    Create returns SelectIntersection;
     ---Purpose : Creates an empty SelectIntersection
 
     RootResult (me; G : Graph) returns EntityIterator;
diff --git a/src/IFSelect/IFSelect_SelectModelEntities.cdl b/src/IFSelect/IFSelect_SelectModelEntities.cdl
index a0edb42a4b..a96d8111b1 100644
--- a/src/IFSelect/IFSelect_SelectModelEntities.cdl
+++ b/src/IFSelect/IFSelect_SelectModelEntities.cdl
@@ -23,7 +23,7 @@ uses AsciiString from TCollection, EntityIterator, Graph
 
 is
 
-    Create  returns mutable SelectModelEntities;
+    Create  returns SelectModelEntities;
     ---Purpose : Creates a SelectModelRoot
 
     RootResult (me; G : Graph) returns EntityIterator;
diff --git a/src/IFSelect/IFSelect_SelectModelRoots.cdl b/src/IFSelect/IFSelect_SelectModelRoots.cdl
index 00a326657c..f91e798a34 100644
--- a/src/IFSelect/IFSelect_SelectModelRoots.cdl
+++ b/src/IFSelect/IFSelect_SelectModelRoots.cdl
@@ -25,7 +25,7 @@ uses AsciiString from TCollection, EntityIterator, Graph
 
 is
 
-    Create  returns mutable SelectModelRoots;
+    Create  returns SelectModelRoots;
     ---Purpose : Creates a SelectModelRoot
 
     RootResult (me; G : Graph) returns EntityIterator;
diff --git a/src/IFSelect/IFSelect_SelectPointed.cdl b/src/IFSelect/IFSelect_SelectPointed.cdl
index 7a562856a1..01e5211d65 100644
--- a/src/IFSelect/IFSelect_SelectPointed.cdl
+++ b/src/IFSelect/IFSelect_SelectPointed.cdl
@@ -31,7 +31,7 @@ raises InterfaceError
 
 is
 
-    Create returns mutable SelectPointed;
+    Create returns SelectPointed;
     ---Purpose : Creates a SelectPointed
 
     Clear (me : mutable);
diff --git a/src/IFSelect/IFSelect_SelectRange.cdl b/src/IFSelect/IFSelect_SelectRange.cdl
index c2618f9157..ed519b3fe7 100644
--- a/src/IFSelect/IFSelect_SelectRange.cdl
+++ b/src/IFSelect/IFSelect_SelectRange.cdl
@@ -26,27 +26,27 @@ raises DomainError
 
 is
 
-    Create returns mutable SelectRange;
+    Create returns SelectRange;
     ---Purpose : Creates a SelectRange. Default is Take all the input list
 
-    SetRange (me : mutable; rankfrom, rankto : mutable IntParam)
+    SetRange (me : mutable; rankfrom, rankto : IntParam)
       raises DomainError;
     ---Purpose : Sets a Range for numbers, with a lower and a upper limits
     --           Error if rankto is lower then rankfrom
 
-    SetOne  (me : mutable; rank : mutable IntParam);
+    SetOne  (me : mutable; rank : IntParam);
     ---Purpose : Sets a unique number (only one Entity will be sorted as True)
 
-    SetFrom (me : mutable; rankfrom : mutable IntParam);
+    SetFrom (me : mutable; rankfrom : IntParam);
     ---Purpose : Sets a Lower limit but no upper limit
 
-    SetUntil (me : mutable; rankto : mutable IntParam);
+    SetUntil (me : mutable; rankto : IntParam);
     ---Purpose : Sets an Upper limit but no lower limit (equivalent to lower 1)
 
     HasLower (me) returns Boolean;
     ---Purpose : Returns True if a Lower limit is defined
 
-    Lower (me) returns mutable IntParam;
+    Lower (me) returns IntParam;
     ---Purpose : Returns Lower limit (if there is; else, value is senseless)
 
     LowerValue (me) returns Integer;
@@ -55,7 +55,7 @@ is
     HasUpper (me) returns Boolean;
     ---Purpose : Returns True if a Lower limit is defined
 
-    Upper (me) returns mutable IntParam;
+    Upper (me) returns IntParam;
     ---Purpose : Returns Upper limit (if there is; else, value is senseless)
 
     UpperValue (me) returns Integer;
diff --git a/src/IFSelect/IFSelect_SelectRootComps.cdl b/src/IFSelect/IFSelect_SelectRootComps.cdl
index 2fa579c036..588eb219c8 100644
--- a/src/IFSelect/IFSelect_SelectRootComps.cdl
+++ b/src/IFSelect/IFSelect_SelectRootComps.cdl
@@ -30,7 +30,7 @@ uses AsciiString from TCollection, InterfaceModel, EntityIterator, Graph
 
 is
 
-    Create returns mutable SelectRootComps;
+    Create returns SelectRootComps;
     ---Purpose : Creates a SelectRootComps
 
     RootResult (me; G : Graph) returns EntityIterator  is redefined;
diff --git a/src/IFSelect/IFSelect_SelectRoots.cdl b/src/IFSelect/IFSelect_SelectRoots.cdl
index 766b8dcd35..2c22c4daa0 100644
--- a/src/IFSelect/IFSelect_SelectRoots.cdl
+++ b/src/IFSelect/IFSelect_SelectRoots.cdl
@@ -24,7 +24,7 @@ uses AsciiString from TCollection, InterfaceModel, EntityIterator, Graph
 
 is
 
-    Create returns mutable SelectRoots;
+    Create returns SelectRoots;
     ---Purpose : Creates a SelectRoots
 
     RootResult (me; G : Graph) returns EntityIterator  is redefined;
diff --git a/src/IFSelect/IFSelect_SelectSent.cdl b/src/IFSelect/IFSelect_SelectSent.cdl
index 3c7885e77b..ca439bb23a 100644
--- a/src/IFSelect/IFSelect_SelectSent.cdl
+++ b/src/IFSelect/IFSelect_SelectSent.cdl
@@ -30,7 +30,7 @@ uses AsciiString from TCollection, InterfaceModel, Graph, EntityIterator
 is
 
     Create (sentcount : Integer = 1; atleast : Boolean = Standard_True)
-    	returns mutable SelectSent;
+    	returns SelectSent;
     ---Purpose : Creates a SelectSent :
     --           sentcount = 0 -> remaining (non-sent) entities
     --           sentcount = 1, atleast = True (D) -> sent (at least once)
diff --git a/src/IFSelect/IFSelect_SelectShared.cdl b/src/IFSelect/IFSelect_SelectShared.cdl
index d512d14944..b18f890b0c 100644
--- a/src/IFSelect/IFSelect_SelectShared.cdl
+++ b/src/IFSelect/IFSelect_SelectShared.cdl
@@ -23,7 +23,7 @@ uses AsciiString from TCollection, EntityIterator, Graph
 
 is
 
-    Create returns mutable SelectShared;
+    Create returns SelectShared;
     ---Purpose : Creates a SelectShared;
 
     RootResult (me; G : Graph) returns EntityIterator;
diff --git a/src/IFSelect/IFSelect_SelectSharing.cdl b/src/IFSelect/IFSelect_SelectSharing.cdl
index 49c9eb8619..462b2b310c 100644
--- a/src/IFSelect/IFSelect_SelectSharing.cdl
+++ b/src/IFSelect/IFSelect_SelectSharing.cdl
@@ -25,7 +25,7 @@ uses AsciiString from TCollection, EntityIterator, Graph
 
 is
 
-    Create returns mutable SelectSharing;
+    Create returns SelectSharing;
     ---Purpose : Creates a SelectSharing;
 
     RootResult (me; G : Graph) returns EntityIterator;
diff --git a/src/IFSelect/IFSelect_SelectSignature.cdl b/src/IFSelect/IFSelect_SelectSignature.cdl
index 8fddf0eb61..8a581853a5 100644
--- a/src/IFSelect/IFSelect_SelectSignature.cdl
+++ b/src/IFSelect/IFSelect_SelectSignature.cdl
@@ -40,7 +40,7 @@ is
     Create (matcher : Signature;
     	signtext : CString;
     	exact : Boolean = Standard_True)
-    	returns mutable SelectSignature;
+    	returns SelectSignature;
     ---Purpose : Creates a SelectSignature with its Signature and its Text to
     --           Match.
     --           <exact> if True requires exact match,
@@ -50,23 +50,23 @@ is
     Create (matcher : Signature;
     	    signtext : AsciiString from TCollection;
     	    exact : Boolean = Standard_True)
-    	returns mutable SelectSignature;
+    	returns SelectSignature;
     ---Purpose : As above with an AsciiString
 
     Create (matcher : SignCounter;
     	signtext : CString;
     	exact : Boolean = Standard_True)
-    	returns mutable SelectSignature;
+    	returns SelectSignature;
     ---Purpose : Creates a SelectSignature with a Counter, more precisely a
     --           SelectSignature. Which is used here to just give a Signature
     --           Value (by SignOnly Mode)
     --           Matching is the default provided by the class Signature
 
-    Signature (me) returns mutable Signature;
+    Signature (me) returns Signature;
     ---Purpose : Returns the used Signature, then it is possible to access it,
     --           modify it as required. Can be null, hence see Counter
 
-    Counter   (me) returns mutable SignCounter;
+    Counter   (me) returns SignCounter;
     ---Purpose : Returns the used SignCounter. Can be used as alternative for
     --           Signature
 
diff --git a/src/IFSelect/IFSelect_SelectSignedShared.cdl b/src/IFSelect/IFSelect_SelectSignedShared.cdl
index ce13919623..29e343edb2 100644
--- a/src/IFSelect/IFSelect_SelectSignedShared.cdl
+++ b/src/IFSelect/IFSelect_SelectSignedShared.cdl
@@ -28,11 +28,11 @@ is
     Create (matcher : Signature;
             signtext : CString;
             exact : Boolean = Standard_True;
-   	    level : Integer = 0)  returns mutable SelectSignedShared;
+   	    level : Integer = 0)  returns SelectSignedShared;
     ---Purpose : Creates a SelectSignedShared, defaulted for any level
     --           with a given Signature and text to match
 
-    Signature (me) returns mutable Signature;
+    Signature (me) returns Signature;
     ---Purpose : Returns the used Signature, then it is possible to access it,
     --           modify it as required
 
diff --git a/src/IFSelect/IFSelect_SelectSignedSharing.cdl b/src/IFSelect/IFSelect_SelectSignedSharing.cdl
index 57d8566bce..f87678520a 100644
--- a/src/IFSelect/IFSelect_SelectSignedSharing.cdl
+++ b/src/IFSelect/IFSelect_SelectSignedSharing.cdl
@@ -28,11 +28,11 @@ is
     Create (matcher : Signature;
             signtext : CString;
             exact : Boolean = Standard_True;
-   	    level : Integer = 0)  returns mutable SelectSignedSharing;
+   	    level : Integer = 0)  returns SelectSignedSharing;
     ---Purpose : Creates a SelectSignedSharing, defaulted for any level
     --           with a given Signature and text to match
 
-    Signature (me) returns mutable Signature;
+    Signature (me) returns Signature;
     ---Purpose : Returns the used Signature, then it is possible to access it,
     --           modify it as required
 
diff --git a/src/IFSelect/IFSelect_SelectType.cdl b/src/IFSelect/IFSelect_SelectType.cdl
index e10d51a964..06ad252f56 100644
--- a/src/IFSelect/IFSelect_SelectType.cdl
+++ b/src/IFSelect/IFSelect_SelectType.cdl
@@ -23,10 +23,10 @@ uses Type, AsciiString from TCollection, Transient
 
 is
 
-    Create returns mutable SelectType;
+    Create returns SelectType;
     ---Purpose : Creates a SelectType. Default is no filter
 
-    Create (atype : Type) returns mutable SelectType;
+    Create (atype : Type) returns SelectType;
     ---Purpose : Creates a SelectType for a given Type
 
     SetType (me : mutable; atype : Type);
diff --git a/src/IFSelect/IFSelect_SelectUnion.cdl b/src/IFSelect/IFSelect_SelectUnion.cdl
index 1a15144dad..48e9b7f135 100644
--- a/src/IFSelect/IFSelect_SelectUnion.cdl
+++ b/src/IFSelect/IFSelect_SelectUnion.cdl
@@ -23,7 +23,7 @@ uses AsciiString from TCollection, EntityIterator, Graph
 
 is
 
-    Create returns mutable SelectUnion;
+    Create returns SelectUnion;
     ---Purpose : Creates an empty SelectUnion
 
     RootResult (me; G : Graph) returns EntityIterator;
diff --git a/src/IFSelect/IFSelect_SelectUnknownEntities.cdl b/src/IFSelect/IFSelect_SelectUnknownEntities.cdl
index ab7a881ee2..138f46d8c4 100644
--- a/src/IFSelect/IFSelect_SelectUnknownEntities.cdl
+++ b/src/IFSelect/IFSelect_SelectUnknownEntities.cdl
@@ -23,7 +23,7 @@ uses AsciiString from TCollection, InterfaceModel
 
 is
 
-    Create returns mutable SelectUnknownEntities;
+    Create returns SelectUnknownEntities;
     ---Purpose : Creates a SelectUnknownEntities
 
     Sort (me; rank : Integer; ent : Transient; model : InterfaceModel)
diff --git a/src/IFSelect/IFSelect_SessionDumper.cdl b/src/IFSelect/IFSelect_SessionDumper.cdl
index 6470a7f57e..2f5024036f 100644
--- a/src/IFSelect/IFSelect_SessionDumper.cdl
+++ b/src/IFSelect/IFSelect_SessionDumper.cdl
@@ -71,7 +71,7 @@ is
     --           SendItem, SendText, and if necessary, WorkSession.
 
     ReadOwn  (me; file : in out SessionFile;
-    	    type : AsciiString from TCollection; item : out mutable Transient)
+    	    type : AsciiString from TCollection; item : out Transient)
     	returns Boolean  is deferred;
     ---Purpose : Recognizes a Type (given as <type>) then Creates an Item of
     --           this Type with the Own Parameter, as required.
diff --git a/src/IFSelect/IFSelect_SessionFile.cdl b/src/IFSelect/IFSelect_SessionFile.cdl
index 937ae28631..0e1447666a 100644
--- a/src/IFSelect/IFSelect_SessionFile.cdl
+++ b/src/IFSelect/IFSelect_SessionFile.cdl
@@ -54,7 +54,7 @@ uses CString, Character, Transient,
 
 is
 
-    Create (WS : mutable WorkSession) returns SessionFile;
+    Create (WS : WorkSession) returns SessionFile;
     ---Purpose : Creates a SessionFile, ready to read Files in order to load
     --           them into a given WorkSession.
     --           The following Read Operations must then be called.
@@ -164,7 +164,7 @@ is
     ---Purpose : Internal routine which processes a line into words
     --           and prepares its exploration
 
-    ReadOwn (me : in out; item : out mutable Transient) returns Boolean;
+    ReadOwn (me : in out; item : out Transient) returns Boolean;
     ---Purpose : Tries to Read an Item, by calling the Library of Dumpers
     --           Sets the list of parameters of the line to be read from the
     --           first own one
@@ -253,7 +253,7 @@ is
     ---Purpose : Returns the content of a Text Parameter (without the quotes).
     --           Returns an empty string if the Parameter is not a Text.
 
-    ItemValue (me; num : Integer) returns mutable Transient;
+    ItemValue (me; num : Integer) returns Transient;
     ---Purpose : Returns a Parameter as an Item. Returns a Null Handle if the
     --           Parameter is a Text, or if it is defined as Void
 
diff --git a/src/IFSelect/IFSelect_SessionPilot.cdl b/src/IFSelect/IFSelect_SessionPilot.cdl
index af2d42905e..9b1e91376e 100644
--- a/src/IFSelect/IFSelect_SessionPilot.cdl
+++ b/src/IFSelect/IFSelect_SessionPilot.cdl
@@ -58,25 +58,25 @@ uses CString, OStream, Transient, AsciiString from TCollection,
 
 is
 
-    Create (prompt : CString = "") returns mutable SessionPilot;
+    Create (prompt : CString = "") returns SessionPilot;
     ---Purpose : Creates an empty SessionPilot, with a prompt which will be
     --           displayed on querying commands. If not precised (""), this
     --           prompt is set to "Test-XSTEP>"
 
-    Session (me) returns mutable WorkSession;
+    Session (me) returns WorkSession;
     ---Purpose : Returns the WorkSession which is worked on
 
-    Library (me) returns mutable WorkLibrary;
+    Library (me) returns WorkLibrary;
     ---Purpose : Returns the WorKlibrary (Null if not set). WorkLibrary is used
     --           to Read and Write Files, according to the Norm
 
     RecordMode (me) returns Boolean;
     ---Purpose : Returns the Record Mode for Commands. Default is False.
 
-    SetSession (me : mutable; WS : mutable WorkSession);
+    SetSession (me : mutable; WS : WorkSession);
     ---Purpose : Sets a WorkSession to be worked on
 
-    SetLibrary (me : mutable; WL : mutable WorkLibrary);
+    SetLibrary (me : mutable; WL : WorkLibrary);
     ---Purpose : Sets a WorkLibrary
 
     SetRecordMode (me : mutable; mode : Boolean);
@@ -167,7 +167,7 @@ is
     ---Purpose : Sets the Command then tries to execute it. Return value :
     --           same as for Perform
 
-    ExecuteCounter (me : mutable; counter : mutable SignCounter;
+    ExecuteCounter (me : mutable; counter : SignCounter;
     	    	    numword : Integer; mode : PrintCount = IFSelect_CountByItem)
     	returns ReturnStatus;
     ---Purpose : Executes a Counter in a general way
@@ -183,7 +183,7 @@ is
     --           else, considers it as ENtityLabel (preferably case sensitive)
     --           in case of failure, returns 0
 
-    Do   (me : mutable; number : Integer; session : mutable SessionPilot)
+    Do   (me : mutable; number : Integer; session : SessionPilot)
     	returns ReturnStatus;
     ---Purpose : Processes specific commands, which are :
     --           x or exit for end of session
diff --git a/src/IFSelect/IFSelect_ShareOut.cdl b/src/IFSelect/IFSelect_ShareOut.cdl
index ff4d0916d6..dfe2883e08 100644
--- a/src/IFSelect/IFSelect_ShareOut.cdl
+++ b/src/IFSelect/IFSelect_ShareOut.cdl
@@ -49,7 +49,7 @@ raises InterfaceError, OutOfRange
 
 is
 
-    Create returns mutable ShareOut;
+    Create returns ShareOut;
     ---Purpose : Creates an empty ShareOut
 
     Clear (me : mutable; onlydisp : Boolean);
@@ -88,13 +88,13 @@ is
     ---Purpose : Returns the Rank of a Dispatch, given its Value (Handle).
     --           Returns 0 if the Dispatch is unknown in the ShareOut
 
-    Dispatch (me; num : Integer) returns mutable Dispatch
+    Dispatch (me; num : Integer) returns Dispatch
     ---Purpose : Returns a Dispatch, given its rank in the list
     	raises OutOfRange;
     --           Error if <num> is out of range
     ---C++ : return const &
 
-    AddDispatch (me : mutable; disp : mutable Dispatch)
+    AddDispatch (me : mutable; disp : Dispatch)
     ---Purpose : Adds a Dispatch to the list
     	raises InterfaceError;
     --           Error if the Dispatch is attached to a ShareOut other than "me"
@@ -106,7 +106,7 @@ is
 
     	-- --    Modifiers to be applied    -- --
 
-    AddModifier (me : mutable; modifier : mutable GeneralModifier;
+    AddModifier (me : mutable; modifier : GeneralModifier;
     	    	atnum : Integer);
     ---Purpose : Sets a Modifier to be applied on all Dispatches to be run
     --           If <modifier> is a ModelModifier, adds it to the list of
@@ -116,7 +116,7 @@ is
     --           into a Model : its criteria are checked and if they are OK,
     --           the method Perform of this Modifier is run.
 
-    AddModifier (me : mutable; modifier : mutable GeneralModifier;
+    AddModifier (me : mutable; modifier : GeneralModifier;
     	    	 dispnum : Integer; atnum : Integer);
     ---Purpose : Sets a Modifier to be applied on the Dispatch <dispnum>
     --           If <modifier> is a ModelModifier, adds it to the list of
@@ -130,7 +130,7 @@ is
     --             for a Dispatch
 
 
-    AddModif    (me : mutable;  modifier : mutable GeneralModifier;
+    AddModif    (me : mutable;  modifier : GeneralModifier;
     	    	 formodel : Boolean; atnum : Integer = 0);
     ---Purpose : Adds a Modifier to the list of Modifiers : Model Modifiers if
     --           <formodel> is True, File Modifiers else (internal).
@@ -140,11 +140,11 @@ is
     --           Model Modifiers if <formodel> is True, File Modifiers else
 
     GeneralModifier (me; formodel : Boolean; num : Integer)
-    	returns mutable GeneralModifier;
+    	returns GeneralModifier;
     ---Purpose : Returns a Modifier of the list, given its rank :
     --           Model Modifiers if <formodel> is True, File Modifiers else
 
-    ModelModifier (me; num : Integer) returns mutable Modifier;
+    ModelModifier (me; num : Integer) returns Modifier;
     ---Purpose : Returns a Modifier of the list of Model Modifiers, duely casted
 
     ModifierRank (me; modifier : GeneralModifier) returns Integer;
@@ -167,7 +167,7 @@ is
 
     	-- --    Names for produced Files   -- --
 
-    SetRootName (me : mutable; num : Integer; name : mutable HAsciiString)
+    SetRootName (me : mutable; num : Integer; name : HAsciiString)
     	returns Boolean;
     ---Purpose : Attaches a Root Name to a Dispatch given its rank, as an
     --           HAsciiString (standard form). A Null Handle resets this name.
@@ -178,7 +178,7 @@ is
     ---Purpose : Returns True if the Dispatch of rank <num> has an attached
     --           Root Name. False else, or if num is out of range
 
-    RootName (me; num : Integer) returns mutable HAsciiString from TCollection;
+    RootName (me; num : Integer) returns HAsciiString from TCollection;
     ---Purpose : Returns the Root bound to a Dispatch, given its rank
     --           Returns a Null Handle if not defined
 
diff --git a/src/IFSelect/IFSelect_ShareOutResult.cdl b/src/IFSelect/IFSelect_ShareOutResult.cdl
index 964170fc70..378fbd43df 100644
--- a/src/IFSelect/IFSelect_ShareOutResult.cdl
+++ b/src/IFSelect/IFSelect_ShareOutResult.cdl
@@ -30,11 +30,11 @@ raises NoSuchObject, InterfaceError
 
 is
 
-    Create (sho : mutable ShareOut; mod : InterfaceModel) returns ShareOutResult;
+    Create (sho : ShareOut; mod : InterfaceModel) returns ShareOutResult;
     ---Purpose : Creates a ShareOutResult from a ShareOut, to work on a Model
     --           (without any more precision; uses Active Protocol)
 
-    Create (sho : mutable ShareOut; G : Graph) returns ShareOutResult;
+    Create (sho : ShareOut; G : Graph) returns ShareOutResult;
     ---Purpose : Creates a ShareOutResult from a ShareOut, to work on a Graph
     --           already computed, which defines the Input Model and can
     --           specialize some Entities
@@ -50,7 +50,7 @@ is
     --           a Graph. As if it was a ShareOut with only one Dispatch
     --           Allows to compute the effect of a single Dispatch
 
-    ShareOut (me) returns mutable ShareOut;
+    ShareOut (me) returns ShareOut;
     ---Purpose : Returns the ShareOut used to create the ShareOutResult
     --           if creation from a Dispatch, returns a Null Handle
 
diff --git a/src/IFSelect/IFSelect_SignAncestor.cdl b/src/IFSelect/IFSelect_SignAncestor.cdl
index 34d1431a37..940d81dfe9 100644
--- a/src/IFSelect/IFSelect_SignAncestor.cdl
+++ b/src/IFSelect/IFSelect_SignAncestor.cdl
@@ -25,7 +25,7 @@ uses
     AsciiString
 is
 
-    Create (nopk: Boolean = Standard_False) returns mutable SignAncestor;
+    Create (nopk: Boolean = Standard_False) returns SignAncestor;
     
     Matches (me; ent : Transient; model : InterfaceModel;
     	    	 text : AsciiString; exact : Boolean)
diff --git a/src/IFSelect/IFSelect_SignCategory.cdl b/src/IFSelect/IFSelect_SignCategory.cdl
index 11c27d5587..c0b63a9f5a 100644
--- a/src/IFSelect/IFSelect_SignCategory.cdl
+++ b/src/IFSelect/IFSelect_SignCategory.cdl
@@ -23,7 +23,7 @@ uses CString, Transient, InterfaceModel
 
 is
 
-    Create returns mutable SignCategory;
+    Create returns SignCategory;
     ---Purpose : Returns a SignCategory
 
     Value (me; ent : any Transient; model : InterfaceModel) returns CString;
diff --git a/src/IFSelect/IFSelect_SignCounter.cdl b/src/IFSelect/IFSelect_SignCounter.cdl
index 726b679671..c90fffaf18 100644
--- a/src/IFSelect/IFSelect_SignCounter.cdl
+++ b/src/IFSelect/IFSelect_SignCounter.cdl
@@ -43,7 +43,7 @@ uses CString, Transient, MapOfTransient, HAsciiString from TCollection,
 is
 
     Create (withmap  : Boolean = Standard_True;
-    	    withlist : Boolean = Standard_False) returns mutable SignCounter;
+    	    withlist : Boolean = Standard_False) returns SignCounter;
     ---Purpose : Creates a SignCounter, without proper Signature
     --           If <withmap> is True (default), added entities are counted
     --           only if they are not yet recorded in the map
@@ -52,13 +52,13 @@ is
     --           <withlist> is transmitted to SignatureList (option to list
     --           entities, not only to count them).
 
-    Create (matcher  : mutable Signature;
+    Create (matcher  : Signature;
     	    withmap  : Boolean = Standard_True;
-    	    withlist : Boolean = Standard_False)  returns mutable SignCounter;
+    	    withlist : Boolean = Standard_False)  returns SignCounter;
     ---Purpose : Creates a SignCounter, with a predefined Signature
     --           Other arguments as for Create without Signature.
 
-    Signature (me) returns mutable Signature;
+    Signature (me) returns Signature;
     ---Purpose : Returns the Signature used to count entities. It can be null.
 
     SetMap  (me : mutable; withmap  : Boolean);
diff --git a/src/IFSelect/IFSelect_SignMultiple.cdl b/src/IFSelect/IFSelect_SignMultiple.cdl
index d11026fd86..4dbe1021c0 100644
--- a/src/IFSelect/IFSelect_SignMultiple.cdl
+++ b/src/IFSelect/IFSelect_SignMultiple.cdl
@@ -27,7 +27,7 @@ uses CString, Transient, AsciiString, InterfaceModel,
 
 is
 
-    Create (name : CString) returns mutable SignMultiple;
+    Create (name : CString) returns SignMultiple;
     ---Purpose : Creates an empty SignMultiple with a Name
     --           This name should take expected tabulations into account
 
diff --git a/src/IFSelect/IFSelect_SignType.cdl b/src/IFSelect/IFSelect_SignType.cdl
index 013d82d766..edfe3a2d73 100644
--- a/src/IFSelect/IFSelect_SignType.cdl
+++ b/src/IFSelect/IFSelect_SignType.cdl
@@ -25,7 +25,7 @@ uses CString, Transient, InterfaceModel
 
 is
 
-    Create (nopk : Boolean = Standard_False) returns mutable SignType;
+    Create (nopk : Boolean = Standard_False) returns SignType;
     ---Purpose : Returns a SignType
     --           <nopk> false (D) : complete dynamic type (name = Dynamic Type)
     --           <nopk> true : class type without pk (name = Class Type)
diff --git a/src/IFSelect/IFSelect_SignValidity.cdl b/src/IFSelect/IFSelect_SignValidity.cdl
index 54ab5b5f75..e22fbf2883 100644
--- a/src/IFSelect/IFSelect_SignValidity.cdl
+++ b/src/IFSelect/IFSelect_SignValidity.cdl
@@ -26,7 +26,7 @@ uses CString, Transient, InterfaceModel
 
 is
 
-    Create returns mutable SignValidity;
+    Create returns SignValidity;
     ---Purpose : Returns a SignValidity
 
     CVal  (myclass; ent : any Transient; model : InterfaceModel) returns CString;
diff --git a/src/IFSelect/IFSelect_SignatureList.cdl b/src/IFSelect/IFSelect_SignatureList.cdl
index 846878be5b..cfb90f395f 100644
--- a/src/IFSelect/IFSelect_SignatureList.cdl
+++ b/src/IFSelect/IFSelect_SignatureList.cdl
@@ -35,7 +35,7 @@ uses CString, HSequenceOfTransient,
 
 is
 
-    Create (withlist : Boolean = Standard_False) returns mutable SignatureList;
+    Create (withlist : Boolean = Standard_False) returns SignatureList;
     ---Purpose : Creates a SignatureList. If <withlist> is True, entities will
     --           be not only counted per signature, but also listed.
 
diff --git a/src/IFSelect/IFSelect_TransformStandard.cdl b/src/IFSelect/IFSelect_TransformStandard.cdl
index 6cdbfe5bbf..e5060380a4 100644
--- a/src/IFSelect/IFSelect_TransformStandard.cdl
+++ b/src/IFSelect/IFSelect_TransformStandard.cdl
@@ -50,7 +50,7 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable TransformStandard;
+    Create returns TransformStandard;
     ---Purpose : Creates a TransformStandard, option StandardCopy, no Modifier
 
     	--  Description  --
@@ -76,13 +76,13 @@ is
     NbModifiers (me) returns Integer;
     ---Purpose : Returns the count of recorded Modifiers
 
-    Modifier (me; num : Integer) returns mutable Modifier;
+    Modifier (me; num : Integer) returns Modifier;
     ---Purpose : Returns a Modifier given its rank in the list
 
     ModifierRank (me; modif : Modifier) returns Integer;
     ---Purpose : Returns the rank of a Modifier in the list, 0 if unknown
 
-    AddModifier (me : mutable; modif : mutable Modifier; atnum : Integer = 0)
+    AddModifier (me : mutable; modif : Modifier; atnum : Integer = 0)
     	returns Boolean;
     ---Purpose : Adds a Modifier to the list :
     --           - <atnum> = 0 (default) : at the end of the list
@@ -101,29 +101,29 @@ is
 
     Perform (me : mutable; G : Graph; protocol : Protocol from Interface;
              checks : in out CheckIterator;
-    	     newmod : out mutable InterfaceModel)  returns Boolean;
+    	     newmod : out InterfaceModel)  returns Boolean;
     ---Purpose : Performs the Standard Transformation, by calling Copy then
     --           ApplyModifiers (which can return an error status)
 
     Copy         (me; G : Graph; TC : in out CopyTool;
-    	    	  newmod : out mutable InterfaceModel);
+    	    	  newmod : out InterfaceModel);
     ---Purpose : This the first operation. It calls StandardCopy or OnTheSpot
     --           according the option
 
     StandardCopy (me; G : Graph; TC : in out CopyTool;
-    	    	  newmod : out mutable InterfaceModel);
+    	    	  newmod : out InterfaceModel);
     ---Purpose : This is the standard action of Copy : its takes into account
     --           only the remaining entities (noted by Graph Status positive)
     --           and their proper dependances of course. Produces a new model.
 
     OnTheSpot    (me; G : Graph; TC : in out CopyTool;
-    	    	  newmod : out mutable InterfaceModel);
+    	    	  newmod : out InterfaceModel);
     ---Purpose : This is the OnTheSpot action : each entity is bound with ...
     --           itself. The produced model is the same as the starting one.
 
     ApplyModifiers (me;  G : Graph;  protocol : Protocol from Interface;
     	    	    TC : in out CopyTool; checks : in out CheckIterator;
-    	    	    newmod : out mutable InterfaceModel) returns Boolean;
+    	    	    newmod : out InterfaceModel) returns Boolean;
     ---Purpose : Applies the modifiers sequencially.
     --           For each one, prepares required data (if a Selection is
     --           associated as a filter).
@@ -132,7 +132,7 @@ is
     --           If a Modifier causes an error (check "HasFailed"),
     --           ApplyModifier stops : the following Modifiers are ignored
 
-    Updated (me; entfrom : Transient; entto : out mutable Transient)
+    Updated (me; entfrom : Transient; entto : out Transient)
     	returns Boolean;
     ---Purpose : This methods allows to know what happened to a starting
     --           entity after the last Perform. It reads result from the map
diff --git a/src/IFSelect/IFSelect_Transformer.cdl b/src/IFSelect/IFSelect_Transformer.cdl
index 86d489d411..3fc09682e4 100644
--- a/src/IFSelect/IFSelect_Transformer.cdl
+++ b/src/IFSelect/IFSelect_Transformer.cdl
@@ -36,7 +36,7 @@ is
 
     Perform (me : mutable; G : Graph; protocol : Protocol from Interface;
     	     checks : in out CheckIterator;
-    	     newmod : out mutable InterfaceModel)  returns Boolean  is deferred;
+    	     newmod : out InterfaceModel)  returns Boolean  is deferred;
     ---Purpose : Performs a Transformation (defined by each sub-class) :
     --         <G> gives the input data (especially the starting model) and
     --           can be used for queries (by Selections, etc...)
@@ -72,7 +72,7 @@ is
     --           The provided default keeps the starting Protocol. This method
     --           should be redefined as required by the effect of Perform.
 
-    Updated (me; entfrom : Transient; entto : out mutable Transient)
+    Updated (me; entfrom : Transient; entto : out Transient)
     	returns Boolean  is deferred;
     ---Purpose : This method allows to know what happened to a starting
     --           entity after the last Perform. If <entfrom> (from starting
diff --git a/src/IFSelect/IFSelect_WorkLibrary.cdl b/src/IFSelect/IFSelect_WorkLibrary.cdl
index 7c85c17379..ae9496882a 100644
--- a/src/IFSelect/IFSelect_WorkLibrary.cdl
+++ b/src/IFSelect/IFSelect_WorkLibrary.cdl
@@ -41,7 +41,7 @@ is
     ---Purpose : Required to initialise fields
 
     ReadFile (me; name : CString;
-    	      model    : out mutable InterfaceModel;
+    	      model    : out InterfaceModel;
     	      protocol : Protocol from Interface)
 	      returns Integer  is deferred;
     ---Purpose : Gives the way to Read a File and transfer it to a Model
@@ -75,7 +75,7 @@ is
 
     CopyModel (me;
     	       original : InterfaceModel;
-	       newmodel : mutable InterfaceModel;
+	       newmodel : InterfaceModel;
 	       list     : EntityIterator;
 	       TC       : in out CopyTool)
 	returns Boolean  is virtual;
diff --git a/src/IFSelect/IFSelect_WorkSession.cdl b/src/IFSelect/IFSelect_WorkSession.cdl
index 4eb61728e1..9c0c43294b 100644
--- a/src/IFSelect/IFSelect_WorkSession.cdl
+++ b/src/IFSelect/IFSelect_WorkSession.cdl
@@ -45,7 +45,7 @@ is
 
 	-- --    General Management    -- --
 
-    Create returns mutable WorkSession;
+    Create returns WorkSession;
     ---Purpose : Creates a Work Session
     --           It provides default, empty ShareOut and ModelCopier, which can
     --           be replaced (if required, should be done just after creation).
@@ -56,11 +56,11 @@ is
     ErrorHandle (me) returns Boolean;
     ---Purpose : Returns the Error Handler status
 
-    ShareOut (me) returns mutable ShareOut;
+    ShareOut (me) returns ShareOut;
     ---Purpose : Returns the ShareOut defined at creation time
     ---C++ : return const &
 
-    SetShareOut (me : mutable; shareout : mutable ShareOut);
+    SetShareOut (me : mutable; shareout : ShareOut);
     ---Purpose : Sets a new ShareOut. Fills Items which its content
     --  Warning : data from the former ShareOut are lost
     
@@ -258,7 +258,7 @@ is
     --           greater to the count of known Items, because some can have
     --           been removed
 
-    Item (me; id : Integer) returns mutable Transient;
+    Item (me; id : Integer) returns Transient;
     ---Purpose : Returns an Item, given its Ident. Returns a Null Handle if
     --           no Item corresponds to this Ident.
 
@@ -266,12 +266,12 @@ is
     ---Purpose : Returns the Ident attached to an Item in the WorkSession, or
     --           Zero if it is unknown
 
-    NamedItem (me; name : CString) returns mutable Transient;
+    NamedItem (me; name : CString) returns Transient;
     ---Purpose : Returns the Item which corresponds to a Variable, given its
     --           Name (whatever the type of this Item).
     --           Returns a Null Handle if this Name is not recorded
 
-    NamedItem (me; name : HAsciiString from TCollection) returns mutable Transient;
+    NamedItem (me; name : HAsciiString from TCollection) returns Transient;
     ---Purpose : Same as above, but <name> is given through a Handle
     --           Especially Usefull with methods SelectionNames, etc...
 
@@ -286,7 +286,7 @@ is
     --           WorkSession. If <item> is Null or not recorded, returns an
     --           empty string.
 
-    AddItem (me : mutable; item : mutable Transient;
+    AddItem (me : mutable; item : Transient;
     	 active : Boolean = Standard_True)  returns Integer;
     ---Purpose : Adds an Item and returns its attached Ident. Does nothing
     --           if <item> is already recorded (and returns its attached Ident)
@@ -294,7 +294,7 @@ is
     --           Remark : the determined Ident is used if <item> is a Dispatch,
     --           to fill the ShareOut
 
-    AddNamedItem (me : mutable; name : CString; item : mutable Transient;
+    AddNamedItem (me : mutable; name : CString; item : Transient;
     	active : Boolean = Standard_True)  returns Integer;
     ---Purpose : Adds an Item with an attached Name. If the Name is already
     --           known in the WorkSession, the older item losts it
@@ -304,7 +304,7 @@ is
     --           method tries to attached a Name to it
     --           <active> if True commands call to SetActive (see below)
 
-    SetActive (me : mutable; item : mutable Transient; mode : Boolean)
+    SetActive (me : mutable; item : Transient; mode : Boolean)
     	returns Boolean;
     ---Purpose : Following the type of <item> :
     --           - Dispatch : Adds or Removes it in the ShareOut & FileNaming
@@ -379,14 +379,14 @@ is
 	-- They are Integer (IntParam) and Text (HAsciiString from TCollection)
 
     NewParamFromStatic (me : mutable; statname : CString; name : CString = "")
-    	returns mutable Transient;
+    	returns Transient;
     ---Purpose : Creates a parameter as being bound to a Static
     --           If the Static is Integer, this creates an IntParam bound to
     --           it by its name. Else this creates a String which is the value
     --           of the Static.
     --           Returns a null handle if <statname> is unknown as a Static
 
-    IntParam (me; id : Integer) returns mutable IntParam;
+    IntParam (me; id : Integer) returns IntParam;
     ---Purpose : Returns an IntParam, given its Ident in the Session
     --           Null result if <id> is not suitable for an IntParam
     --           (undefined, or defined for another kind of variable)
@@ -394,18 +394,18 @@ is
     IntValue (me; it : IntParam) returns Integer;
     ---Purpose : Returns Integer Value of an IntParam
 
-    NewIntParam (me : mutable; name : CString = "") returns mutable IntParam;
+    NewIntParam (me : mutable; name : CString = "") returns IntParam;
     ---Purpose : Creates a new IntParam. A Name can be set (Optional)
     --           Returns the created IntParam, or a Null Handle in case of
     --           Failure (see AddItem/AddNamedItem)
 
-    SetIntValue (me : mutable; it : mutable IntParam; val : Integer)
+    SetIntValue (me : mutable; it : IntParam; val : Integer)
     	returns Boolean;
     ---Purpose : Changes the Integer Value of an IntParam
     --           Returns True if Done, False if <it> is not in the WorkSession
 
 
-    TextParam (me; id : Integer) returns mutable HAsciiString from TCollection;
+    TextParam (me; id : Integer) returns HAsciiString from TCollection;
     ---Purpose : Returns a TextParam, given its Ident in the Session
     --           Null result if <id> is not suitable for a TextParam
     --           (undefined, or defined for another kind of variable)
@@ -416,19 +416,19 @@ is
     --           or an empty string if <it> is not in the WorkSession
 
     NewTextParam (me : mutable; name : CString = "")
-    	 returns mutable HAsciiString from TCollection;
+    	 returns HAsciiString from TCollection;
     ---Purpose : Creates a new (empty) TextParam. A Name can be set (Optional)
     --           Returns the created TextParam (as an HAsciiString), or a Null
     --           Handle in case of Failure (see AddItem/AddNamedItem)
 
-    SetTextValue (me : mutable; par : mutable HAsciiString from TCollection;
+    SetTextValue (me : mutable; par : HAsciiString from TCollection;
     	    	  val : CString)  returns Boolean;
     ---Purpose : Changes the Text Value of a TextParam (an HAsciiString)
     --           Returns True if Done, False if <it> is not in the WorkSession
 
 	-- --    List of Signatures    -- --
 
-    Signature (me; id : Integer) returns mutable Signature;
+    Signature (me; id : Integer) returns Signature;
     ---Purpose : Returns a Signature, given its Ident in the Session
     --           Null result if <id> is not suitable for a Signature
     --           (undefined, or defined for another kind of variable)
@@ -440,7 +440,7 @@ is
 
 	-- --    List of Selections    -- --
 
-    Selection (me; id : Integer) returns mutable Selection;
+    Selection (me; id : Integer) returns Selection;
     ---Purpose : Returns a Selection, given its Ident in the Session
     --           Null result if <id> is not suitable for a Selection
     --           (undefined, or defined for another kind of variable)
@@ -478,8 +478,8 @@ is
     --           and all the chain of deductions is applied
 
 
-    SetItemSelection (me : mutable; item : mutable Transient;
-    	    	    	   sel : mutable Selection)  returns Boolean;
+    SetItemSelection (me : mutable; item : Transient;
+    	    	    	   sel : Selection)  returns Boolean;
     ---Purpose : Sets a Selection as input for an item, according its type :
     --           if <item> is a Dispatch : as Final Selection
     --           if <item> is a GeneralModifier (i.e. any kind of Modifier) :
@@ -488,12 +488,12 @@ is
     --           Returns False if <item> is not of a suitable type, or
     --             <item> or <sel> is not in the WorkSession
 
-    ResetItemSelection (me : mutable; item : mutable Transient) returns Boolean;
+    ResetItemSelection (me : mutable; item : Transient) returns Boolean;
     ---Purpose : Resets input Selection which was set by SetItemSelection
     --           Same conditions as for SetItemSelection
     --           Returns True if done, False if <item> is not in the WorkSession
 
-    ItemSelection (me; item : Transient) returns mutable Selection;
+    ItemSelection (me; item : Transient) returns Selection;
     ---Purpose : Returns the Selection of a Dispatch or a GeneralModifier.
     --           Returns a Null Handle if none is defined or <item> not good type
 
@@ -503,7 +503,7 @@ is
 	-- - it is cleared by ClearData (1 or 4)
 	-- - when it is defined by a Selection, it can be recomputed
 
-    SignCounter (me; id : Integer) returns mutable SignCounter;
+    SignCounter (me; id : Integer) returns SignCounter;
     ---Purpose : Returns a SignCounter from its ident in the Session
     --           Null result if <id> is not suitable for a SignCounter
     --           (undefined, or defined for another kind of variable)
@@ -535,7 +535,7 @@ is
     --           if <only> disp is True, tha's all. Else, clears also the lists
     --           of Modifiers recorded by the ShareOut
 
-    Dispatch (me; id : Integer) returns mutable Dispatch;
+    Dispatch (me; id : Integer) returns Dispatch;
     ---Purpose : Returns a Dispatch, given its Ident in the Session
     --           Null result if <id> is not suitable for a Dispatch
     --           (undefined, or defined for another kind of variable)
@@ -557,10 +557,10 @@ is
     	--   Modifier, i.e. for GeneralModifier (also applies to IFAdapt kinds
     	--   of Modifiers, which apply during the Copy operation itself)
 
-    ModelCopier (me) returns mutable ModelCopier;
+    ModelCopier (me) returns ModelCopier;
     ---Purpose : Gives access to the complete ModelCopier
 
-    SetModelCopier (me : mutable; copier : mutable ModelCopier);
+    SetModelCopier (me : mutable; copier : ModelCopier);
     ---Purpose : Sets a new ModelCopier. Fills Items which its content
     ---Warning : all data recorded in the former ModelCopier are lost
     --           (thus, Final Modifiers become inactive)
@@ -579,12 +579,12 @@ is
     --           (which takes into account the Changes to Modifier Ranks)
 
     GeneralModifier (me; id : Integer)
-    	returns mutable GeneralModifier;
+    	returns GeneralModifier;
     ---Purpose : Returns a Modifier, given its Ident in the Session
     --           Null result if <id> is not suitable for a Modifier
     --           (undefined, or defined for another kind of variable)
 
-    ModelModifier (me; id : Integer) returns mutable Modifier;
+    ModelModifier (me; id : Integer) returns Modifier;
     ---Purpose : Returns a Model Modifier, given its Ident in the Session,
     --           i.e. typed as a Modifier (not simply a GeneralModifier)
     --           Null result if <id> is not suitable for a Modifier
@@ -609,26 +609,26 @@ is
     ---Purpose : Removes all the Modifiers active in the ModelCopier : they
     --           become inactive and they are removed from the Session
 
-    SetAppliedModifier (me : mutable; modif : mutable GeneralModifier;
-    	    	        item : mutable Transient) returns Boolean;
+    SetAppliedModifier (me : mutable; modif : GeneralModifier;
+    	    	        item : Transient) returns Boolean;
     ---Purpose : Sets a GeneralModifier to be applied to an item :
     --           - item = ShareOut : applies for final sending (all dispatches)
     --           - item is a Dispatch : applies for this dispatch only
     --           Returns True if done, False if <modif> or <item> not in <me>
 
-    ResetAppliedModifier (me : mutable; modif : mutable GeneralModifier)
+    ResetAppliedModifier (me : mutable; modif : GeneralModifier)
     	returns Boolean;
     ---Purpose : Resets a GeneralModifier to be applied
     --           Returns True if done, False if <modif> was not applied
 
-    UsesAppliedModifier (me; modif : GeneralModifier) returns mutable Transient;
+    UsesAppliedModifier (me; modif : GeneralModifier) returns Transient;
     ---Purpose : Returns the item on which a GeneralModifier is applied :
     --           the ShareOut, or a given Dispatch
     --           Returns a Null Handle if <modif> is not applied
 
     	-- --    Transformation (without sending)    -- --
 
-    Transformer (me; id : Integer) returns mutable Transformer;
+    Transformer (me; id : Integer) returns Transformer;
     ---Purpose : Returns a Transformer, given its Ident in the Session
     --           Null result if <id> is not suitable for a Transformer
     --           (undefined, or defined for another kind of variable)
@@ -682,7 +682,7 @@ is
     --           If the selection is a null handle, the whole model is taken
 
     NewTransformStandard (me : mutable; copy : Boolean; name : CString = "")
-    	 returns mutable Transformer;
+    	 returns Transformer;
     ---Purpose : Creates and returns a TransformStandard, empty, with its
     --           Copy Option (True = Copy, False = On the Spot) and an
     --           optional name.
@@ -752,7 +752,7 @@ is
     NbFiles   (me) returns Integer;
     ---Purpose : Returns the count of produced Models
 
-    FileModel (me; num : Integer) returns mutable InterfaceModel;
+    FileModel (me; num : Integer) returns InterfaceModel;
     ---Purpose : Returns a Model, given its rank in the Evaluation List
 
     FileName  (me; num : Integer) returns AsciiString from TCollection;
@@ -882,7 +882,7 @@ is
     --           SelectDeduct / SelectExtract kind, two for SelectControl kind,
     --           variable for a SelectCombine (Union/Intersection), zero else
 
-    Source (me; sel : Selection; num : Integer = 1) returns mutable Selection;
+    Source (me; sel : Selection; num : Integer = 1) returns Selection;
     ---Purpose : Returns the <num>th Input Selection of a Selection
     --           (see NbSources).
     --           Returns a Null Handle if <sel> is not in the WorkSession or if
@@ -892,12 +892,12 @@ is
     IsReversedSelectExtract (me; sel : Selection) returns Boolean;
     ---Purpose : Returns True if <sel> a Reversed SelectExtract, False else
 
-    ToggleSelectExtract (me : mutable; sel : mutable Selection) returns Boolean;
+    ToggleSelectExtract (me : mutable; sel : Selection) returns Boolean;
     ---Purpose : Toggles the Sense (Direct <-> Reversed) of a SelectExtract
     --           Returns True if Done, False if <sel> is not a SelectExtract or
     --           is not in the WorkSession
 
-    SetInputSelection (me : mutable; sel, input : mutable Selection)
+    SetInputSelection (me : mutable; sel, input : Selection)
     	returns Boolean;
     ---Purpose : Sets an Input Selection (as <input>) to a SelectExtract or
     --           a SelectDeduct (as <sel>).
@@ -905,14 +905,14 @@ is
     --           SelectExtract nor a SelectDeduct, or not in the WorkSession
 
 
-    SetControl (me : mutable; sel, sc : mutable Selection;
+    SetControl (me : mutable; sel, sc : Selection;
        	        formain : Boolean = Standard_True) returns Boolean;
     ---Purpose : Sets an Input Selection, Main if <formain> is True, Second else
     --           (as <sc>) to a SelectControl (as <sel>). Returns True if Done,
     --           False if <sel> is not a SelectControl, or <sc> or <sel> is not
     --           in the WorkSession
 
-    CombineAdd  (me : mutable; selcomb, seladd : mutable Selection;
+    CombineAdd  (me : mutable; selcomb, seladd : Selection;
     	    	 atnum : Integer = 0)  returns Integer;
     ---Purpose : Adds an input selection to a SelectCombine (Union or Inters.).
     --           Returns new count of inputs for this SelectCombine if Done or
@@ -921,18 +921,18 @@ is
     --           By default, adding is done at the end of the list
     --           Else, it is an insertion to rank <atnum> (usefull for Un-ReDo)
 
-    CombineRemove (me : mutable; selcomb, selrem : mutable Selection)
+    CombineRemove (me : mutable; selcomb, selrem : Selection)
     	returns Boolean;
     ---Purpose : Removes an input selection from a SelectCombine (Union or
     --           Intersection). Returns True if done, False if <selcomb> is not
     --           kind of SelectCombine or <selrem> is not source of <selcomb>
 
     NewSelectPointed (me : mutable; list : HSequenceOfTransient; name : CString)
-    	returns mutable Selection;
+    	returns Selection;
     ---Purpose : Creates a new Selection, of type SelectPointed, its content
     --           starts with <list>. A name must be given (can be empty)
 
-    SetSelectPointed (me; sel : mutable Selection; list : HSequenceOfTransient;
+    SetSelectPointed (me; sel : Selection; list : HSequenceOfTransient;
     	    	      mode : Integer) returns Boolean;
     ---Purpose : Changes the content of a Selection of type SelectPointed
     --           According <mode> : 0  set <list> as new content (clear former)
diff --git a/src/IGESAppli/IGESAppli_DrilledHole.cdl b/src/IGESAppli/IGESAppli_DrilledHole.cdl
index f220d5ea6a..973784adcb 100644
--- a/src/IGESAppli/IGESAppli_DrilledHole.cdl
+++ b/src/IGESAppli/IGESAppli_DrilledHole.cdl
@@ -26,7 +26,7 @@ uses  Integer, Real  -- no one specific type
 
 is
 
-        Create returns mutable DrilledHole;
+        Create returns DrilledHole;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_ElementResults.cdl b/src/IGESAppli/IGESAppli_ElementResults.cdl
index ce96ba133f..983be0d117 100644
--- a/src/IGESAppli/IGESAppli_ElementResults.cdl
+++ b/src/IGESAppli/IGESAppli_ElementResults.cdl
@@ -35,7 +35,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable ElementResults;
+        Create returns ElementResults;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_FiniteElement.cdl b/src/IGESAppli/IGESAppli_FiniteElement.cdl
index 4dd7a774c2..05fcfd46dd 100644
--- a/src/IGESAppli/IGESAppli_FiniteElement.cdl
+++ b/src/IGESAppli/IGESAppli_FiniteElement.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable FiniteElement;
+        Create returns FiniteElement;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_Flow.cdl b/src/IGESAppli/IGESAppli_Flow.cdl
index 024edb7585..ac58d5dcd5 100644
--- a/src/IGESAppli/IGESAppli_Flow.cdl
+++ b/src/IGESAppli/IGESAppli_Flow.cdl
@@ -36,7 +36,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable Flow;
+        Create returns Flow;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_FlowLineSpec.cdl b/src/IGESAppli/IGESAppli_FlowLineSpec.cdl
index 2e953022be..44433ae91e 100644
--- a/src/IGESAppli/IGESAppli_FlowLineSpec.cdl
+++ b/src/IGESAppli/IGESAppli_FlowLineSpec.cdl
@@ -30,7 +30,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable FlowLineSpec;
+        Create returns FlowLineSpec;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_GeneralModule.cdl b/src/IGESAppli/IGESAppli_GeneralModule.cdl
index cd63d208fa..67a3bf0a2c 100644
--- a/src/IGESAppli/IGESAppli_GeneralModule.cdl
+++ b/src/IGESAppli/IGESAppli_GeneralModule.cdl
@@ -25,7 +25,7 @@ uses OStream,
 
 is
 
-    Create returns mutable GeneralModule from IGESAppli;
+    Create returns GeneralModule from IGESAppli;
     ---Purpose : Creates a GeneralModule from IGESAppli and puts it into GeneralLib
 
     OwnSharedCase  (me; CN : Integer; ent : IGESEntity;
@@ -43,12 +43,12 @@ is
     ---Purpose : Performs Specific Semantic Check for each type of Entity
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
diff --git a/src/IGESAppli/IGESAppli_LevelFunction.cdl b/src/IGESAppli/IGESAppli_LevelFunction.cdl
index d053f950a8..d7f317e5ee 100644
--- a/src/IGESAppli/IGESAppli_LevelFunction.cdl
+++ b/src/IGESAppli/IGESAppli_LevelFunction.cdl
@@ -27,7 +27,7 @@ uses
 
 is
 
-        Create returns mutable LevelFunction;
+        Create returns LevelFunction;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.cdl b/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.cdl
index de715dd4f7..27e12c022e 100644
--- a/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.cdl
+++ b/src/IGESAppli/IGESAppli_LevelToPWBLayerMap.cdl
@@ -33,7 +33,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable LevelToPWBLayerMap;
+        Create returns LevelToPWBLayerMap;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_LineWidening.cdl b/src/IGESAppli/IGESAppli_LineWidening.cdl
index 8c3e58cbb9..3495023e42 100644
--- a/src/IGESAppli/IGESAppli_LineWidening.cdl
+++ b/src/IGESAppli/IGESAppli_LineWidening.cdl
@@ -25,7 +25,7 @@ uses  Integer, Real  -- no one specific type
 
 is
 
-        Create returns mutable LineWidening;
+        Create returns LineWidening;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_NodalConstraint.cdl b/src/IGESAppli/IGESAppli_NodalConstraint.cdl
index 1f328295b1..2e40f6d907 100644
--- a/src/IGESAppli/IGESAppli_NodalConstraint.cdl
+++ b/src/IGESAppli/IGESAppli_NodalConstraint.cdl
@@ -33,7 +33,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable NodalConstraint;
+        Create returns NodalConstraint;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_NodalDisplAndRot.cdl b/src/IGESAppli/IGESAppli_NodalDisplAndRot.cdl
index 68ea291766..27f363931e 100644
--- a/src/IGESAppli/IGESAppli_NodalDisplAndRot.cdl
+++ b/src/IGESAppli/IGESAppli_NodalDisplAndRot.cdl
@@ -37,7 +37,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable NodalDisplAndRot;
+        Create returns NodalDisplAndRot;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_NodalResults.cdl b/src/IGESAppli/IGESAppli_NodalResults.cdl
index fcec00e5de..f99b0e7e78 100644
--- a/src/IGESAppli/IGESAppli_NodalResults.cdl
+++ b/src/IGESAppli/IGESAppli_NodalResults.cdl
@@ -34,7 +34,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable NodalResults;
+        Create returns NodalResults;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_Node.cdl b/src/IGESAppli/IGESAppli_Node.cdl
index d46b3f960e..5c64ab7e03 100644
--- a/src/IGESAppli/IGESAppli_Node.cdl
+++ b/src/IGESAppli/IGESAppli_Node.cdl
@@ -29,7 +29,7 @@ uses
 
 is
 
-        Create returns mutable Node;
+        Create returns Node;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_PWBArtworkStackup.cdl b/src/IGESAppli/IGESAppli_PWBArtworkStackup.cdl
index 57e10bc5be..a921973cfd 100644
--- a/src/IGESAppli/IGESAppli_PWBArtworkStackup.cdl
+++ b/src/IGESAppli/IGESAppli_PWBArtworkStackup.cdl
@@ -34,7 +34,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable PWBArtworkStackup;
+        Create returns PWBArtworkStackup;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_PWBDrilledHole.cdl b/src/IGESAppli/IGESAppli_PWBDrilledHole.cdl
index ff683cfb34..8c7300bf7c 100644
--- a/src/IGESAppli/IGESAppli_PWBDrilledHole.cdl
+++ b/src/IGESAppli/IGESAppli_PWBDrilledHole.cdl
@@ -25,7 +25,7 @@ uses  Integer, Real  -- no one specific type
 
 is
 
-        Create returns mutable PWBDrilledHole;
+        Create returns PWBDrilledHole;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_PartNumber.cdl b/src/IGESAppli/IGESAppli_PartNumber.cdl
index 2af778938e..9a1bd00324 100644
--- a/src/IGESAppli/IGESAppli_PartNumber.cdl
+++ b/src/IGESAppli/IGESAppli_PartNumber.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable PartNumber;
+        Create returns PartNumber;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_PinNumber.cdl b/src/IGESAppli/IGESAppli_PinNumber.cdl
index 2e609e0d15..862c210c96 100644
--- a/src/IGESAppli/IGESAppli_PinNumber.cdl
+++ b/src/IGESAppli/IGESAppli_PinNumber.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable PinNumber;
+        Create returns PinNumber;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_PipingFlow.cdl b/src/IGESAppli/IGESAppli_PipingFlow.cdl
index edd965cc4a..1d64be9c81 100644
--- a/src/IGESAppli/IGESAppli_PipingFlow.cdl
+++ b/src/IGESAppli/IGESAppli_PipingFlow.cdl
@@ -34,7 +34,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable PipingFlow;
+        Create returns PipingFlow;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_Protocol.cdl b/src/IGESAppli/IGESAppli_Protocol.cdl
index ce7512abe8..3ffe8abf3e 100644
--- a/src/IGESAppli/IGESAppli_Protocol.cdl
+++ b/src/IGESAppli/IGESAppli_Protocol.cdl
@@ -22,7 +22,7 @@ uses Type, Protocol from Interface
 
 is
 
-    Create returns mutable Protocol from IGESAppli;
+    Create returns Protocol from IGESAppli;
 
     NbResources (me) returns Integer  is redefined;
     ---Purpose : Gives the count of direct Resource Protocol. Here, two
diff --git a/src/IGESAppli/IGESAppli_ReadWriteModule.cdl b/src/IGESAppli/IGESAppli_ReadWriteModule.cdl
index aa72647ec5..9c3407810b 100644
--- a/src/IGESAppli/IGESAppli_ReadWriteModule.cdl
+++ b/src/IGESAppli/IGESAppli_ReadWriteModule.cdl
@@ -27,13 +27,13 @@ raises DomainError
 
 is
 
-    Create returns mutable ReadWriteModule from IGESAppli;
+    Create returns ReadWriteModule from IGESAppli;
     ---Purpose : Creates a ReadWriteModule & puts it into ReaderLib & WriterLib
 
     CaseIGES (me; typenum, formnum : Integer) returns Integer;
     ---Purpose : Defines Case Numbers for Entities of IGESAppli
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError;
     ---Purpose : Reads own parameters from file for an Entity of IGESAppli
diff --git a/src/IGESAppli/IGESAppli_ReferenceDesignator.cdl b/src/IGESAppli/IGESAppli_ReferenceDesignator.cdl
index 28b624480f..79a60355d4 100644
--- a/src/IGESAppli/IGESAppli_ReferenceDesignator.cdl
+++ b/src/IGESAppli/IGESAppli_ReferenceDesignator.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable ReferenceDesignator;
+        Create returns ReferenceDesignator;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_RegionRestriction.cdl b/src/IGESAppli/IGESAppli_RegionRestriction.cdl
index 62876a9310..21fdb03160 100644
--- a/src/IGESAppli/IGESAppli_RegionRestriction.cdl
+++ b/src/IGESAppli/IGESAppli_RegionRestriction.cdl
@@ -25,7 +25,7 @@ uses  Integer  -- no one specific type
 
 is
 
-        Create returns mutable RegionRestriction;
+        Create returns RegionRestriction;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESAppli/IGESAppli_SpecificModule.cdl b/src/IGESAppli/IGESAppli_SpecificModule.cdl
index 0ffe676222..852a491973 100644
--- a/src/IGESAppli/IGESAppli_SpecificModule.cdl
+++ b/src/IGESAppli/IGESAppli_SpecificModule.cdl
@@ -23,14 +23,14 @@ uses Messenger from Message, IGESEntity, IGESDumper
 
 is
 
-    Create returns mutable SpecificModule from IGESAppli;
+    Create returns SpecificModule from IGESAppli;
     ---Purpose : Creates a SpecificModule from IGESAppli & puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
     	      dumper : IGESDumper;  S : Messenger from Message; own : Integer);
     ---Purpose : Specific Dump (own parameters) for IGESAppli
 
-    OwnCorrect (me; CN : Integer; ent : mutable IGESEntity)
+    OwnCorrect (me; CN : Integer; ent : IGESEntity)
     	returns Boolean  is redefined;
     ---Purpose 
 
diff --git a/src/IGESAppli/IGESAppli_ToolDrilledHole.cdl b/src/IGESAppli/IGESAppli_ToolDrilledHole.cdl
index 006451caaa..06858d004b 100644
--- a/src/IGESAppli/IGESAppli_ToolDrilledHole.cdl
+++ b/src/IGESAppli/IGESAppli_ToolDrilledHole.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDrilledHole, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DrilledHole;
+    ReadOwnParams (me; ent : DrilledHole;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a DrilledHole <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable DrilledHole) returns Boolean  is static;
+    OwnCorrect (me; ent : DrilledHole) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a DrilledHole
     --           (NbPropertyValues forced to 5, Level cleared if Subordinate != 0)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DrilledHole; entto : mutable DrilledHole;
+    OwnCopy    (me; entfrom : DrilledHole; entto : DrilledHole;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolElementResults.cdl b/src/IGESAppli/IGESAppli_ToolElementResults.cdl
index 00dc9c80ae..da23ce9f0d 100644
--- a/src/IGESAppli/IGESAppli_ToolElementResults.cdl
+++ b/src/IGESAppli/IGESAppli_ToolElementResults.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolElementResults, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ElementResults;
+    ReadOwnParams (me; ent : ElementResults;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ElementResults; entto : mutable ElementResults;
+    OwnCopy    (me; entfrom : ElementResults; entto : ElementResults;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolFiniteElement.cdl b/src/IGESAppli/IGESAppli_ToolFiniteElement.cdl
index e1106e1281..a07aa47512 100644
--- a/src/IGESAppli/IGESAppli_ToolFiniteElement.cdl
+++ b/src/IGESAppli/IGESAppli_ToolFiniteElement.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolFiniteElement, ready to work
 
 
-    ReadOwnParams (me; ent : mutable FiniteElement;
+    ReadOwnParams (me; ent : FiniteElement;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : FiniteElement; entto : mutable FiniteElement;
+    OwnCopy    (me; entfrom : FiniteElement; entto : FiniteElement;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolFlow.cdl b/src/IGESAppli/IGESAppli_ToolFlow.cdl
index 04901498ec..f5d6b16e5c 100644
--- a/src/IGESAppli/IGESAppli_ToolFlow.cdl
+++ b/src/IGESAppli/IGESAppli_ToolFlow.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolFlow, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Flow;
+    ReadOwnParams (me; ent : Flow;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Flow <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Flow) returns Boolean  is static;
+    OwnCorrect (me; ent : Flow) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Flow
     --           (NbContextFlags forced to 2)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Flow; entto : mutable Flow;
+    OwnCopy    (me; entfrom : Flow; entto : Flow;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolFlowLineSpec.cdl b/src/IGESAppli/IGESAppli_ToolFlowLineSpec.cdl
index 6cee0606f5..36d8144e53 100644
--- a/src/IGESAppli/IGESAppli_ToolFlowLineSpec.cdl
+++ b/src/IGESAppli/IGESAppli_ToolFlowLineSpec.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolFlowLineSpec, ready to work
 
 
-    ReadOwnParams (me; ent : mutable FlowLineSpec;
+    ReadOwnParams (me; ent : FlowLineSpec;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : FlowLineSpec; entto : mutable FlowLineSpec;
+    OwnCopy    (me; entfrom : FlowLineSpec; entto : FlowLineSpec;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolLevelFunction.cdl b/src/IGESAppli/IGESAppli_ToolLevelFunction.cdl
index f2809a93d6..faff4b6820 100644
--- a/src/IGESAppli/IGESAppli_ToolLevelFunction.cdl
+++ b/src/IGESAppli/IGESAppli_ToolLevelFunction.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLevelFunction, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LevelFunction;
+    ReadOwnParams (me; ent : LevelFunction;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a LevelFunction <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable LevelFunction) returns Boolean  is static;
+    OwnCorrect (me; ent : LevelFunction) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a LevelFunction
     --           (NbPropertyValues forced to 2)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LevelFunction; entto : mutable LevelFunction;
+    OwnCopy    (me; entfrom : LevelFunction; entto : LevelFunction;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cdl b/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cdl
index 81cf3e3bb9..b47fa2bf97 100644
--- a/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cdl
+++ b/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLevelToPWBLayerMap, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LevelToPWBLayerMap;
+    ReadOwnParams (me; ent : LevelToPWBLayerMap;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LevelToPWBLayerMap; entto : mutable LevelToPWBLayerMap;
+    OwnCopy    (me; entfrom : LevelToPWBLayerMap; entto : LevelToPWBLayerMap;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolLineWidening.cdl b/src/IGESAppli/IGESAppli_ToolLineWidening.cdl
index 7662b29db8..f18d35bd4c 100644
--- a/src/IGESAppli/IGESAppli_ToolLineWidening.cdl
+++ b/src/IGESAppli/IGESAppli_ToolLineWidening.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLineWidening, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LineWidening;
+    ReadOwnParams (me; ent : LineWidening;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a LineWidening <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable LineWidening) returns Boolean  is static;
+    OwnCorrect (me; ent : LineWidening) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a LineWidening
     --           (NbPropertyValues forced to 5, Level cleared if Subordinate != 0)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LineWidening; entto : mutable LineWidening;
+    OwnCopy    (me; entfrom : LineWidening; entto : LineWidening;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolNodalConstraint.cdl b/src/IGESAppli/IGESAppli_ToolNodalConstraint.cdl
index d6197d9219..f1d04fab16 100644
--- a/src/IGESAppli/IGESAppli_ToolNodalConstraint.cdl
+++ b/src/IGESAppli/IGESAppli_ToolNodalConstraint.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNodalConstraint, ready to work
 
 
-    ReadOwnParams (me; ent : mutable NodalConstraint;
+    ReadOwnParams (me; ent : NodalConstraint;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : NodalConstraint; entto : mutable NodalConstraint;
+    OwnCopy    (me; entfrom : NodalConstraint; entto : NodalConstraint;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cdl b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cdl
index 1c0899f16b..1364a531c6 100644
--- a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cdl
+++ b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNodalDisplAndRot, ready to work
 
 
-    ReadOwnParams (me; ent : mutable NodalDisplAndRot;
+    ReadOwnParams (me; ent : NodalDisplAndRot;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : NodalDisplAndRot; entto : mutable NodalDisplAndRot;
+    OwnCopy    (me; entfrom : NodalDisplAndRot; entto : NodalDisplAndRot;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolNodalResults.cdl b/src/IGESAppli/IGESAppli_ToolNodalResults.cdl
index c87742e1ad..bcafd73e8c 100644
--- a/src/IGESAppli/IGESAppli_ToolNodalResults.cdl
+++ b/src/IGESAppli/IGESAppli_ToolNodalResults.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNodalResults, ready to work
 
 
-    ReadOwnParams (me; ent : mutable NodalResults;
+    ReadOwnParams (me; ent : NodalResults;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : NodalResults; entto : mutable NodalResults;
+    OwnCopy    (me; entfrom : NodalResults; entto : NodalResults;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolNode.cdl b/src/IGESAppli/IGESAppli_ToolNode.cdl
index 1304b99576..de5d3186ed 100644
--- a/src/IGESAppli/IGESAppli_ToolNode.cdl
+++ b/src/IGESAppli/IGESAppli_ToolNode.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNode, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Node;
+    ReadOwnParams (me; ent : Node;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Node; entto : mutable Node;
+    OwnCopy    (me; entfrom : Node; entto : Node;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cdl b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cdl
index a30ec447c9..629101c819 100644
--- a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cdl
+++ b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPWBArtworkStackup, ready to work
 
 
-    ReadOwnParams (me; ent : mutable PWBArtworkStackup;
+    ReadOwnParams (me; ent : PWBArtworkStackup;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : PWBArtworkStackup; entto : mutable PWBArtworkStackup;
+    OwnCopy    (me; entfrom : PWBArtworkStackup; entto : PWBArtworkStackup;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cdl b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cdl
index b2948d592d..e56ec3f358 100644
--- a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cdl
+++ b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPWBDrilledHole, ready to work
 
 
-    ReadOwnParams (me; ent : mutable PWBDrilledHole;
+    ReadOwnParams (me; ent : PWBDrilledHole;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a PWBDrilledHole <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable PWBDrilledHole) returns Boolean  is static;
+    OwnCorrect (me; ent : PWBDrilledHole) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a PWBDrilledHole
     --           (NbPropertyValues forced to 3)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : PWBDrilledHole; entto : mutable PWBDrilledHole;
+    OwnCopy    (me; entfrom : PWBDrilledHole; entto : PWBDrilledHole;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolPartNumber.cdl b/src/IGESAppli/IGESAppli_ToolPartNumber.cdl
index 006ca9c188..b0668e3a61 100644
--- a/src/IGESAppli/IGESAppli_ToolPartNumber.cdl
+++ b/src/IGESAppli/IGESAppli_ToolPartNumber.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPartNumber, ready to work
 
 
-    ReadOwnParams (me; ent : mutable PartNumber;
+    ReadOwnParams (me; ent : PartNumber;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a PartNumber <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable PartNumber) returns Boolean  is static;
+    OwnCorrect (me; ent : PartNumber) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a PartNumber
     --           (NbPropertyValues forced to 4)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : PartNumber; entto : mutable PartNumber;
+    OwnCopy    (me; entfrom : PartNumber; entto : PartNumber;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolPinNumber.cdl b/src/IGESAppli/IGESAppli_ToolPinNumber.cdl
index 838502b1ef..c74e7f88af 100644
--- a/src/IGESAppli/IGESAppli_ToolPinNumber.cdl
+++ b/src/IGESAppli/IGESAppli_ToolPinNumber.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPinNumber, ready to work
 
 
-    ReadOwnParams (me; ent : mutable PinNumber;
+    ReadOwnParams (me; ent : PinNumber;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a PinNumber <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable PinNumber) returns Boolean  is static;
+    OwnCorrect (me; ent : PinNumber) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a PinNumber
     --           (Level cleared in D.E. if Subordinate != 0)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : PinNumber; entto : mutable PinNumber;
+    OwnCopy    (me; entfrom : PinNumber; entto : PinNumber;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolPipingFlow.cdl b/src/IGESAppli/IGESAppli_ToolPipingFlow.cdl
index 191db515a7..55e7533521 100644
--- a/src/IGESAppli/IGESAppli_ToolPipingFlow.cdl
+++ b/src/IGESAppli/IGESAppli_ToolPipingFlow.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPipingFlow, ready to work
 
 
-    ReadOwnParams (me; ent : mutable PipingFlow;
+    ReadOwnParams (me; ent : PipingFlow;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a PipingFlow <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable PipingFlow) returns Boolean  is static;
+    OwnCorrect (me; ent : PipingFlow) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a PipingFlow
     --           (NbContextFlags forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : PipingFlow; entto : mutable PipingFlow;
+    OwnCopy    (me; entfrom : PipingFlow; entto : PipingFlow;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cdl b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cdl
index 12cf9d72b3..9e6b809cc1 100644
--- a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cdl
+++ b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolReferenceDesignator, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ReferenceDesignator;
+    ReadOwnParams (me; ent : ReferenceDesignator;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a ReferenceDesignator <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable ReferenceDesignator) returns Boolean  is static;
+    OwnCorrect (me; ent : ReferenceDesignator) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a ReferenceDesignator
     --           (NbPropertyValues forced to 1, Level cleared if Subordinate != 0)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ReferenceDesignator; entto : mutable ReferenceDesignator;
+    OwnCopy    (me; entfrom : ReferenceDesignator; entto : ReferenceDesignator;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESAppli/IGESAppli_ToolRegionRestriction.cdl b/src/IGESAppli/IGESAppli_ToolRegionRestriction.cdl
index b2acaba1f0..601ef2513d 100644
--- a/src/IGESAppli/IGESAppli_ToolRegionRestriction.cdl
+++ b/src/IGESAppli/IGESAppli_ToolRegionRestriction.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolRegionRestriction, ready to work
 
 
-    ReadOwnParams (me; ent : mutable RegionRestriction;
+    ReadOwnParams (me; ent : RegionRestriction;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a RegionRestriction <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable RegionRestriction) returns Boolean  is static;
+    OwnCorrect (me; ent : RegionRestriction) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a RegionRestriction
     --           (NbPropertyValues forced to 3, Level cleared if Subordinate != 0)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : RegionRestriction; entto : mutable RegionRestriction;
+    OwnCopy    (me; entfrom : RegionRestriction; entto : RegionRestriction;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_AssocGroupType.cdl b/src/IGESBasic/IGESBasic_AssocGroupType.cdl
index dccc8100f9..ff8c2b4de5 100644
--- a/src/IGESBasic/IGESBasic_AssocGroupType.cdl
+++ b/src/IGESBasic/IGESBasic_AssocGroupType.cdl
@@ -27,7 +27,7 @@ uses
 
 is
 
-        Create returns mutable AssocGroupType;
+        Create returns AssocGroupType;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFile.cdl b/src/IGESBasic/IGESBasic_ExternalRefFile.cdl
index 35bc85ac9e..de0468a6fa 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFile.cdl
+++ b/src/IGESBasic/IGESBasic_ExternalRefFile.cdl
@@ -26,7 +26,7 @@ uses
 
 is
 
-        Create returns mutable ExternalRefFile;
+        Create returns ExternalRefFile;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFileIndex.cdl b/src/IGESBasic/IGESBasic_ExternalRefFileIndex.cdl
index dd44e992d8..43ff3ec6cf 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFileIndex.cdl
+++ b/src/IGESBasic/IGESBasic_ExternalRefFileIndex.cdl
@@ -32,7 +32,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable ExternalRefFileIndex;
+        Create returns ExternalRefFileIndex;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefFileName.cdl b/src/IGESBasic/IGESBasic_ExternalRefFileName.cdl
index cadf89e56a..6543dd5763 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefFileName.cdl
+++ b/src/IGESBasic/IGESBasic_ExternalRefFileName.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable ExternalRefFileName;
+        Create returns ExternalRefFileName;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefLibName.cdl b/src/IGESBasic/IGESBasic_ExternalRefLibName.cdl
index 8c3e237b1f..cadd453d54 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefLibName.cdl
+++ b/src/IGESBasic/IGESBasic_ExternalRefLibName.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable ExternalRefLibName;
+        Create returns ExternalRefLibName;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_ExternalRefName.cdl b/src/IGESBasic/IGESBasic_ExternalRefName.cdl
index 6292bf21a8..c23b8a6e96 100644
--- a/src/IGESBasic/IGESBasic_ExternalRefName.cdl
+++ b/src/IGESBasic/IGESBasic_ExternalRefName.cdl
@@ -27,7 +27,7 @@ uses
 
 is
 
-        Create returns mutable ExternalRefName;
+        Create returns ExternalRefName;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_ExternalReferenceFile.cdl b/src/IGESBasic/IGESBasic_ExternalReferenceFile.cdl
index 36cca03c15..d7babe446f 100644
--- a/src/IGESBasic/IGESBasic_ExternalReferenceFile.cdl
+++ b/src/IGESBasic/IGESBasic_ExternalReferenceFile.cdl
@@ -29,7 +29,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable ExternalReferenceFile;
+        Create returns ExternalReferenceFile;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_GeneralModule.cdl b/src/IGESBasic/IGESBasic_GeneralModule.cdl
index b515fea419..8fb0708e1b 100644
--- a/src/IGESBasic/IGESBasic_GeneralModule.cdl
+++ b/src/IGESBasic/IGESBasic_GeneralModule.cdl
@@ -25,7 +25,7 @@ uses OStream,
 
 is
 
-    Create returns mutable GeneralModule from IGESBasic;
+    Create returns GeneralModule from IGESBasic;
     ---Purpose : Creates a GeneralModule from IGESBasic and puts it into GeneralLib
 
     OwnSharedCase  (me; CN : Integer; ent : IGESEntity;
@@ -43,12 +43,12 @@ is
     ---Purpose : Performs Specific Semantic Check for each type of Entity
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
diff --git a/src/IGESBasic/IGESBasic_Group.cdl b/src/IGESBasic/IGESBasic_Group.cdl
index c4ee4277de..f2c3787a31 100644
--- a/src/IGESBasic/IGESBasic_Group.cdl
+++ b/src/IGESBasic/IGESBasic_Group.cdl
@@ -40,7 +40,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable Group;
+        Create returns Group;
 
     	Create (nb : Integer) returns Group;
 	---Purpose : Creates a Group with a predefined count of items
diff --git a/src/IGESBasic/IGESBasic_GroupWithoutBackP.cdl b/src/IGESBasic/IGESBasic_GroupWithoutBackP.cdl
index 415d989bab..12de95da06 100644
--- a/src/IGESBasic/IGESBasic_GroupWithoutBackP.cdl
+++ b/src/IGESBasic/IGESBasic_GroupWithoutBackP.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable GroupWithoutBackP;
+        Create returns GroupWithoutBackP;
 
         -- Specific Methods pertaining to the class : see Group
 
diff --git a/src/IGESBasic/IGESBasic_Hierarchy.cdl b/src/IGESBasic/IGESBasic_Hierarchy.cdl
index 7556beb4b4..bcbe396242 100644
--- a/src/IGESBasic/IGESBasic_Hierarchy.cdl
+++ b/src/IGESBasic/IGESBasic_Hierarchy.cdl
@@ -25,7 +25,7 @@ uses  Integer  -- no one specific type
 
 is
 
-        Create returns mutable Hierarchy;
+        Create returns Hierarchy;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_Name.cdl b/src/IGESBasic/IGESBasic_Name.cdl
index e43474ab70..9a11adc29f 100644
--- a/src/IGESBasic/IGESBasic_Name.cdl
+++ b/src/IGESBasic/IGESBasic_Name.cdl
@@ -26,7 +26,7 @@ uses
 
 is
 
-        Create returns mutable Name;
+        Create returns Name;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_OrderedGroup.cdl b/src/IGESBasic/IGESBasic_OrderedGroup.cdl
index 664fe8aff0..62cbe6aa42 100644
--- a/src/IGESBasic/IGESBasic_OrderedGroup.cdl
+++ b/src/IGESBasic/IGESBasic_OrderedGroup.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable OrderedGroup;
+        Create returns OrderedGroup;
 
         -- Specific Methods pertaining to the class : see Group
 
diff --git a/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.cdl b/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.cdl
index 6fc2043aa2..df58c14592 100644
--- a/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.cdl
+++ b/src/IGESBasic/IGESBasic_OrderedGroupWithoutBackP.cdl
@@ -30,7 +30,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable OrderedGroupWithoutBackP;
+        Create returns OrderedGroupWithoutBackP;
 
         -- Specific Methods pertaining to the class : see Group
 
diff --git a/src/IGESBasic/IGESBasic_Protocol.cdl b/src/IGESBasic/IGESBasic_Protocol.cdl
index 7aa2ee51fb..d55ea91fa2 100644
--- a/src/IGESBasic/IGESBasic_Protocol.cdl
+++ b/src/IGESBasic/IGESBasic_Protocol.cdl
@@ -22,7 +22,7 @@ uses Type, Protocol from Interface
 
 is
 
-    Create returns mutable Protocol from IGESBasic;
+    Create returns Protocol from IGESBasic;
 
     NbResources (me) returns Integer  is redefined;
     ---Purpose : Gives the count of Resource Protocol. Here, one
diff --git a/src/IGESBasic/IGESBasic_ReadWriteModule.cdl b/src/IGESBasic/IGESBasic_ReadWriteModule.cdl
index 7d34a5b913..a32a51c6fe 100644
--- a/src/IGESBasic/IGESBasic_ReadWriteModule.cdl
+++ b/src/IGESBasic/IGESBasic_ReadWriteModule.cdl
@@ -27,13 +27,13 @@ raises DomainError
 
 is
 
-    Create returns mutable ReadWriteModule from IGESBasic;
+    Create returns ReadWriteModule from IGESBasic;
     ---Purpose : Creates a ReadWriteModule & puts it into ReaderLib & WriterLib
 
     CaseIGES (me; typenum, formnum : Integer) returns Integer;
     ---Purpose : Defines Case Numbers for Entities of IGESBasic
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError;
     ---Purpose : Reads own parameters from file for an Entity of IGESBasic
diff --git a/src/IGESBasic/IGESBasic_SingleParent.cdl b/src/IGESBasic/IGESBasic_SingleParent.cdl
index e7136273ac..d246c8ceb8 100644
--- a/src/IGESBasic/IGESBasic_SingleParent.cdl
+++ b/src/IGESBasic/IGESBasic_SingleParent.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable SingleParent;
+        Create returns SingleParent;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_SingularSubfigure.cdl b/src/IGESBasic/IGESBasic_SingularSubfigure.cdl
index 258da4ee9c..fd1b50af59 100644
--- a/src/IGESBasic/IGESBasic_SingularSubfigure.cdl
+++ b/src/IGESBasic/IGESBasic_SingularSubfigure.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable SingularSubfigure;
+        Create returns SingularSubfigure;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_SpecificModule.cdl b/src/IGESBasic/IGESBasic_SpecificModule.cdl
index 1d0899ecf5..c22a4cb66d 100644
--- a/src/IGESBasic/IGESBasic_SpecificModule.cdl
+++ b/src/IGESBasic/IGESBasic_SpecificModule.cdl
@@ -24,14 +24,14 @@ uses IGESEntity, IGESDumper,
 
 is
 
-    Create returns mutable SpecificModule from IGESBasic;
+    Create returns SpecificModule from IGESBasic;
     ---Purpose : Creates a SpecificModule from IGESBasic & puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
     	      dumper : IGESDumper;  S : Messenger from Message; own : Integer);
     ---Purpose : Specific Dump (own parameters) for IGESBasic
 
-    OwnCorrect (me; CN : Integer; ent : mutable IGESEntity)
+    OwnCorrect (me; CN : Integer; ent : IGESEntity)
     	returns Boolean  is redefined;
     ---Purpose : Performs non-ambiguous Corrections on Entities which support
     --           them (AssocGroupType,Hierarchy,Name,SingleParent)
diff --git a/src/IGESBasic/IGESBasic_SubfigureDef.cdl b/src/IGESBasic/IGESBasic_SubfigureDef.cdl
index fc125293a7..c31b993b5b 100644
--- a/src/IGESBasic/IGESBasic_SubfigureDef.cdl
+++ b/src/IGESBasic/IGESBasic_SubfigureDef.cdl
@@ -32,7 +32,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable SubfigureDef;
+        Create returns SubfigureDef;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESBasic/IGESBasic_ToolAssocGroupType.cdl b/src/IGESBasic/IGESBasic_ToolAssocGroupType.cdl
index 4599ed9688..635fe082fc 100644
--- a/src/IGESBasic/IGESBasic_ToolAssocGroupType.cdl
+++ b/src/IGESBasic/IGESBasic_ToolAssocGroupType.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolAssocGroupType, ready to work
 
 
-    ReadOwnParams (me; ent : mutable AssocGroupType;
+    ReadOwnParams (me; ent : AssocGroupType;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a AssocGroupType <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable AssocGroupType) returns Boolean  is static;
+    OwnCorrect (me; ent : AssocGroupType) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a AssocGroupType
     --           (NbData forced to 2)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : AssocGroupType; entto : mutable AssocGroupType;
+    OwnCopy    (me; entfrom : AssocGroupType; entto : AssocGroupType;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFile.cdl b/src/IGESBasic/IGESBasic_ToolExternalRefFile.cdl
index 59b87c1ab6..36f5ef8285 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefFile.cdl
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefFile.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolExternalRefFile, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ExternalRefFile;
+    ReadOwnParams (me; ent : ExternalRefFile;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ExternalRefFile; entto : mutable ExternalRefFile;
+    OwnCopy    (me; entfrom : ExternalRefFile; entto : ExternalRefFile;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cdl b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cdl
index 5172c78581..17c356c1f3 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cdl
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolExternalRefFileIndex, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ExternalRefFileIndex;
+    ReadOwnParams (me; ent : ExternalRefFileIndex;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ExternalRefFileIndex; entto : mutable ExternalRefFileIndex;
+    OwnCopy    (me; entfrom : ExternalRefFileIndex; entto : ExternalRefFileIndex;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cdl b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cdl
index 331092dcf8..c8aec91f28 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cdl
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolExternalRefFileName, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ExternalRefFileName;
+    ReadOwnParams (me; ent : ExternalRefFileName;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ExternalRefFileName; entto : mutable ExternalRefFileName;
+    OwnCopy    (me; entfrom : ExternalRefFileName; entto : ExternalRefFileName;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cdl b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cdl
index 9a6121fd37..ea540e42f4 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cdl
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolExternalRefLibName, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ExternalRefLibName;
+    ReadOwnParams (me; ent : ExternalRefLibName;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ExternalRefLibName; entto : mutable ExternalRefLibName;
+    OwnCopy    (me; entfrom : ExternalRefLibName; entto : ExternalRefLibName;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefName.cdl b/src/IGESBasic/IGESBasic_ToolExternalRefName.cdl
index f6333f477f..839ae9f382 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalRefName.cdl
+++ b/src/IGESBasic/IGESBasic_ToolExternalRefName.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolExternalRefName, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ExternalRefName;
+    ReadOwnParams (me; ent : ExternalRefName;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ExternalRefName; entto : mutable ExternalRefName;
+    OwnCopy    (me; entfrom : ExternalRefName; entto : ExternalRefName;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cdl b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cdl
index d005a7f653..10a2f1665f 100644
--- a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cdl
+++ b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolExternalReferenceFile, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ExternalReferenceFile;
+    ReadOwnParams (me; ent : ExternalReferenceFile;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ExternalReferenceFile; entto : mutable ExternalReferenceFile;
+    OwnCopy    (me; entfrom : ExternalReferenceFile; entto : ExternalReferenceFile;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolGroup.cdl b/src/IGESBasic/IGESBasic_ToolGroup.cdl
index 50a245228e..b78deee832 100644
--- a/src/IGESBasic/IGESBasic_ToolGroup.cdl
+++ b/src/IGESBasic/IGESBasic_ToolGroup.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolGroup, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Group;
+    ReadOwnParams (me; ent : Group;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Group <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Group) returns Boolean  is static;
+    OwnCorrect (me; ent : Group) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Group
     --           (Null Elements are removed from list)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Group; entto : mutable Group;
+    OwnCopy    (me; entfrom : Group; entto : Group;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cdl b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cdl
index 27abbf90a9..0f7bf4fbb3 100644
--- a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cdl
+++ b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolGroupWithoutBackP, ready to work
 
 
-    ReadOwnParams (me; ent : mutable GroupWithoutBackP;
+    ReadOwnParams (me; ent : GroupWithoutBackP;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a GroupWithoutBackP <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable GroupWithoutBackP) returns Boolean  is static;
+    OwnCorrect (me; ent : GroupWithoutBackP) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a GroupWithoutBackP
     --           (Null Elements are removed from list)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : GroupWithoutBackP; entto : mutable GroupWithoutBackP;
+    OwnCopy    (me; entfrom : GroupWithoutBackP; entto : GroupWithoutBackP;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolHierarchy.cdl b/src/IGESBasic/IGESBasic_ToolHierarchy.cdl
index 20a207a37d..a0a6ad9988 100644
--- a/src/IGESBasic/IGESBasic_ToolHierarchy.cdl
+++ b/src/IGESBasic/IGESBasic_ToolHierarchy.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolHierarchy, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Hierarchy;
+    ReadOwnParams (me; ent : Hierarchy;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Hierarchy <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Hierarchy) returns Boolean  is static;
+    OwnCorrect (me; ent : Hierarchy) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Hierarchy
     --           (NbPropertyValues forced to 6)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Hierarchy; entto : mutable Hierarchy;
+    OwnCopy    (me; entfrom : Hierarchy; entto : Hierarchy;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolName.cdl b/src/IGESBasic/IGESBasic_ToolName.cdl
index d62146b397..402a5f44e4 100644
--- a/src/IGESBasic/IGESBasic_ToolName.cdl
+++ b/src/IGESBasic/IGESBasic_ToolName.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolName, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Name;
+    ReadOwnParams (me; ent : Name;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Name <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Name) returns Boolean  is static;
+    OwnCorrect (me; ent : Name) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Name
     --           (NbPropertyValues forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Name; entto : mutable Name;
+    OwnCopy    (me; entfrom : Name; entto : Name;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroup.cdl b/src/IGESBasic/IGESBasic_ToolOrderedGroup.cdl
index ae74bf279b..789d6e8632 100644
--- a/src/IGESBasic/IGESBasic_ToolOrderedGroup.cdl
+++ b/src/IGESBasic/IGESBasic_ToolOrderedGroup.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolOrderedGroup, ready to work
 
 
-    ReadOwnParams (me; ent : mutable OrderedGroup;
+    ReadOwnParams (me; ent : OrderedGroup;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a OrderedGroup <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable OrderedGroup) returns Boolean  is static;
+    OwnCorrect (me; ent : OrderedGroup) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on an OrderedGroup
     --           (Null Elements are removed from list)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : OrderedGroup; entto : mutable OrderedGroup;
+    OwnCopy    (me; entfrom : OrderedGroup; entto : OrderedGroup;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cdl b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cdl
index 9481c920dc..0155a0d701 100644
--- a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cdl
+++ b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolOrderedGroupWithoutBackP, ready to work
 
 
-    ReadOwnParams (me; ent : mutable OrderedGroupWithoutBackP;
+    ReadOwnParams (me; ent : OrderedGroupWithoutBackP;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a OrderedGroupWithoutBackP <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable OrderedGroupWithoutBackP) returns Boolean  is static;
+    OwnCorrect (me; ent : OrderedGroupWithoutBackP) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on an OrderedGroupWithoutBackP
     --           (Null Elements are removed from list)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : OrderedGroupWithoutBackP; entto : mutable OrderedGroupWithoutBackP;
+    OwnCopy    (me; entfrom : OrderedGroupWithoutBackP; entto : OrderedGroupWithoutBackP;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolSingleParent.cdl b/src/IGESBasic/IGESBasic_ToolSingleParent.cdl
index d327d7fc0c..d4b6b493d0 100644
--- a/src/IGESBasic/IGESBasic_ToolSingleParent.cdl
+++ b/src/IGESBasic/IGESBasic_ToolSingleParent.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSingleParent, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SingleParent;
+    ReadOwnParams (me; ent : SingleParent;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a SingleParent <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable SingleParent) returns Boolean  is static;
+    OwnCorrect (me; ent : SingleParent) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a SingleParent
     --           (NbParents forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SingleParent; entto : mutable SingleParent;
+    OwnCopy    (me; entfrom : SingleParent; entto : SingleParent;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cdl b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cdl
index 1dcadf32fb..352e29bb7c 100644
--- a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cdl
+++ b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSingularSubfigure, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SingularSubfigure;
+    ReadOwnParams (me; ent : SingularSubfigure;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SingularSubfigure; entto : mutable SingularSubfigure;
+    OwnCopy    (me; entfrom : SingularSubfigure; entto : SingularSubfigure;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESBasic/IGESBasic_ToolSubfigureDef.cdl b/src/IGESBasic/IGESBasic_ToolSubfigureDef.cdl
index 612931ed44..3a977b46e7 100644
--- a/src/IGESBasic/IGESBasic_ToolSubfigureDef.cdl
+++ b/src/IGESBasic/IGESBasic_ToolSubfigureDef.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSubfigureDef, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SubfigureDef;
+    ReadOwnParams (me; ent : SubfigureDef;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SubfigureDef; entto : mutable SubfigureDef;
+    OwnCopy    (me; entfrom : SubfigureDef; entto : SubfigureDef;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESCAFControl/IGESCAFControl_Reader.cdl b/src/IGESCAFControl/IGESCAFControl_Reader.cdl
index c7839da26f..0def1d0055 100644
--- a/src/IGESCAFControl/IGESCAFControl_Reader.cdl
+++ b/src/IGESCAFControl/IGESCAFControl_Reader.cdl
@@ -45,7 +45,7 @@ is
     	---Purpose: Creates a reader with an empty
     	--          IGES model and sets ColorMode, LayerMode and NameMode to Standard_True.
 
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True) returns Reader;
     	---Purpose: Creates a reader tool and attaches it to an already existing Session
     	-- 	    Clears the session if it was not yet set for IGES
diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.cdl b/src/IGESCAFControl/IGESCAFControl_Writer.cdl
index a0a194fd94..3bc9f89f47 100644
--- a/src/IGESCAFControl/IGESCAFControl_Writer.cdl
+++ b/src/IGESCAFControl/IGESCAFControl_Writer.cdl
@@ -51,7 +51,7 @@ is
     	---Purpose: Creates a writer with an empty
     	-- IGES model and sets ColorMode, LayerMode and NameMode to Standard_True.
 
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True) returns Writer;
     	---Purpose: Creates a reader tool and attaches it to an already existing Session
     	--          Clears the session if it was not yet set for IGES
diff --git a/src/IGESControl/IGESControl_ActorWrite.cdl b/src/IGESControl/IGESControl_ActorWrite.cdl
index bddb65a486..e16d57b0e7 100644
--- a/src/IGESControl/IGESControl_ActorWrite.cdl
+++ b/src/IGESControl/IGESControl_ActorWrite.cdl
@@ -34,7 +34,7 @@ is
     ---Purpose : Recognizes a ShapeMapper
 
     Transfer  (me : mutable; start : Finder from Transfer;
-    	       FP : mutable FinderProcess)  returns Binder  is redefined;
+    	       FP : FinderProcess)  returns Binder  is redefined;
     ---Purpose : Transfers Shape to IGES Entities
     --         
     --           ModeTrans may be : 0 -> groups of Faces
diff --git a/src/IGESControl/IGESControl_AlgoContainer.cdl b/src/IGESControl/IGESControl_AlgoContainer.cdl
index 77b6ebe214..704500f30a 100644
--- a/src/IGESControl/IGESControl_AlgoContainer.cdl
+++ b/src/IGESControl/IGESControl_AlgoContainer.cdl
@@ -19,7 +19,7 @@ class AlgoContainer from IGESControl inherits AlgoContainer from IGESToBRep
 
 is
 
-    Create returns mutable AlgoContainer from IGESControl;
+    Create returns AlgoContainer from IGESControl;
     	---Purpose: Empty constructor
 
 end AlgoContainer;
diff --git a/src/IGESControl/IGESControl_Controller.cdl b/src/IGESControl/IGESControl_Controller.cdl
index 8a94dff4d2..80772aefc5 100644
--- a/src/IGESControl/IGESControl_Controller.cdl
+++ b/src/IGESControl/IGESControl_Controller.cdl
@@ -34,24 +34,24 @@ uses
 is
 
     Create (modefnes : Boolean = Standard_False)
-    	returns mutable Controller from IGESControl;
+    	returns Controller from IGESControl;
     ---Purpose : Initializes the use of IGES Norm (the first time) and returns
     --           a Controller for IGES-5.1
     --           If <modefnes> is True, sets it to internal FNES format
 
-    NewModel     (me) returns mutable InterfaceModel from Interface;
+    NewModel     (me) returns InterfaceModel from Interface;
     ---Purpose : Creates a new empty Model ready to receive data of the Norm.
     --           It is taken from IGES Template Model
 
     ActorRead    (me; model : InterfaceModel)
-                 returns mutable ActorOfTransientProcess from Transfer;
+                 returns ActorOfTransientProcess from Transfer;
     ---Purpose : Returns the Actor for Read attached to the pair (norm,appli)
     --           It is an Actor from IGESToBRep, adapted from an IGESModel :
     --           Unit, tolerances
 
     TransferWriteShape (me; shape : Shape from TopoDS;
-    	    	    	FP        : mutable FinderProcess  from Transfer;
-    	    	        model     : mutable InterfaceModel from Interface;
+    	    	    	FP        : FinderProcess  from Transfer;
+    	    	        model     : InterfaceModel from Interface;
 			modetrans : Integer = 0)
       returns ReturnStatus  is redefined;
     ---Purpose : Takes one Shape and transfers it to the InterfaceModel
diff --git a/src/IGESControl/IGESControl_IGESBoundary.cdl b/src/IGESControl/IGESControl_IGESBoundary.cdl
index de80be5964..4c580e2766 100644
--- a/src/IGESControl/IGESControl_IGESBoundary.cdl
+++ b/src/IGESControl/IGESControl_IGESBoundary.cdl
@@ -29,10 +29,10 @@ uses
 
 is
 
-    Create returns mutable IGESBoundary from IGESControl;
+    Create returns IGESBoundary from IGESControl;
     	---Purpose: Creates an object and calls inherited constuctor.
 
-    Create (CS: CurveAndSurface from IGESToBRep) returns mutable IGESBoundary from IGESControl;
+    Create (CS: CurveAndSurface from IGESToBRep) returns IGESBoundary from IGESControl;
     	---Purpose: Creates an object and calls inherited constuctor.
 	
     Check (me: mutable; result, checkclosure, okCurve3d, okCurve2d: Boolean) is redefined;
diff --git a/src/IGESControl/IGESControl_Reader.cdl b/src/IGESControl/IGESControl_Reader.cdl
index 835d18d658..fd94722ff5 100644
--- a/src/IGESControl/IGESControl_Reader.cdl
+++ b/src/IGESControl/IGESControl_Reader.cdl
@@ -66,7 +66,7 @@ is
     Create returns Reader from IGESControl;
     ---Purpose : Creates a Reader from scratch
 
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True)
     	returns Reader from IGESControl;
     ---Purpose : Creates a Reader from an already existing Session
diff --git a/src/IGESControl/IGESControl_ToolContainer.cdl b/src/IGESControl/IGESControl_ToolContainer.cdl
index 14684e1b90..f21c95aced 100644
--- a/src/IGESControl/IGESControl_ToolContainer.cdl
+++ b/src/IGESControl/IGESControl_ToolContainer.cdl
@@ -23,7 +23,7 @@ uses
     
 is
 
-    Create returns mutable ToolContainer from IGESControl;
+    Create returns ToolContainer from IGESControl;
     	---Purpose: Empty constructor
 	
     IGESBoundary (me) returns IGESBoundary from IGESToBRep is redefined;
diff --git a/src/IGESControl/IGESControl_Writer.cdl b/src/IGESControl/IGESControl_Writer.cdl
index 27403f1ce9..93580702ba 100644
--- a/src/IGESControl/IGESControl_Writer.cdl
+++ b/src/IGESControl/IGESControl_Writer.cdl
@@ -47,7 +47,7 @@ is
     	-- - 0: Faces (default)
     	-- - 1: BRep.
 
-    Create (model : mutable IGESModel; modecr : Integer = 0) returns Writer;
+    Create (model : IGESModel; modecr : Integer = 0) returns Writer;
     	---Purpose : Creates a writer object with the
     	-- prepared IGES model model in write mode.
     	-- modecr defines the write mode and may be:
@@ -57,8 +57,8 @@ is
     Model (me) returns IGESModel;
     	---Purpose : Returns the IGES model to be written in output.
 
-    TransferProcess    (me) returns mutable FinderProcess;
-    SetTransferProcess (me : in out; TP : mutable FinderProcess);
+    TransferProcess    (me) returns FinderProcess;
+    SetTransferProcess (me : in out; TP : FinderProcess);
     	---Purpose : Returns/Sets the TransferProcess : it contains final results
     	--           and if some, check messages
 
diff --git a/src/IGESConvGeom/IGESConvGeom.cdl b/src/IGESConvGeom/IGESConvGeom.cdl
index 973ca1ca51..b39f7206b0 100644
--- a/src/IGESConvGeom/IGESConvGeom.cdl
+++ b/src/IGESConvGeom/IGESConvGeom.cdl
@@ -33,7 +33,7 @@ is
     SplineCurveFromIGES
     	(igesent : SplineCurve from IGESGeom;
 	 epscoef, epsgeom : Real;
-	 result  : out mutable BSplineCurve from Geom)
+	 result  : out BSplineCurve from Geom)
     returns Integer;
     ---Purpose : Converts a SplineCurve from IGES to a BSplineCurve from CasCade
     --           <epscoef> gives tolerance to consider coefficient to be nul
@@ -49,7 +49,7 @@ is
     --           - 5  less than one segment (no result produced)
 
     IncreaseCurveContinuity
-    	(curve      : mutable BSplineCurve from Geom;
+    	(curve      : BSplineCurve from Geom;
 	 epsgeom    : Real;
 	 continuity : Integer = 2)  returns Integer;
     ---Purpose : Tries to increase curve continuity with tolerance <epsgeom>
@@ -60,14 +60,14 @@ is
     --           all the knots can be passed to C2, all knots which can be are.
     
     IncreaseCurveContinuity
-    	(curve      : mutable BSplineCurve from Geom2d;
+    	(curve      : BSplineCurve from Geom2d;
 	 epsgeom    : Real;
 	 continuity : Integer = 2)  returns Integer;
 
     SplineSurfaceFromIGES
     	(igesent : SplineSurface from IGESGeom;
 	 epscoef, epsgeom : Real;
-	 result  : out mutable BSplineSurface from Geom)
+	 result  : out BSplineSurface from Geom)
     returns Integer;
     ---Purpose : Converts a SplineSurface from IGES to a BSplineSurface from CasCade
     --           <epscoef> gives tolerance to consider coefficient to be nul
@@ -83,7 +83,7 @@ is
     --           - 5  less than one segment in U or V (no result produced)
 
     IncreaseSurfaceContinuity
-    	(surface      : mutable BSplineSurface from Geom;
+    	(surface      : BSplineSurface from Geom;
 	 epsgeom    : Real;
 	 continuity : Integer = 2)  returns Integer;
     ---Purpose : Tries to increase Surface continuity with tolerance <epsgeom>
diff --git a/src/IGESConvGeom/IGESConvGeom_GeomBuilder.cdl b/src/IGESConvGeom/IGESConvGeom_GeomBuilder.cdl
index f2e141a7fc..00476e94a6 100644
--- a/src/IGESConvGeom/IGESConvGeom_GeomBuilder.cdl
+++ b/src/IGESConvGeom/IGESConvGeom_GeomBuilder.cdl
@@ -23,7 +23,7 @@ class GeomBuilder  from IGESConvGeom
     --           make a CopiousData from a list of points/vectors
 
 uses XY from gp, XYZ from gp, Trsf, Ax1, Ax2, Ax3,
-     HSequenceOfXYZ, HArray1OfXY, HArray1OfXYZ,
+     HSequenceOfXYZ,
      TransformationMatrix, CopiousData
 
 raises DomainError
@@ -55,7 +55,7 @@ is
     ---Purpose : Returns a point given its rank (if added as XY, Z will be 0)
 
     MakeCopiousData (me; datatype : Integer; polyline : Boolean = Standard_False)
-    	returns mutable CopiousData
+    	returns CopiousData
     ---Purpose : Makes a CopiousData with the list of recorded Points/Vectors
     --           according to <datatype>, which must be 1,2 or 3
     --           If <polyline> is given True, the CopiousData is coded as a
@@ -65,13 +65,6 @@ is
     	raises DomainError;
     --           Error if : <datatype> is not 1,2 or 3; or NbPoints is 0
 
-    MakeXY  (me) returns mutable HArray1OfXY  is static;
-    ---Purpose : Returns the list of points as a HArray1OfXY. Z are ignored.
-
-    MakeXYZ (me) returns mutable HArray1OfXYZ  is static;
-    ---Purpose : Returns the list of points as a HArray1OfXYZ
-
-
     Position (me) returns Trsf from gp  is static;
     ---Purpose : Returns the Position in which the method EvalXYZ will
     --           evaluate a XYZ. It can be regarded as defining a local system.
@@ -110,7 +103,7 @@ is
     --           Z will be regarded as a Z Displacement (can be ignored)
 
     MakeTransformation (me; unit : Real = 1)
-    	returns mutable TransformationMatrix  is static;
+    	returns TransformationMatrix  is static;
     ---Purpose : Returns the IGES Transformation which corresponds to the
     --           Position. Even if it is an Identity : IsIdentity should be
     --           tested first.
diff --git a/src/IGESConvGeom/IGESConvGeom_GeomBuilder.cxx b/src/IGESConvGeom/IGESConvGeom_GeomBuilder.cxx
index bc0a55e815..5e60aaa849 100644
--- a/src/IGESConvGeom/IGESConvGeom_GeomBuilder.cxx
+++ b/src/IGESConvGeom/IGESConvGeom_GeomBuilder.cxx
@@ -89,35 +89,6 @@ static Standard_Real epsa = 1.E-10;
   return res;
 }
 
-    Handle(TColgp_HArray1OfXY)   IGESConvGeom_GeomBuilder::MakeXY  () const
-{
-  Handle(TColgp_HArray1OfXY) res;
-  Standard_Integer num, nb = theXYZ->Length();
-  if (nb == 0) return res;
-  res = new TColgp_HArray1OfXY (1,nb);
-  for (num = 1; num <= nb; num ++) {
-    const gp_XYZ& pnt = theXYZ->Value(num);
-    res->SetValue (num , gp_XY (pnt.X(),pnt.Y()) );
-  }
-  return res;
-}
-
-    Handle(TColgp_HArray1OfXYZ)  IGESConvGeom_GeomBuilder::MakeXYZ () const
-{
-  Handle(TColgp_HArray1OfXYZ) res;
-/*
-  Standard_Integer num, nb = theXYZ->Length();
-  if (nb == 0) return res;
-  res = new TColgp_HArray1OfXYZ (1,nb);
-  for (num = 1; num <= nb; num ++) {
-    res->SetValue (num , theXYZ->Value(num) );
-  }
-*/
-  SeqToArray(theXYZ,res,TColgp_HArray1OfXYZ);
-  return res;
-}
-
-
     gp_Trsf  IGESConvGeom_GeomBuilder::Position () const
       {  return thepos;  }
 
diff --git a/src/IGESData/IGESData_BasicEditor.cdl b/src/IGESData/IGESData_BasicEditor.cdl
index 77e76e9237..118962126c 100644
--- a/src/IGESData/IGESData_BasicEditor.cdl
+++ b/src/IGESData/IGESData_BasicEditor.cdl
@@ -38,7 +38,7 @@ is
     	returns BasicEditor;
     ---Purpose : Creates a Basic Editor for IGES Data, ready to run
 
-    Model  (me) returns mutable IGESModel;
+    Model  (me) returns IGESModel;
     ---Purpose : Returns the designated model
 
     SetUnitFlag  (me : in out; flag : Integer) returns Boolean;
@@ -71,7 +71,7 @@ is
     --           can have required values according the way they are referenced
     --           (see definitions of Logical use, Physical use, etc...)
 
-    AutoCorrect (me : in out; ent : mutable IGESEntity) returns Boolean;
+    AutoCorrect (me : in out; ent : IGESEntity) returns Boolean;
     ---Purpose : Performs auto-correction on an IGESEntity
     --           Returns True if something has changed, False if nothing done.
     --           
diff --git a/src/IGESData/IGESData_DefaultGeneral.cdl b/src/IGESData/IGESData_DefaultGeneral.cdl
index 11d0b1f777..f5ee960ac5 100644
--- a/src/IGESData/IGESData_DefaultGeneral.cdl
+++ b/src/IGESData/IGESData_DefaultGeneral.cdl
@@ -25,7 +25,7 @@ uses OStream, Transient,
 
 is
 
-    Create returns mutable DefaultGeneral;
+    Create returns DefaultGeneral;
     ---Purpose : Creates a DefaultGeneral and puts it into GeneralLib,
     --           bound with a Protocol from IGESData
 
@@ -45,12 +45,12 @@ is
     --           Here, does nothing (no constraint to check)
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity (UndefinedEntity only)
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
diff --git a/src/IGESData/IGESData_DefaultSpecific.cdl b/src/IGESData/IGESData_DefaultSpecific.cdl
index cefb713122..83f0773b18 100644
--- a/src/IGESData/IGESData_DefaultSpecific.cdl
+++ b/src/IGESData/IGESData_DefaultSpecific.cdl
@@ -23,7 +23,7 @@ uses IGESEntity, IGESDumper,
 
 is
 
-    Create returns mutable DefaultSpecific;
+    Create returns DefaultSpecific;
     ---Purpose : Creates a DefaultSpecific and puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
diff --git a/src/IGESData/IGESData_DirChecker.cdl b/src/IGESData/IGESData_DirChecker.cdl
index 1767595cfb..31ad1c30e5 100644
--- a/src/IGESData/IGESData_DirChecker.cdl
+++ b/src/IGESData/IGESData_DirChecker.cdl
@@ -134,7 +134,7 @@ is
     --           This allows to do a check on an Entity not yet completely
     --           filled but of which Type and Form Number have been already set
 
-    Correct (me; ent : mutable IGESEntity) returns Boolean  is static;
+    Correct (me; ent : IGESEntity) returns Boolean  is static;
     ---Purpose : Corrects the Directory Entry of an IGES Entity as far as it is
     --           possible according recorded criteria without any ambiguity :
     --           - if a numeric Status is required a given value, this value is
diff --git a/src/IGESData/IGESData_FileProtocol.cdl b/src/IGESData/IGESData_FileProtocol.cdl
index a6180e677f..203cc562da 100644
--- a/src/IGESData/IGESData_FileProtocol.cdl
+++ b/src/IGESData/IGESData_FileProtocol.cdl
@@ -26,7 +26,7 @@ uses Protocol from Interface
 
 is
 
-    Create returns mutable FileProtocol;
+    Create returns FileProtocol;
     ---Purpose : Returns an empty FileProtocol
 
     Add (me : mutable; protocol : Protocol from IGESData);
diff --git a/src/IGESData/IGESData_FreeFormatEntity.cdl b/src/IGESData/IGESData_FreeFormatEntity.cdl
index 5d3efd7941..97af7abdc6 100644
--- a/src/IGESData/IGESData_FreeFormatEntity.cdl
+++ b/src/IGESData/IGESData_FreeFormatEntity.cdl
@@ -35,7 +35,7 @@ raises OutOfRange, InterfaceError
 
 is
 
-    Create returns mutable FreeFormatEntity;
+    Create returns FreeFormatEntity;
     ---Purpose : Creates a completely empty FreeFormatEntity
 
     SetTypeNumber (me : mutable; typenum : Integer);
@@ -56,7 +56,7 @@ is
     ---Purpose : Gives count of recorded parameters
 
     ParamData (me; num : Integer; ptype : out ParamType;
-    	    	   ent : out mutable IGESEntity;
+    	    	   ent : out IGESEntity;
                    val : out HAsciiString from TCollection)
     	     	       returns Boolean;
     ---Purpose : Returns data of a Parameter : its type, and the entity if it
@@ -71,7 +71,7 @@ is
     ---Purpose : Returns True if a Parameter is recorded as an entity
     --           Error if num is not between 1 and NbParams
 
-    ParamEntity (me; num : Integer) returns mutable IGESEntity
+    ParamEntity (me; num : Integer) returns IGESEntity
         raises InterfaceError, OutOfRange;
     ---Purpose : Returns Entity corresponding to a Param, given its rank
     --           Error if out of range or if Param num does not designate
@@ -100,7 +100,7 @@ is
     ---Purpose : Adds a literal Parameter to the list (builds an HAsciiString)
 
     AddEntity (me : mutable; ptype : ParamType;
-    	       ent : mutable IGESEntity; negative : Boolean = Standard_False);
+    	       ent : IGESEntity; negative : Boolean = Standard_False);
     ---Purpose : Adds a Parameter which references an Entity. If the Entity is
     --           Null, the added parameter will define a "Null Pointer" (0)
     --           If <negative> is given True, this will command Sending to File
diff --git a/src/IGESData/IGESData_GeneralModule.cdl b/src/IGESData/IGESData_GeneralModule.cdl
index 48ac4319de..d9af5c8afd 100644
--- a/src/IGESData/IGESData_GeneralModule.cdl
+++ b/src/IGESData/IGESData_GeneralModule.cdl
@@ -75,12 +75,12 @@ is
     ---Purpose : Specific answer to the question "is Copy properly implemented"
     --           For IGES, answer is always True
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean  is deferred;
     ---Purpose : Specific creation of a new void entity
 
     CopyCase (me; CN : Integer;
-    	      entfrom : Transient; entto : mutable Transient;
+    	      entfrom : Transient; entto : Transient;
     	      TC : in out CopyTool);
     ---Purpose : Copy ("Deep") from <entfrom> to <entto> (same type)
     --           by using a CopyTool which provides its working Map.
@@ -88,33 +88,33 @@ is
     --           Properties) and call OwnCopyCase
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool)  is deferred;
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
     RenewImpliedCase (me; CN : Integer;
-    	         entfrom : Transient; entto : mutable Transient;
+    	         entfrom : Transient; entto : Transient;
     	         TC : CopyTool)  is redefined;
     ---Purpose : Renewing of Implied References.
     --           For IGESEntities, Copies general data(List of Associativities)
     --           and calls OwnRenewCase
 
     OwnRenewCase     (me; CN : Integer;
-    	              entfrom : IGESEntity; entto : mutable IGESEntity;
+    	              entfrom : IGESEntity; entto : IGESEntity;
     	              TC : CopyTool)  is virtual;
     ---Purpose : Renews parameters which are specific of each Type of Entity :
     --           the provided default does nothing, but this method may be
     --           redefined as required
 
     WhenDeleteCase (me; CN : Integer;
-    	    	ent : mutable Transient; dispatched : Boolean)  is redefined;
+    	    	ent : Transient; dispatched : Boolean)  is redefined;
     ---Purpose : Prepares an IGES Entity for delete : works on directory part
     --           then calls OwnDeleteCase
     --           While dispatch requires to copy the entities, <dispatched> is
     --           ignored, entities are cleared in any case
 
     OwnDeleteCase (me; CN : Integer;
-    	    	ent : mutable IGESEntity)  is virtual;
+    	    	ent : IGESEntity)  is virtual;
     ---Purpose : Specific preparation for delete, acts on own parameters
     --           Default does nothing, to be redefined as required
 
diff --git a/src/IGESData/IGESData_GlobalSection.cdl b/src/IGESData/IGESData_GlobalSection.cdl
index b201d11594..ccd599d06d 100644
--- a/src/IGESData/IGESData_GlobalSection.cdl
+++ b/src/IGESData/IGESData_GlobalSection.cdl
@@ -145,7 +145,7 @@ is
 
     NewDateString (myclass; year,month,day,hour,minut,second : Integer;
     	    	   mode : Integer = -1)
-    	returns mutable HAsciiString from TCollection;
+    	returns HAsciiString from TCollection;
     ---Purpose : Returns a string built from year,
     --           month, day, hour, minute and second values. The form of the
     --           resulting string is defined as follows:
@@ -161,7 +161,7 @@ is
 
     NewDateString (myclass; date : HAsciiString from TCollection;
     	    	   mode : Integer = 1)
-    	returns mutable HAsciiString from TCollection;
+    	returns HAsciiString from TCollection;
     ---Purpose : Converts the string given in the
     --           form YYMMDD.HHNNSS or YYYYMMDD.HHNNSS to either
     --           YYMMDD.HHNNSS, YYYYMMDD.HHNNSS or YYYY-MM-DD:HH-NN-SS.
diff --git a/src/IGESData/IGESData_IGESEntity.cdl b/src/IGESData/IGESData_IGESEntity.cdl
index 32594c6c3f..fef5e3e22a 100644
--- a/src/IGESData/IGESData_IGESEntity.cdl
+++ b/src/IGESData/IGESData_IGESEntity.cdl
@@ -273,7 +273,7 @@ is
     ---Purpose : gives how many Associativities have a given type
 
     TypedAssociativity (me; atype : Type)
-    	returns mutable IGESEntity    raises InterfaceError;
+    	returns IGESEntity    raises InterfaceError;
     ---Purpose : returns the Associativity of a given Type (if only one exists)
     --           Error if none or more than one
 
@@ -290,10 +290,10 @@ is
     ClearAssociativities (me : mutable) is private;
     ---Purpose : Removes all associativities in once
 
-    Associate (me ; ent : mutable IGESEntity);
+    Associate (me ; ent : IGESEntity);
     ---Purpose : Sets "me" in the Associativity list of another Entity
 
-    Dissociate (me ; ent : mutable IGESEntity);
+    Dissociate (me ; ent : IGESEntity);
     ---Purpose : Resets "me" from the Associativity list of another Entity
 
 
@@ -312,7 +312,7 @@ is
     ---Purpose : gives how many Properties have a given type
 
     TypedProperty (me; atype : Type; anum : Integer = 0)
-    	returns mutable IGESEntity    raises InterfaceError;
+    	returns IGESEntity    raises InterfaceError;
     ---Purpose : returns the Property of a given Type 
     --           Error if none or more than one
 
diff --git a/src/IGESData/IGESData_IGESModel.cdl b/src/IGESData/IGESData_IGESModel.cdl
index 0a4b8d72b3..9c92723ce5 100644
--- a/src/IGESData/IGESData_IGESModel.cdl
+++ b/src/IGESData/IGESData_IGESModel.cdl
@@ -40,7 +40,7 @@ raises InterfaceError
 
 is
 
-    Create returns mutable IGESModel;
+    Create returns IGESModel;
 
     ClearHeader (me : mutable);
     	---Purpose : Erases all data specific to IGES file Header (Start + Global)
@@ -65,7 +65,7 @@ is
     ClearStartSection (me : mutable)  is static;
     	---Purpose : Clears the IGES file Start Section
 
-    SetStartSection (me : mutable; list : mutable HSequenceOfHAsciiString;
+    SetStartSection (me : mutable; list : HSequenceOfHAsciiString;
     	    	     copy : Boolean = Standard_True)  is static;
     	---Purpose : Sets a new Start section from a list of strings.
     	-- If copy is false, the Start section will be shared. Any
@@ -110,7 +110,7 @@ is
     GetFromAnother (me : mutable; other : InterfaceModel);
     	---Purpose : gets Header (GlobalSection) from another Model
 
-    NewEmptyModel (me) returns mutable InterfaceModel;
+    NewEmptyModel (me) returns InterfaceModel;
     	---Purpose : Returns a New Empty Model, same type as <me> i.e. IGESModel
 
     VerifyCheck (me; ach : in out Check)  is redefined;
diff --git a/src/IGESData/IGESData_IGESReaderData.cdl b/src/IGESData/IGESData_IGESReaderData.cdl
index eff9b656cc..1413220049 100644
--- a/src/IGESData/IGESData_IGESReaderData.cdl
+++ b/src/IGESData/IGESData_IGESReaderData.cdl
@@ -29,7 +29,7 @@ uses Integer, Boolean, CString,  HAsciiString, HSequenceOfHAsciiString,
 
 is
 
-    Create (nbe,nbp : Integer) returns mutable IGESReaderData;
+    Create (nbe,nbp : Integer) returns IGESReaderData;
     ---Purpose : creates IGESReaderData correctly dimensionned (for arrays)
     --           <nbe> count of entities, that is, half nb of directory lines
     --           <nbp> : count of parameters
diff --git a/src/IGESData/IGESData_IGESReaderTool.cdl b/src/IGESData/IGESData_IGESReaderTool.cdl
index fa561c3b45..b057e1870e 100644
--- a/src/IGESData/IGESData_IGESReaderTool.cdl
+++ b/src/IGESData/IGESData_IGESReaderTool.cdl
@@ -26,7 +26,7 @@ uses Integer, Boolean,  Transient,
 
 is
 
-    Create (reader : mutable IGESReaderData; protocol : Protocol from IGESData)
+    Create (reader : IGESReaderData; protocol : Protocol from IGESData)
     	returns IGESReaderTool;
     ---Purpose : creates IGESReaderTool to work with an IGESReaderData and an
     --           IGES Protocol.
@@ -34,47 +34,47 @@ is
 
     	-- --   General   -- --
 
-    Prepare (me : in out; reco : mutable FileRecognizer);
+    Prepare (me : in out; reco : FileRecognizer);
     ---Purpose : binds empty entities to records, works with the Protocol
     --           (from IGESData) stored and later used
     --           RQ : Actually, sets DNum into IGES Entities
     --           Also loads the list of parameters for ParamReader
 
     Recognize (me : in out; num : Integer;
-    	       ach : in out Check; ent : out mutable Transient)
+    	       ach : in out Check; ent : out Transient)
     	returns Boolean;
     ---Purpose : recognizes records by asking Protocol (on data of DirType)
 
     	--    Loading the IGESModel    --
 
-    BeginRead (me : in out; amodel : mutable InterfaceModel);
+    BeginRead (me : in out; amodel : InterfaceModel);
     ---Purpose : fills model's header, that is, its GlobalSection
 
     AnalyseRecord (me : in out;
-    	num : Integer; anent : mutable Transient; acheck : in out Check)
+    	num : Integer; anent : Transient; acheck : in out Check)
 	    returns Boolean;
     ---Purpose : fills an entity, given record no; works by calling ReadDirPart
     --           then ReadParams (with help of a ParamReader), then if required
     --           ReadProps and ReadAssocs, from IGESEntity
     --           Returns True if no fail has been recorded
 
-    EndRead (me : in out; amodel : mutable InterfaceModel) is redefined;
+    EndRead (me : in out; amodel : InterfaceModel) is redefined;
     ---Purpose : after reading entities, true line weights can be computed
 
     	--    For each IGESEntity    --
 
-    ReadDir       (me; ent : mutable IGESEntity; IR : IGESReaderData;
+    ReadDir       (me; ent : IGESEntity; IR : IGESReaderData;
     	           DP : DirPart; ach : in out Check);
     ---Purpose : Reads directory part componants from file; DP is the litteral
     --           directory part, IR detains entities referenced by DP
 
-    ReadOwnParams (me; ent : mutable IGESEntity;
+    ReadOwnParams (me; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader);
     ---Purpose : Performs Reading of own Parameters for each IGESEntity
     --           Works with the ReaderLib loaded with ReadWriteModules for IGES
     --           In case of failure, tries UndefinedEntity from IGES
 
-    ReadProps     (me; ent : mutable IGESEntity; IR : IGESReaderData;
+    ReadProps     (me; ent : IGESEntity; IR : IGESReaderData;
     	    	   PR : in out ParamReader);
     ---Purpose : Reads Property List, if there is (if not, does nothing)
     --           criterium is : current parameter of PR remains inside params
@@ -83,7 +83,7 @@ is
     --           gives the length of the list; else, a Fail is produced (into
     --           Check of PR) and reading process is stopped
 
-    ReadAssocs    (me; ent : mutable IGESEntity; IR : IGESReaderData;
+    ReadAssocs    (me; ent : IGESEntity; IR : IGESReaderData;
     	    	   PR : in out ParamReader);
     ---Purpose : Reads Associativity List, if there is (if not, does nothing)
     --           criterium is : current parameter of PR remains inside params
diff --git a/src/IGESData/IGESData_ParamReader.cdl b/src/IGESData/IGESData_ParamReader.cdl
index 808a170077..122198e9ce 100644
--- a/src/IGESData/IGESData_ParamReader.cdl
+++ b/src/IGESData/IGESData_ParamReader.cdl
@@ -112,7 +112,7 @@ is
     --           otherwise zero (according criterium IsParamEntity)
 
     ParamEntity (me : in out; IR : IGESReaderData; num : Integer)
-    	returns mutable IGESEntity
+    	returns IGESEntity
     ---Purpose : directly returns entity referenced by a parameter
     	raises InterfaceError;
     --           Error if <num> cannot be regarded as an Entity reference
@@ -269,12 +269,12 @@ is
     ReadEntity  (me : in out; IR : IGESReaderData;  
     	    	    	      PC : ParamCursor;  
     	    	    	      aStatus: in out Status from IGESData; 
-    	    	    	      val : out mutable IGESEntity;  
+    	    	    	      val : out IGESEntity;  
     	    	    	      canbenul : Boolean = Standard_False) 
     returns Boolean;
 
     ReadEntity  (me : in out; IR : IGESReaderData; PC : ParamCursor; mess : CString;
-    	val : out mutable IGESEntity; canbenul : Boolean = Standard_False)  returns Boolean;
+    	val : out IGESEntity; canbenul : Boolean = Standard_False)  returns Boolean;
     ---Purpose : Reads an IGES entity from parameter "num"
     --           An Entity is known by its reference, which has the form of an
     --           odd Integer Value (a number in the Directory)
@@ -290,14 +290,14 @@ is
     	    	    	      PC : ParamCursor;  
 	        	      aStatus: in out Status from IGESData; 
             	    	      type : Type from Standard; 
-    	    	    	      val : out mutable IGESEntity; 
+    	    	    	      val : out IGESEntity; 
     	    	    	      canbenul : Boolean = Standard_False)  returns Boolean;
 
     ReadEntity  (me : in out; IR : IGESReaderData;  
                               PC : ParamCursor; 
     	    	    	      mess : CString;
     	                      type : Type from Standard; 
-                              val : out mutable IGESEntity;
+                              val : out IGESEntity;
         canbenul : Boolean = Standard_False)  returns Boolean;
     ---Purpose : Works as ReadEntity without Type, but in addition checks the
     --           Type of the Entity, which must be "kind of" a given <type>
diff --git a/src/IGESData/IGESData_Protocol.cdl b/src/IGESData/IGESData_Protocol.cdl
index 40470713b2..108d8426be 100644
--- a/src/IGESData/IGESData_Protocol.cdl
+++ b/src/IGESData/IGESData_Protocol.cdl
@@ -24,7 +24,7 @@ uses OStream, Type, InterfaceModel, Check
 
 is
 
-    Create returns mutable Protocol from IGESData;
+    Create returns Protocol from IGESData;
 
     NbResources (me) returns Integer;
     ---Purpose : Gives the count of Resource Protocol. Here, none
@@ -38,13 +38,13 @@ is
 
     	-- --    General Services (defined at Norm level)    -- --
 
-    NewModel (me) returns mutable InterfaceModel;
+    NewModel (me) returns InterfaceModel;
     ---Purpose : Creates an empty Model for IGES Norm
 
     IsSuitableModel (me; model : InterfaceModel) returns Boolean;
     ---Purpose : Returns True if <model> is a Model of IGES Norm
 
-    UnknownEntity (me) returns mutable Transient;
+    UnknownEntity (me) returns Transient;
     ---Purpose : Creates a new Unknown Entity for IGES (UndefinedEntity)
 
     IsUnknownEntity (me; ent : Transient) returns Boolean;
diff --git a/src/IGESData/IGESData_ReadWriteModule.cdl b/src/IGESData/IGESData_ReadWriteModule.cdl
index 3ee209daf3..0f9e9b78fa 100644
--- a/src/IGESData/IGESData_ReadWriteModule.cdl
+++ b/src/IGESData/IGESData_ReadWriteModule.cdl
@@ -57,11 +57,11 @@ is
     --           Read, etc ...
 
     Read (me; CN : Integer; data : FileReaderData; num : Integer;
-    	ach : in out Check; ent : mutable Transient)
+    	ach : in out Check; ent : Transient)
     	raises DomainError;
     ---Purpose : General Read Function. See IGESReaderTool for more info
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is deferred;
     ---Purpose : Reads own parameters from file for an Entity; <PR> gives
diff --git a/src/IGESData/IGESData_SpecificModule.cdl b/src/IGESData/IGESData_SpecificModule.cdl
index c6bce8e1c0..6ce256a8e6 100644
--- a/src/IGESData/IGESData_SpecificModule.cdl
+++ b/src/IGESData/IGESData_SpecificModule.cdl
@@ -33,7 +33,7 @@ is
     --           See class IGESDumper for the rules to follow for <own> and
     --           <attached> level
 
-    OwnCorrect (me; CN : Integer; ent : mutable IGESEntity)
+    OwnCorrect (me; CN : Integer; ent : IGESEntity)
     	returns Boolean  is virtual;
     ---Purpose : Specific Automatic Correction on own Parameters of an Entity.
     --           It works by setting in accordance redundant data, if there are
diff --git a/src/IGESData/IGESData_ToolLocation.cdl b/src/IGESData/IGESData_ToolLocation.cdl
index 6360a4690a..ff09b95807 100644
--- a/src/IGESData/IGESData_ToolLocation.cdl
+++ b/src/IGESData/IGESData_ToolLocation.cdl
@@ -46,7 +46,7 @@ raises DomainError
 is
 
     Create (amodel : IGESModel; protocol : Protocol from IGESData)
-    	returns mutable ToolLocation;
+    	returns ToolLocation;
     ---Purpose : Creates a ToolLocation on a given Model, filled with the help
     --           of a Protocol (which allows to known Entities referenced by
     --           other ones)
diff --git a/src/IGESData/IGESData_UndefinedEntity.cdl b/src/IGESData/IGESData_UndefinedEntity.cdl
index d36029e640..e7cc6ee6a2 100644
--- a/src/IGESData/IGESData_UndefinedEntity.cdl
+++ b/src/IGESData/IGESData_UndefinedEntity.cdl
@@ -25,16 +25,16 @@ uses OStream, Check, UndefinedContent, CopyTool,
 
 is
 
-    Create returns mutable UndefinedEntity;
+    Create returns UndefinedEntity;
     ---Purpose : creates an unknown entity
 
-    UndefinedContent (me) returns mutable UndefinedContent;
+    UndefinedContent (me) returns UndefinedContent;
     ---Purpose : Returns own data as an UndefinedContent
 
-    ChangeableContent (me : mutable) returns mutable UndefinedContent;
+    ChangeableContent (me : mutable) returns UndefinedContent;
     ---Purpose : Returns own data as an UndefinedContent, in order to touch it
 
-    SetNewContent (me : mutable; cont : mutable UndefinedContent);
+    SetNewContent (me : mutable; cont : UndefinedContent);
     ---Purpose : Redefines a completely new UndefinedContent
     --           Used by a Copy which begins by ShallowCopy, for instance
 
diff --git a/src/IGESDefs/IGESDefs_AssociativityDef.cdl b/src/IGESDefs/IGESDefs_AssociativityDef.cdl
index 67ec1dafa7..7fb7f28f0b 100644
--- a/src/IGESDefs/IGESDefs_AssociativityDef.cdl
+++ b/src/IGESDefs/IGESDefs_AssociativityDef.cdl
@@ -31,7 +31,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable AssociativityDef;
+        Create returns AssociativityDef;
 
         -- Specific methods for the entity
 
diff --git a/src/IGESDefs/IGESDefs_AttributeDef.cdl b/src/IGESDefs/IGESDefs_AttributeDef.cdl
index 0135721a78..e56ec5a9fe 100644
--- a/src/IGESDefs/IGESDefs_AttributeDef.cdl
+++ b/src/IGESDefs/IGESDefs_AttributeDef.cdl
@@ -38,7 +38,7 @@ raises DimensionMismatch, OutOfRange, NullObject
 
 is
 
-        Create returns mutable AttributeDef;
+        Create returns AttributeDef;
 
         -- Specific methods for the entity
 
diff --git a/src/IGESDefs/IGESDefs_AttributeTable.cdl b/src/IGESDefs/IGESDefs_AttributeTable.cdl
index fde9decbdf..466e81ec1a 100644
--- a/src/IGESDefs/IGESDefs_AttributeTable.cdl
+++ b/src/IGESDefs/IGESDefs_AttributeTable.cdl
@@ -36,7 +36,7 @@ raises OutOfRange, NullObject
 
 is
 
-        Create returns mutable AttributeTable;
+        Create returns AttributeTable;
 
         -- Specific methods for the entity
 
diff --git a/src/IGESDefs/IGESDefs_GeneralModule.cdl b/src/IGESDefs/IGESDefs_GeneralModule.cdl
index d318ef4524..5dcfbe7a28 100644
--- a/src/IGESDefs/IGESDefs_GeneralModule.cdl
+++ b/src/IGESDefs/IGESDefs_GeneralModule.cdl
@@ -25,7 +25,7 @@ uses OStream,
 
 is
 
-    Create returns mutable GeneralModule from IGESDefs;
+    Create returns GeneralModule from IGESDefs;
     ---Purpose : Creates a GeneralModule from IGESDefs and puts it into GeneralLib
 
     OwnSharedCase  (me; CN : Integer; ent : IGESEntity;
@@ -43,12 +43,12 @@ is
     ---Purpose : Performs Specific Semantic Check for each type of Entity
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
diff --git a/src/IGESDefs/IGESDefs_GenericData.cdl b/src/IGESDefs/IGESDefs_GenericData.cdl
index 7dfc6db346..dc4b840ccf 100644
--- a/src/IGESDefs/IGESDefs_GenericData.cdl
+++ b/src/IGESDefs/IGESDefs_GenericData.cdl
@@ -38,7 +38,7 @@ raises DimensionMismatch, OutOfRange, NullObject
 
 is
 
-        Create returns mutable GenericData;
+        Create returns GenericData;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDefs/IGESDefs_MacroDef.cdl b/src/IGESDefs/IGESDefs_MacroDef.cdl
index 4e390238d4..277aca2414 100644
--- a/src/IGESDefs/IGESDefs_MacroDef.cdl
+++ b/src/IGESDefs/IGESDefs_MacroDef.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable MacroDef;
+        Create returns MacroDef;
 
         -- Specific methods for the entity
 
diff --git a/src/IGESDefs/IGESDefs_Protocol.cdl b/src/IGESDefs/IGESDefs_Protocol.cdl
index f397569b20..1721ba2142 100644
--- a/src/IGESDefs/IGESDefs_Protocol.cdl
+++ b/src/IGESDefs/IGESDefs_Protocol.cdl
@@ -22,7 +22,7 @@ uses Type, Protocol from Interface
 
 is
 
-    Create returns mutable Protocol from IGESDefs;
+    Create returns Protocol from IGESDefs;
 
     NbResources (me) returns Integer  is redefined;
     ---Purpose : Gives the count of Resource Protocol. Here, one
diff --git a/src/IGESDefs/IGESDefs_ReadWriteModule.cdl b/src/IGESDefs/IGESDefs_ReadWriteModule.cdl
index 2c4eb15468..4626496d42 100644
--- a/src/IGESDefs/IGESDefs_ReadWriteModule.cdl
+++ b/src/IGESDefs/IGESDefs_ReadWriteModule.cdl
@@ -27,13 +27,13 @@ raises DomainError
 
 is
 
-    Create returns mutable ReadWriteModule from IGESDefs;
+    Create returns ReadWriteModule from IGESDefs;
     ---Purpose : Creates a ReadWriteModule & puts it into ReaderLib & WriterLib
 
     CaseIGES (me; typenum, formnum : Integer) returns Integer;
     ---Purpose : Defines Case Numbers for Entities of IGESDefs
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError;
     ---Purpose : Reads own parameters from file for an Entity of IGESDefs
diff --git a/src/IGESDefs/IGESDefs_SpecificModule.cdl b/src/IGESDefs/IGESDefs_SpecificModule.cdl
index b12cdd7042..4c96ab4265 100644
--- a/src/IGESDefs/IGESDefs_SpecificModule.cdl
+++ b/src/IGESDefs/IGESDefs_SpecificModule.cdl
@@ -22,7 +22,7 @@ uses Messenger from Message, IGESEntity, IGESDumper
 
 is
 
-    Create returns mutable SpecificModule from IGESDefs;
+    Create returns SpecificModule from IGESDefs;
     ---Purpose : Creates a SpecificModule from IGESDefs & puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
diff --git a/src/IGESDefs/IGESDefs_TabularData.cdl b/src/IGESDefs/IGESDefs_TabularData.cdl
index b8520fa991..ec4948d7f0 100644
--- a/src/IGESDefs/IGESDefs_TabularData.cdl
+++ b/src/IGESDefs/IGESDefs_TabularData.cdl
@@ -31,7 +31,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable TabularData;
+        Create returns TabularData;
 
         -- Specific methods for the entity
 
diff --git a/src/IGESDefs/IGESDefs_ToolAssociativityDef.cdl b/src/IGESDefs/IGESDefs_ToolAssociativityDef.cdl
index f631c4981b..e5774d7ec2 100644
--- a/src/IGESDefs/IGESDefs_ToolAssociativityDef.cdl
+++ b/src/IGESDefs/IGESDefs_ToolAssociativityDef.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolAssociativityDef, ready to work
 
 
-    ReadOwnParams (me; ent : mutable AssociativityDef;
+    ReadOwnParams (me; ent : AssociativityDef;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : AssociativityDef; entto : mutable AssociativityDef;
+    OwnCopy    (me; entfrom : AssociativityDef; entto : AssociativityDef;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDefs/IGESDefs_ToolAttributeDef.cdl b/src/IGESDefs/IGESDefs_ToolAttributeDef.cdl
index c45f6a1c0a..15700eabe7 100644
--- a/src/IGESDefs/IGESDefs_ToolAttributeDef.cdl
+++ b/src/IGESDefs/IGESDefs_ToolAttributeDef.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolAttributeDef, ready to work
 
 
-    ReadOwnParams (me; ent : mutable AttributeDef;
+    ReadOwnParams (me; ent : AttributeDef;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : AttributeDef; entto : mutable AttributeDef;
+    OwnCopy    (me; entfrom : AttributeDef; entto : AttributeDef;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDefs/IGESDefs_ToolAttributeTable.cdl b/src/IGESDefs/IGESDefs_ToolAttributeTable.cdl
index 8acb322c1a..541373b3f3 100644
--- a/src/IGESDefs/IGESDefs_ToolAttributeTable.cdl
+++ b/src/IGESDefs/IGESDefs_ToolAttributeTable.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolAttributeTable, ready to work
 
 
-    ReadOwnParams (me; ent : mutable AttributeTable;
+    ReadOwnParams (me; ent : AttributeTable;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : AttributeTable; entto : mutable AttributeTable;
+    OwnCopy    (me; entfrom : AttributeTable; entto : AttributeTable;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDefs/IGESDefs_ToolGenericData.cdl b/src/IGESDefs/IGESDefs_ToolGenericData.cdl
index eea700c83d..6a50a402ae 100644
--- a/src/IGESDefs/IGESDefs_ToolGenericData.cdl
+++ b/src/IGESDefs/IGESDefs_ToolGenericData.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolGenericData, ready to work
 
 
-    ReadOwnParams (me; ent : mutable GenericData;
+    ReadOwnParams (me; ent : GenericData;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : GenericData; entto : mutable GenericData;
+    OwnCopy    (me; entfrom : GenericData; entto : GenericData;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDefs/IGESDefs_ToolMacroDef.cdl b/src/IGESDefs/IGESDefs_ToolMacroDef.cdl
index d1ad83602e..e8a727896b 100644
--- a/src/IGESDefs/IGESDefs_ToolMacroDef.cdl
+++ b/src/IGESDefs/IGESDefs_ToolMacroDef.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolMacroDef, ready to work
 
 
-    ReadOwnParams (me; ent : mutable MacroDef;
+    ReadOwnParams (me; ent : MacroDef;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : MacroDef; entto : mutable MacroDef;
+    OwnCopy    (me; entfrom : MacroDef; entto : MacroDef;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDefs/IGESDefs_ToolTabularData.cdl b/src/IGESDefs/IGESDefs_ToolTabularData.cdl
index ba8251474f..fd2fa8374c 100644
--- a/src/IGESDefs/IGESDefs_ToolTabularData.cdl
+++ b/src/IGESDefs/IGESDefs_ToolTabularData.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolTabularData, ready to work
 
 
-    ReadOwnParams (me; ent : mutable TabularData;
+    ReadOwnParams (me; ent : TabularData;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : TabularData; entto : mutable TabularData;
+    OwnCopy    (me; entfrom : TabularData; entto : TabularData;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDefs/IGESDefs_ToolUnitsData.cdl b/src/IGESDefs/IGESDefs_ToolUnitsData.cdl
index e5e06db6f8..5403358b6b 100644
--- a/src/IGESDefs/IGESDefs_ToolUnitsData.cdl
+++ b/src/IGESDefs/IGESDefs_ToolUnitsData.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolUnitsData, ready to work
 
 
-    ReadOwnParams (me; ent : mutable UnitsData;
+    ReadOwnParams (me; ent : UnitsData;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : UnitsData; entto : mutable UnitsData;
+    OwnCopy    (me; entfrom : UnitsData; entto : UnitsData;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDefs/IGESDefs_UnitsData.cdl b/src/IGESDefs/IGESDefs_UnitsData.cdl
index 308d2a134e..1245f1fecc 100644
--- a/src/IGESDefs/IGESDefs_UnitsData.cdl
+++ b/src/IGESDefs/IGESDefs_UnitsData.cdl
@@ -30,7 +30,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable UnitsData;
+        Create returns UnitsData;
 
         -- Specific methods for the entity
 
diff --git a/src/IGESDimen/IGESDimen_AngularDimension.cdl b/src/IGESDimen/IGESDimen_AngularDimension.cdl
index ccaf165516..c51bcb1ba9 100644
--- a/src/IGESDimen/IGESDimen_AngularDimension.cdl
+++ b/src/IGESDimen/IGESDimen_AngularDimension.cdl
@@ -32,7 +32,7 @@ uses
 
 is
 
-        Create returns mutable AngularDimension;
+        Create returns AngularDimension;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_BasicDimension.cdl b/src/IGESDimen/IGESDimen_BasicDimension.cdl
index ca2ee071a1..3b18a4c024 100644
--- a/src/IGESDimen/IGESDimen_BasicDimension.cdl
+++ b/src/IGESDimen/IGESDimen_BasicDimension.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable BasicDimension;
+        Create returns BasicDimension;
 
             -- --specific-- --
 
diff --git a/src/IGESDimen/IGESDimen_CenterLine.cdl b/src/IGESDimen/IGESDimen_CenterLine.cdl
index 0bdfeb402a..571809e3f3 100644
--- a/src/IGESDimen/IGESDimen_CenterLine.cdl
+++ b/src/IGESDimen/IGESDimen_CenterLine.cdl
@@ -33,7 +33,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable CenterLine;
+        Create returns CenterLine;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_CurveDimension.cdl b/src/IGESDimen/IGESDimen_CurveDimension.cdl
index eb47a299ea..00a504956d 100644
--- a/src/IGESDimen/IGESDimen_CurveDimension.cdl
+++ b/src/IGESDimen/IGESDimen_CurveDimension.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-        Create returns mutable CurveDimension;
+        Create returns CurveDimension;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_DiameterDimension.cdl b/src/IGESDimen/IGESDimen_DiameterDimension.cdl
index 903168ce86..e5e1bbe9af 100644
--- a/src/IGESDimen/IGESDimen_DiameterDimension.cdl
+++ b/src/IGESDimen/IGESDimen_DiameterDimension.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-        Create returns mutable DiameterDimension;
+        Create returns DiameterDimension;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_DimensionDisplayData.cdl b/src/IGESDimen/IGESDimen_DimensionDisplayData.cdl
index 9f7304ac5d..add1aa4b16 100644
--- a/src/IGESDimen/IGESDimen_DimensionDisplayData.cdl
+++ b/src/IGESDimen/IGESDimen_DimensionDisplayData.cdl
@@ -32,7 +32,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable DimensionDisplayData;
+        Create returns DimensionDisplayData;
 
             -- --specific-- --
 
diff --git a/src/IGESDimen/IGESDimen_DimensionTolerance.cdl b/src/IGESDimen/IGESDimen_DimensionTolerance.cdl
index 8b58bdadd2..584836d02f 100644
--- a/src/IGESDimen/IGESDimen_DimensionTolerance.cdl
+++ b/src/IGESDimen/IGESDimen_DimensionTolerance.cdl
@@ -27,7 +27,7 @@ uses  Integer, Real, Boolean  -- no one specific type
 
 is
 
-        Create returns mutable DimensionTolerance;
+        Create returns DimensionTolerance;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_DimensionUnits.cdl b/src/IGESDimen/IGESDimen_DimensionUnits.cdl
index ee796e6fda..ddeeb6cec1 100644
--- a/src/IGESDimen/IGESDimen_DimensionUnits.cdl
+++ b/src/IGESDimen/IGESDimen_DimensionUnits.cdl
@@ -27,7 +27,7 @@ uses
 
 is
 
-        Create returns mutable DimensionUnits;
+        Create returns DimensionUnits;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_DimensionedGeometry.cdl b/src/IGESDimen/IGESDimen_DimensionedGeometry.cdl
index 2681d4c42f..27185accd1 100644
--- a/src/IGESDimen/IGESDimen_DimensionedGeometry.cdl
+++ b/src/IGESDimen/IGESDimen_DimensionedGeometry.cdl
@@ -30,7 +30,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable DimensionedGeometry;
+        Create returns DimensionedGeometry;
 
             -- --specific-- --
 
diff --git a/src/IGESDimen/IGESDimen_FlagNote.cdl b/src/IGESDimen/IGESDimen_FlagNote.cdl
index 0ebbd0bc81..bfd9456b89 100644
--- a/src/IGESDimen/IGESDimen_FlagNote.cdl
+++ b/src/IGESDimen/IGESDimen_FlagNote.cdl
@@ -32,7 +32,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable FlagNote;
+        Create returns FlagNote;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_GeneralLabel.cdl b/src/IGESDimen/IGESDimen_GeneralLabel.cdl
index 35a73cf449..2f578c28e2 100644
--- a/src/IGESDimen/IGESDimen_GeneralLabel.cdl
+++ b/src/IGESDimen/IGESDimen_GeneralLabel.cdl
@@ -30,7 +30,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable GeneralLabel;
+        Create returns GeneralLabel;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_GeneralModule.cdl b/src/IGESDimen/IGESDimen_GeneralModule.cdl
index dfff4ca3a8..bf62bee0b5 100644
--- a/src/IGESDimen/IGESDimen_GeneralModule.cdl
+++ b/src/IGESDimen/IGESDimen_GeneralModule.cdl
@@ -25,7 +25,7 @@ uses OStream,
 
 is
 
-    Create returns mutable GeneralModule from IGESDimen;
+    Create returns GeneralModule from IGESDimen;
     ---Purpose : Creates a GeneralModule from IGESDimen and puts it into GeneralLib
 
     OwnSharedCase  (me; CN : Integer; ent : IGESEntity;
@@ -43,12 +43,12 @@ is
     ---Purpose : Performs Specific Semantic Check for each type of Entity
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
diff --git a/src/IGESDimen/IGESDimen_GeneralNote.cdl b/src/IGESDimen/IGESDimen_GeneralNote.cdl
index d50f24dea1..db2011f069 100644
--- a/src/IGESDimen/IGESDimen_GeneralNote.cdl
+++ b/src/IGESDimen/IGESDimen_GeneralNote.cdl
@@ -36,7 +36,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable GeneralNote;
+        Create returns GeneralNote;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_GeneralSymbol.cdl b/src/IGESDimen/IGESDimen_GeneralSymbol.cdl
index 4da731888c..d373c94de4 100644
--- a/src/IGESDimen/IGESDimen_GeneralSymbol.cdl
+++ b/src/IGESDimen/IGESDimen_GeneralSymbol.cdl
@@ -33,7 +33,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable GeneralSymbol;
+        Create returns GeneralSymbol;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_LeaderArrow.cdl b/src/IGESDimen/IGESDimen_LeaderArrow.cdl
index 9b9558b362..11992d0212 100644
--- a/src/IGESDimen/IGESDimen_LeaderArrow.cdl
+++ b/src/IGESDimen/IGESDimen_LeaderArrow.cdl
@@ -34,7 +34,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable LeaderArrow;
+        Create returns LeaderArrow;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_LinearDimension.cdl b/src/IGESDimen/IGESDimen_LinearDimension.cdl
index 3fb6972187..fd5a249b46 100644
--- a/src/IGESDimen/IGESDimen_LinearDimension.cdl
+++ b/src/IGESDimen/IGESDimen_LinearDimension.cdl
@@ -30,7 +30,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable LinearDimension;
+        Create returns LinearDimension;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_NewDimensionedGeometry.cdl b/src/IGESDimen/IGESDimen_NewDimensionedGeometry.cdl
index ba43c4c1f2..ad12a52da0 100644
--- a/src/IGESDimen/IGESDimen_NewDimensionedGeometry.cdl
+++ b/src/IGESDimen/IGESDimen_NewDimensionedGeometry.cdl
@@ -36,7 +36,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable NewDimensionedGeometry;
+        Create returns NewDimensionedGeometry;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_NewGeneralNote.cdl b/src/IGESDimen/IGESDimen_NewGeneralNote.cdl
index 2d455448e0..7955edd345 100644
--- a/src/IGESDimen/IGESDimen_NewGeneralNote.cdl
+++ b/src/IGESDimen/IGESDimen_NewGeneralNote.cdl
@@ -35,7 +35,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable NewGeneralNote;
+        Create returns NewGeneralNote;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_OrdinateDimension.cdl b/src/IGESDimen/IGESDimen_OrdinateDimension.cdl
index 5bd0e2b276..33551663ec 100644
--- a/src/IGESDimen/IGESDimen_OrdinateDimension.cdl
+++ b/src/IGESDimen/IGESDimen_OrdinateDimension.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-        Create returns mutable OrdinateDimension;
+        Create returns OrdinateDimension;
 
             -- --specific-- --
 
diff --git a/src/IGESDimen/IGESDimen_PointDimension.cdl b/src/IGESDimen/IGESDimen_PointDimension.cdl
index 1df78eed15..7c6fe6df45 100644
--- a/src/IGESDimen/IGESDimen_PointDimension.cdl
+++ b/src/IGESDimen/IGESDimen_PointDimension.cdl
@@ -35,7 +35,7 @@ uses
 
 is
 
-        Create returns mutable PointDimension;
+        Create returns PointDimension;
 
             -- --specific-- --
         Init(me      : mutable;
diff --git a/src/IGESDimen/IGESDimen_Protocol.cdl b/src/IGESDimen/IGESDimen_Protocol.cdl
index 3a0265f490..67b5bd070d 100644
--- a/src/IGESDimen/IGESDimen_Protocol.cdl
+++ b/src/IGESDimen/IGESDimen_Protocol.cdl
@@ -22,7 +22,7 @@ uses Type, Protocol from Interface
 
 is
 
-    Create returns mutable Protocol from IGESDimen;
+    Create returns Protocol from IGESDimen;
 
     NbResources (me) returns Integer  is redefined;
     ---Purpose : Gives the count of Resource Protocol. Here, two
diff --git a/src/IGESDimen/IGESDimen_RadiusDimension.cdl b/src/IGESDimen/IGESDimen_RadiusDimension.cdl
index 42b87f2d2f..86c901817d 100644
--- a/src/IGESDimen/IGESDimen_RadiusDimension.cdl
+++ b/src/IGESDimen/IGESDimen_RadiusDimension.cdl
@@ -34,7 +34,7 @@ uses
 
 is
 
-        Create returns mutable RadiusDimension;
+        Create returns RadiusDimension;
 
             -- --specific-- --
         Init(me           : mutable;
diff --git a/src/IGESDimen/IGESDimen_ReadWriteModule.cdl b/src/IGESDimen/IGESDimen_ReadWriteModule.cdl
index 571d6d6f37..bb8ec00136 100644
--- a/src/IGESDimen/IGESDimen_ReadWriteModule.cdl
+++ b/src/IGESDimen/IGESDimen_ReadWriteModule.cdl
@@ -27,13 +27,13 @@ raises DomainError
 
 is
 
-    Create returns mutable ReadWriteModule from IGESDimen;
+    Create returns ReadWriteModule from IGESDimen;
     ---Purpose : Creates a ReadWriteModule & puts it into ReaderLib & WriterLib
 
     CaseIGES (me; typenum, formnum : Integer) returns Integer;
     ---Purpose : Defines Case Numbers for Entities of IGESDimen
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError;
     ---Purpose : Reads own parameters from file for an Entity of IGESDimen
diff --git a/src/IGESDimen/IGESDimen_Section.cdl b/src/IGESDimen/IGESDimen_Section.cdl
index 12def52a9d..8ada7924d6 100644
--- a/src/IGESDimen/IGESDimen_Section.cdl
+++ b/src/IGESDimen/IGESDimen_Section.cdl
@@ -32,7 +32,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable Section;
+        Create returns Section;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDimen/IGESDimen_SectionedArea.cdl b/src/IGESDimen/IGESDimen_SectionedArea.cdl
index 26eee71af2..d12c3000de 100644
--- a/src/IGESDimen/IGESDimen_SectionedArea.cdl
+++ b/src/IGESDimen/IGESDimen_SectionedArea.cdl
@@ -40,7 +40,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable SectionedArea;
+        Create returns SectionedArea;
 
             -- --specific-- --
         Init(me          : mutable;
diff --git a/src/IGESDimen/IGESDimen_SpecificModule.cdl b/src/IGESDimen/IGESDimen_SpecificModule.cdl
index cfa77d3508..fe6b35c24c 100644
--- a/src/IGESDimen/IGESDimen_SpecificModule.cdl
+++ b/src/IGESDimen/IGESDimen_SpecificModule.cdl
@@ -23,14 +23,14 @@ uses Messenger from Message, IGESEntity, IGESDumper
 
 is
 
-    Create returns mutable SpecificModule from IGESDimen;
+    Create returns SpecificModule from IGESDimen;
     ---Purpose : Creates a SpecificModule from IGESDimen & puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
     	      dumper : IGESDumper;  S : Messenger from Message; own : Integer);
     ---Purpose : Specific Dump (own parameters) for IGESDimen
 
-    OwnCorrect (me; CN : Integer; ent : mutable IGESEntity)
+    OwnCorrect (me; CN : Integer; ent : IGESEntity)
     	returns Boolean  is redefined;
     ---Purpose : Performs non-ambiguous Corrections on Entities which support
     --           them (BasicDimension,CenterLine,DimensionDisplayData,
diff --git a/src/IGESDimen/IGESDimen_ToolAngularDimension.cdl b/src/IGESDimen/IGESDimen_ToolAngularDimension.cdl
index c3f56dee1a..b2143841d6 100644
--- a/src/IGESDimen/IGESDimen_ToolAngularDimension.cdl
+++ b/src/IGESDimen/IGESDimen_ToolAngularDimension.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolAngularDimension, ready to work
 
 
-    ReadOwnParams (me; ent : mutable AngularDimension;
+    ReadOwnParams (me; ent : AngularDimension;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : AngularDimension; entto : mutable AngularDimension;
+    OwnCopy    (me; entfrom : AngularDimension; entto : AngularDimension;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolBasicDimension.cdl b/src/IGESDimen/IGESDimen_ToolBasicDimension.cdl
index f6edd59bf0..be5595728e 100644
--- a/src/IGESDimen/IGESDimen_ToolBasicDimension.cdl
+++ b/src/IGESDimen/IGESDimen_ToolBasicDimension.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolBasicDimension, ready to work
 
 
-    ReadOwnParams (me; ent : mutable BasicDimension;
+    ReadOwnParams (me; ent : BasicDimension;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a BasicDimension <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable BasicDimension) returns Boolean  is static;
+    OwnCorrect (me; ent : BasicDimension) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a BasicDimension
     --           (NbPropertyValues forced to 8)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : BasicDimension; entto : mutable BasicDimension;
+    OwnCopy    (me; entfrom : BasicDimension; entto : BasicDimension;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolCenterLine.cdl b/src/IGESDimen/IGESDimen_ToolCenterLine.cdl
index 3b6e9f8c54..422f6a551f 100644
--- a/src/IGESDimen/IGESDimen_ToolCenterLine.cdl
+++ b/src/IGESDimen/IGESDimen_ToolCenterLine.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCenterLine, ready to work
 
 
-    ReadOwnParams (me; ent : mutable CenterLine;
+    ReadOwnParams (me; ent : CenterLine;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a CenterLine <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable CenterLine) returns Boolean  is static;
+    OwnCorrect (me; ent : CenterLine) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a CenterLine
     --           (LineFont forced to Rank = 1, DataType forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : CenterLine; entto : mutable CenterLine;
+    OwnCopy    (me; entfrom : CenterLine; entto : CenterLine;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolCurveDimension.cdl b/src/IGESDimen/IGESDimen_ToolCurveDimension.cdl
index 17b009c37c..973251cce6 100644
--- a/src/IGESDimen/IGESDimen_ToolCurveDimension.cdl
+++ b/src/IGESDimen/IGESDimen_ToolCurveDimension.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCurveDimension, ready to work
 
 
-    ReadOwnParams (me; ent : mutable CurveDimension;
+    ReadOwnParams (me; ent : CurveDimension;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : CurveDimension; entto : mutable CurveDimension;
+    OwnCopy    (me; entfrom : CurveDimension; entto : CurveDimension;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolDiameterDimension.cdl b/src/IGESDimen/IGESDimen_ToolDiameterDimension.cdl
index 4363c650a5..4f05148622 100644
--- a/src/IGESDimen/IGESDimen_ToolDiameterDimension.cdl
+++ b/src/IGESDimen/IGESDimen_ToolDiameterDimension.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDiameterDimension, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DiameterDimension;
+    ReadOwnParams (me; ent : DiameterDimension;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DiameterDimension; entto : mutable DiameterDimension;
+    OwnCopy    (me; entfrom : DiameterDimension; entto : DiameterDimension;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cdl b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cdl
index 70c51c9d52..278019f264 100644
--- a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cdl
+++ b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDimensionDisplayData, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DimensionDisplayData;
+    ReadOwnParams (me; ent : DimensionDisplayData;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a DimensionDisplayData <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable DimensionDisplayData) returns Boolean  is static;
+    OwnCorrect (me; ent : DimensionDisplayData) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a DimensionDisplayData
     --           (NbPropertyValues forced to 14)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DimensionDisplayData; entto : mutable DimensionDisplayData;
+    OwnCopy    (me; entfrom : DimensionDisplayData; entto : DimensionDisplayData;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cdl b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cdl
index 87d1cc5944..4c796facbb 100644
--- a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cdl
+++ b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDimensionTolerance, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DimensionTolerance;
+    ReadOwnParams (me; ent : DimensionTolerance;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a DimensionTolerance <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable DimensionTolerance) returns Boolean  is static;
+    OwnCorrect (me; ent : DimensionTolerance) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a DimensionTolerance
     --           (NbPropertyValues forced to 8)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DimensionTolerance; entto : mutable DimensionTolerance;
+    OwnCopy    (me; entfrom : DimensionTolerance; entto : DimensionTolerance;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolDimensionUnits.cdl b/src/IGESDimen/IGESDimen_ToolDimensionUnits.cdl
index 5ecd4ef50b..e84bcc543d 100644
--- a/src/IGESDimen/IGESDimen_ToolDimensionUnits.cdl
+++ b/src/IGESDimen/IGESDimen_ToolDimensionUnits.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDimensionUnits, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DimensionUnits;
+    ReadOwnParams (me; ent : DimensionUnits;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a DimensionUnits <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable DimensionUnits) returns Boolean  is static;
+    OwnCorrect (me; ent : DimensionUnits) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a DimensionUnits
     --           (NbPropertyValues forced to 6)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DimensionUnits; entto : mutable DimensionUnits;
+    OwnCopy    (me; entfrom : DimensionUnits; entto : DimensionUnits;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cdl b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cdl
index 681e8fc9bf..bfa789cf0f 100644
--- a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cdl
+++ b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDimensionedGeometry, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DimensionedGeometry;
+    ReadOwnParams (me; ent : DimensionedGeometry;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a DimensionedGeometry <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable DimensionedGeometry) returns Boolean  is static;
+    OwnCorrect (me; ent : DimensionedGeometry) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a DimensionedGeometry
     --           (NbDimensions forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DimensionedGeometry; entto : mutable DimensionedGeometry;
+    OwnCopy    (me; entfrom : DimensionedGeometry; entto : DimensionedGeometry;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolFlagNote.cdl b/src/IGESDimen/IGESDimen_ToolFlagNote.cdl
index 419d4b7d8b..34436a69f1 100644
--- a/src/IGESDimen/IGESDimen_ToolFlagNote.cdl
+++ b/src/IGESDimen/IGESDimen_ToolFlagNote.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolFlagNote, ready to work
 
 
-    ReadOwnParams (me; ent : mutable FlagNote;
+    ReadOwnParams (me; ent : FlagNote;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : FlagNote; entto : mutable FlagNote;
+    OwnCopy    (me; entfrom : FlagNote; entto : FlagNote;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolGeneralLabel.cdl b/src/IGESDimen/IGESDimen_ToolGeneralLabel.cdl
index d17a406f5d..4f877c3677 100644
--- a/src/IGESDimen/IGESDimen_ToolGeneralLabel.cdl
+++ b/src/IGESDimen/IGESDimen_ToolGeneralLabel.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolGeneralLabel, ready to work
 
 
-    ReadOwnParams (me; ent : mutable GeneralLabel;
+    ReadOwnParams (me; ent : GeneralLabel;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : GeneralLabel; entto : mutable GeneralLabel;
+    OwnCopy    (me; entfrom : GeneralLabel; entto : GeneralLabel;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolGeneralNote.cdl b/src/IGESDimen/IGESDimen_ToolGeneralNote.cdl
index 32240e69fc..6c54cf419f 100644
--- a/src/IGESDimen/IGESDimen_ToolGeneralNote.cdl
+++ b/src/IGESDimen/IGESDimen_ToolGeneralNote.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolGeneralNote, ready to work
 
 
-    ReadOwnParams (me; ent : mutable GeneralNote;
+    ReadOwnParams (me; ent : GeneralNote;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : GeneralNote; entto : mutable GeneralNote;
+    OwnCopy    (me; entfrom : GeneralNote; entto : GeneralNote;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cdl b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cdl
index b65c0915c7..84fff3ad11 100644
--- a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cdl
+++ b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolGeneralSymbol, ready to work
 
 
-    ReadOwnParams (me; ent : mutable GeneralSymbol;
+    ReadOwnParams (me; ent : GeneralSymbol;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : GeneralSymbol; entto : mutable GeneralSymbol;
+    OwnCopy    (me; entfrom : GeneralSymbol; entto : GeneralSymbol;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolLeaderArrow.cdl b/src/IGESDimen/IGESDimen_ToolLeaderArrow.cdl
index 6b036477f0..34ca1e8f54 100644
--- a/src/IGESDimen/IGESDimen_ToolLeaderArrow.cdl
+++ b/src/IGESDimen/IGESDimen_ToolLeaderArrow.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLeaderArrow, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LeaderArrow;
+    ReadOwnParams (me; ent : LeaderArrow;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LeaderArrow; entto : mutable LeaderArrow;
+    OwnCopy    (me; entfrom : LeaderArrow; entto : LeaderArrow;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolLinearDimension.cdl b/src/IGESDimen/IGESDimen_ToolLinearDimension.cdl
index dfc2152978..850caebaf9 100644
--- a/src/IGESDimen/IGESDimen_ToolLinearDimension.cdl
+++ b/src/IGESDimen/IGESDimen_ToolLinearDimension.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLinearDimension, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LinearDimension;
+    ReadOwnParams (me; ent : LinearDimension;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LinearDimension; entto : mutable LinearDimension;
+    OwnCopy    (me; entfrom : LinearDimension; entto : LinearDimension;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cdl b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cdl
index 25b20c43b6..2cf7960cbb 100644
--- a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cdl
+++ b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNewDimensionedGeometry, ready to work
 
 
-    ReadOwnParams (me; ent : mutable NewDimensionedGeometry;
+    ReadOwnParams (me; ent : NewDimensionedGeometry;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a NewDimensionedGeometry <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable NewDimensionedGeometry) returns Boolean  is static;
+    OwnCorrect (me; ent : NewDimensionedGeometry) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a NewDimensionedGeometry
     --           (NbDimensions forced to 1, Transf Nullified in D.E.)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : NewDimensionedGeometry; entto : mutable NewDimensionedGeometry;
+    OwnCopy    (me; entfrom : NewDimensionedGeometry; entto : NewDimensionedGeometry;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cdl b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cdl
index bb8c1bd280..35f0d381e9 100644
--- a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cdl
+++ b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNewGeneralNote, ready to work
 
 
-    ReadOwnParams (me; ent : mutable NewGeneralNote;
+    ReadOwnParams (me; ent : NewGeneralNote;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : NewGeneralNote; entto : mutable NewGeneralNote;
+    OwnCopy    (me; entfrom : NewGeneralNote; entto : NewGeneralNote;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolOrdinateDimension.cdl b/src/IGESDimen/IGESDimen_ToolOrdinateDimension.cdl
index 3722784622..1c1c9a3456 100644
--- a/src/IGESDimen/IGESDimen_ToolOrdinateDimension.cdl
+++ b/src/IGESDimen/IGESDimen_ToolOrdinateDimension.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolOrdinateDimension, ready to work
 
 
-    ReadOwnParams (me; ent : mutable OrdinateDimension;
+    ReadOwnParams (me; ent : OrdinateDimension;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : OrdinateDimension; entto : mutable OrdinateDimension;
+    OwnCopy    (me; entfrom : OrdinateDimension; entto : OrdinateDimension;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolPointDimension.cdl b/src/IGESDimen/IGESDimen_ToolPointDimension.cdl
index a0660307bf..8ed9e16626 100644
--- a/src/IGESDimen/IGESDimen_ToolPointDimension.cdl
+++ b/src/IGESDimen/IGESDimen_ToolPointDimension.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPointDimension, ready to work
 
 
-    ReadOwnParams (me; ent : mutable PointDimension;
+    ReadOwnParams (me; ent : PointDimension;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : PointDimension; entto : mutable PointDimension;
+    OwnCopy    (me; entfrom : PointDimension; entto : PointDimension;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolRadiusDimension.cdl b/src/IGESDimen/IGESDimen_ToolRadiusDimension.cdl
index 6800f30f64..3119e03909 100644
--- a/src/IGESDimen/IGESDimen_ToolRadiusDimension.cdl
+++ b/src/IGESDimen/IGESDimen_ToolRadiusDimension.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolRadiusDimension, ready to work
 
 
-    ReadOwnParams (me; ent : mutable RadiusDimension;
+    ReadOwnParams (me; ent : RadiusDimension;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : RadiusDimension; entto : mutable RadiusDimension;
+    OwnCopy    (me; entfrom : RadiusDimension; entto : RadiusDimension;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolSection.cdl b/src/IGESDimen/IGESDimen_ToolSection.cdl
index ce49ce1427..ce5f64218e 100644
--- a/src/IGESDimen/IGESDimen_ToolSection.cdl
+++ b/src/IGESDimen/IGESDimen_ToolSection.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSection, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Section;
+    ReadOwnParams (me; ent : Section;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Section <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Section) returns Boolean  is static;
+    OwnCorrect (me; ent : Section) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Section
     --           (LineFont forced to Rank = 1, DataType forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Section; entto : mutable Section;
+    OwnCopy    (me; entfrom : Section; entto : Section;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolSectionedArea.cdl b/src/IGESDimen/IGESDimen_ToolSectionedArea.cdl
index 83495134f4..a3a2acec7b 100644
--- a/src/IGESDimen/IGESDimen_ToolSectionedArea.cdl
+++ b/src/IGESDimen/IGESDimen_ToolSectionedArea.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSectionedArea, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SectionedArea;
+    ReadOwnParams (me; ent : SectionedArea;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SectionedArea; entto : mutable SectionedArea;
+    OwnCopy    (me; entfrom : SectionedArea; entto : SectionedArea;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_ToolWitnessLine.cdl b/src/IGESDimen/IGESDimen_ToolWitnessLine.cdl
index 8f634bbe09..57cbdba689 100644
--- a/src/IGESDimen/IGESDimen_ToolWitnessLine.cdl
+++ b/src/IGESDimen/IGESDimen_ToolWitnessLine.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolWitnessLine, ready to work
 
 
-    ReadOwnParams (me; ent : mutable WitnessLine;
+    ReadOwnParams (me; ent : WitnessLine;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a WitnessLine <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable WitnessLine) returns Boolean  is static;
+    OwnCorrect (me; ent : WitnessLine) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a WitnessLine
     --           (LineFont forced to Rank = 1, DataType forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : WitnessLine; entto : mutable WitnessLine;
+    OwnCopy    (me; entfrom : WitnessLine; entto : WitnessLine;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDimen/IGESDimen_WitnessLine.cdl b/src/IGESDimen/IGESDimen_WitnessLine.cdl
index 6bbdaec4b7..028acf94a2 100644
--- a/src/IGESDimen/IGESDimen_WitnessLine.cdl
+++ b/src/IGESDimen/IGESDimen_WitnessLine.cdl
@@ -33,7 +33,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable WitnessLine;
+        Create returns WitnessLine;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_CircArraySubfigure.cdl b/src/IGESDraw/IGESDraw_CircArraySubfigure.cdl
index d76f3cad92..9388cbaa1e 100644
--- a/src/IGESDraw/IGESDraw_CircArraySubfigure.cdl
+++ b/src/IGESDraw/IGESDraw_CircArraySubfigure.cdl
@@ -35,7 +35,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable CircArraySubfigure;
+        Create returns CircArraySubfigure;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_ConnectPoint.cdl b/src/IGESDraw/IGESDraw_ConnectPoint.cdl
index 66b16a3105..ab2dbefe43 100644
--- a/src/IGESDraw/IGESDraw_ConnectPoint.cdl
+++ b/src/IGESDraw/IGESDraw_ConnectPoint.cdl
@@ -33,7 +33,7 @@ uses
 
 is
 
-        Create returns mutable ConnectPoint;
+        Create returns ConnectPoint;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_Drawing.cdl b/src/IGESDraw/IGESDraw_Drawing.cdl
index 321348d667..ae362b28e9 100644
--- a/src/IGESDraw/IGESDraw_Drawing.cdl
+++ b/src/IGESDraw/IGESDraw_Drawing.cdl
@@ -37,7 +37,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable Drawing;
+        Create returns Drawing;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_DrawingWithRotation.cdl b/src/IGESDraw/IGESDraw_DrawingWithRotation.cdl
index 891faf0d5e..38eef9f182 100644
--- a/src/IGESDraw/IGESDraw_DrawingWithRotation.cdl
+++ b/src/IGESDraw/IGESDraw_DrawingWithRotation.cdl
@@ -37,7 +37,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable DrawingWithRotation;
+        Create returns DrawingWithRotation;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_GeneralModule.cdl b/src/IGESDraw/IGESDraw_GeneralModule.cdl
index 48d281af82..d59c9477b5 100644
--- a/src/IGESDraw/IGESDraw_GeneralModule.cdl
+++ b/src/IGESDraw/IGESDraw_GeneralModule.cdl
@@ -25,7 +25,7 @@ uses OStream,
 
 is
 
-    Create returns mutable GeneralModule from IGESDraw;
+    Create returns GeneralModule from IGESDraw;
     ---Purpose : Creates a GeneralModule from IGESDraw and puts it into GeneralLib
 
     OwnSharedCase  (me; CN : Integer; ent : IGESEntity;
@@ -48,24 +48,24 @@ is
     ---Purpose : Performs Specific Semantic Check for each type of Entity
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
     OwnRenewCase     (me; CN : Integer;
-    	              entfrom : IGESEntity; entto : mutable IGESEntity;
+    	              entfrom : IGESEntity; entto : IGESEntity;
     	              TC : CopyTool)  is redefined;
     ---Purpose : Renews parameters which are specific of each Type of Entity :
     --           redefined for ViewsVisible ... (takes only the implied ref.s
     --           which have also been copied)
 
     OwnDeleteCase (me; CN : Integer;
-    	    	ent : mutable IGESEntity)  is redefined;
+    	    	ent : IGESEntity)  is redefined;
     ---Purpose : Clears parameters with can cause looping structures :
     --           redefined for ViewsVisible ... (clears the implied ref.s)
 
diff --git a/src/IGESDraw/IGESDraw_LabelDisplay.cdl b/src/IGESDraw/IGESDraw_LabelDisplay.cdl
index 3b887af850..1a81180571 100644
--- a/src/IGESDraw/IGESDraw_LabelDisplay.cdl
+++ b/src/IGESDraw/IGESDraw_LabelDisplay.cdl
@@ -38,7 +38,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable LabelDisplay;
+        Create returns LabelDisplay;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_NetworkSubfigure.cdl b/src/IGESDraw/IGESDraw_NetworkSubfigure.cdl
index 0edc81f4b7..4ff6da36fa 100644
--- a/src/IGESDraw/IGESDraw_NetworkSubfigure.cdl
+++ b/src/IGESDraw/IGESDraw_NetworkSubfigure.cdl
@@ -35,7 +35,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable NetworkSubfigure;
+        Create returns NetworkSubfigure;
 
         -- specific for the entity
 
diff --git a/src/IGESDraw/IGESDraw_NetworkSubfigureDef.cdl b/src/IGESDraw/IGESDraw_NetworkSubfigureDef.cdl
index 4cab454a44..58bfc44a75 100644
--- a/src/IGESDraw/IGESDraw_NetworkSubfigureDef.cdl
+++ b/src/IGESDraw/IGESDraw_NetworkSubfigureDef.cdl
@@ -42,7 +42,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable NetworkSubfigureDef;
+        Create returns NetworkSubfigureDef;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_PerspectiveView.cdl b/src/IGESDraw/IGESDraw_PerspectiveView.cdl
index 7cf546a5e9..d539faf9e4 100644
--- a/src/IGESDraw/IGESDraw_PerspectiveView.cdl
+++ b/src/IGESDraw/IGESDraw_PerspectiveView.cdl
@@ -44,7 +44,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable PerspectiveView;
+        Create returns PerspectiveView;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_Planar.cdl b/src/IGESDraw/IGESDraw_Planar.cdl
index fad642df24..040ba78edd 100644
--- a/src/IGESDraw/IGESDraw_Planar.cdl
+++ b/src/IGESDraw/IGESDraw_Planar.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable Planar;
+        Create returns Planar;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_Protocol.cdl b/src/IGESDraw/IGESDraw_Protocol.cdl
index 55a0e698f9..ee2688f4a5 100644
--- a/src/IGESDraw/IGESDraw_Protocol.cdl
+++ b/src/IGESDraw/IGESDraw_Protocol.cdl
@@ -22,7 +22,7 @@ uses Type, Protocol from Interface
 
 is
 
-    Create returns mutable Protocol from IGESDraw;
+    Create returns Protocol from IGESDraw;
 
     NbResources (me) returns Integer  is redefined;
     ---Purpose : Gives the count of Resource Protocol. Here, one
diff --git a/src/IGESDraw/IGESDraw_ReadWriteModule.cdl b/src/IGESDraw/IGESDraw_ReadWriteModule.cdl
index 5d8ddc15bd..d8bc6ebf45 100644
--- a/src/IGESDraw/IGESDraw_ReadWriteModule.cdl
+++ b/src/IGESDraw/IGESDraw_ReadWriteModule.cdl
@@ -27,13 +27,13 @@ raises DomainError
 
 is
 
-    Create returns mutable ReadWriteModule from IGESDraw;
+    Create returns ReadWriteModule from IGESDraw;
     ---Purpose : Creates a ReadWriteModule & puts it into ReaderLib & WriterLib
 
     CaseIGES (me; typenum, formnum : Integer) returns Integer;
     ---Purpose : Defines Case Numbers for Entities of IGESDraw
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError;
     ---Purpose : Reads own parameters from file for an Entity of IGESDraw
diff --git a/src/IGESDraw/IGESDraw_RectArraySubfigure.cdl b/src/IGESDraw/IGESDraw_RectArraySubfigure.cdl
index 50201f3898..b10a956061 100644
--- a/src/IGESDraw/IGESDraw_RectArraySubfigure.cdl
+++ b/src/IGESDraw/IGESDraw_RectArraySubfigure.cdl
@@ -33,7 +33,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable RectArraySubfigure;
+        Create returns RectArraySubfigure;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.cdl b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.cdl
index 8e2a24578d..648f49e151 100644
--- a/src/IGESDraw/IGESDraw_SegmentedViewsVisible.cdl
+++ b/src/IGESDraw/IGESDraw_SegmentedViewsVisible.cdl
@@ -36,7 +36,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable SegmentedViewsVisible;
+        Create returns SegmentedViewsVisible;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_SpecificModule.cdl b/src/IGESDraw/IGESDraw_SpecificModule.cdl
index 81068832d8..497e6581f6 100644
--- a/src/IGESDraw/IGESDraw_SpecificModule.cdl
+++ b/src/IGESDraw/IGESDraw_SpecificModule.cdl
@@ -23,14 +23,14 @@ uses Messenger from Message, IGESEntity, IGESDumper
 
 is
 
-    Create returns mutable SpecificModule from IGESDraw;
+    Create returns SpecificModule from IGESDraw;
     ---Purpose : Creates a SpecificModule from IGESDraw & puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
     	      dumper : IGESDumper;  S : Messenger from Message; own : Integer);
     ---Purpose : Specific Dump (own parameters) for IGESDraw
 
-    OwnCorrect (me; CN : Integer; ent : mutable IGESEntity)
+    OwnCorrect (me; CN : Integer; ent : IGESEntity)
     	returns Boolean  is redefined;
     ---Purpose : Performs non-ambiguous Corrections on Entities which support
     --           them (Planar)
diff --git a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cdl b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cdl
index ca120da73e..2b9dcd5746 100644
--- a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cdl
+++ b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCircArraySubfigure, ready to work
 
 
-    ReadOwnParams (me; ent : mutable CircArraySubfigure;
+    ReadOwnParams (me; ent : CircArraySubfigure;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : CircArraySubfigure; entto : mutable CircArraySubfigure;
+    OwnCopy    (me; entfrom : CircArraySubfigure; entto : CircArraySubfigure;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolConnectPoint.cdl b/src/IGESDraw/IGESDraw_ToolConnectPoint.cdl
index e253e5fd59..d73794a8c2 100644
--- a/src/IGESDraw/IGESDraw_ToolConnectPoint.cdl
+++ b/src/IGESDraw/IGESDraw_ToolConnectPoint.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolConnectPoint, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ConnectPoint;
+    ReadOwnParams (me; ent : ConnectPoint;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ConnectPoint; entto : mutable ConnectPoint;
+    OwnCopy    (me; entfrom : ConnectPoint; entto : ConnectPoint;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolDrawing.cdl b/src/IGESDraw/IGESDraw_ToolDrawing.cdl
index 6d5f268f2c..8c0e6334c5 100644
--- a/src/IGESDraw/IGESDraw_ToolDrawing.cdl
+++ b/src/IGESDraw/IGESDraw_ToolDrawing.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDrawing, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Drawing;
+    ReadOwnParams (me; ent : Drawing;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Drawing <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Drawing) returns Boolean  is static;
+    OwnCorrect (me; ent : Drawing) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Drawing
     --           (Null Views are removed from list)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Drawing; entto : mutable Drawing;
+    OwnCopy    (me; entfrom : Drawing; entto : Drawing;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cdl b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cdl
index 7846488279..30ceea69a6 100644
--- a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cdl
+++ b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDrawingWithRotation, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DrawingWithRotation;
+    ReadOwnParams (me; ent : DrawingWithRotation;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a DrawingWithRotation <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable DrawingWithRotation) returns Boolean  is static;
+    OwnCorrect (me; ent : DrawingWithRotation) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a DrawingWithRotation
     --           (Null Views are removed from list)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DrawingWithRotation; entto : mutable DrawingWithRotation;
+    OwnCopy    (me; entfrom : DrawingWithRotation; entto : DrawingWithRotation;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolLabelDisplay.cdl b/src/IGESDraw/IGESDraw_ToolLabelDisplay.cdl
index a887f4177a..72832131f8 100644
--- a/src/IGESDraw/IGESDraw_ToolLabelDisplay.cdl
+++ b/src/IGESDraw/IGESDraw_ToolLabelDisplay.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLabelDisplay, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LabelDisplay;
+    ReadOwnParams (me; ent : LabelDisplay;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LabelDisplay; entto : mutable LabelDisplay;
+    OwnCopy    (me; entfrom : LabelDisplay; entto : LabelDisplay;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cdl b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cdl
index 4af24bfb0a..15ecdeebde 100644
--- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cdl
+++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNetworkSubfigure, ready to work
 
 
-    ReadOwnParams (me; ent : mutable NetworkSubfigure;
+    ReadOwnParams (me; ent : NetworkSubfigure;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : NetworkSubfigure; entto : mutable NetworkSubfigure;
+    OwnCopy    (me; entfrom : NetworkSubfigure; entto : NetworkSubfigure;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cdl b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cdl
index 748c0ecb37..5efd873c63 100644
--- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cdl
+++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNetworkSubfigureDef, ready to work
 
 
-    ReadOwnParams (me; ent : mutable NetworkSubfigureDef;
+    ReadOwnParams (me; ent : NetworkSubfigureDef;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : NetworkSubfigureDef; entto : mutable NetworkSubfigureDef;
+    OwnCopy    (me; entfrom : NetworkSubfigureDef; entto : NetworkSubfigureDef;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolPerspectiveView.cdl b/src/IGESDraw/IGESDraw_ToolPerspectiveView.cdl
index 1578e9ca99..dadb862351 100644
--- a/src/IGESDraw/IGESDraw_ToolPerspectiveView.cdl
+++ b/src/IGESDraw/IGESDraw_ToolPerspectiveView.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPerspectiveView, ready to work
 
 
-    ReadOwnParams (me; ent : mutable PerspectiveView;
+    ReadOwnParams (me; ent : PerspectiveView;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : PerspectiveView; entto : mutable PerspectiveView;
+    OwnCopy    (me; entfrom : PerspectiveView; entto : PerspectiveView;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolPlanar.cdl b/src/IGESDraw/IGESDraw_ToolPlanar.cdl
index 09e3215062..372e004d4c 100644
--- a/src/IGESDraw/IGESDraw_ToolPlanar.cdl
+++ b/src/IGESDraw/IGESDraw_ToolPlanar.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPlanar, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Planar;
+    ReadOwnParams (me; ent : Planar;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Planar <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Planar) returns Boolean  is static;
+    OwnCorrect (me; ent : Planar) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Planar
     --           (NbMatrices forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Planar; entto : mutable Planar;
+    OwnCopy    (me; entfrom : Planar; entto : Planar;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cdl b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cdl
index 9ffa961957..c52f319cb8 100644
--- a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cdl
+++ b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolRectArraySubfigure, ready to work
 
 
-    ReadOwnParams (me; ent : mutable RectArraySubfigure;
+    ReadOwnParams (me; ent : RectArraySubfigure;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : RectArraySubfigure; entto : mutable RectArraySubfigure;
+    OwnCopy    (me; entfrom : RectArraySubfigure; entto : RectArraySubfigure;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cdl b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cdl
index f8554d86c6..9896454988 100644
--- a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cdl
+++ b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSegmentedViewsVisible, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SegmentedViewsVisible;
+    ReadOwnParams (me; ent : SegmentedViewsVisible;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SegmentedViewsVisible; entto : mutable SegmentedViewsVisible;
+    OwnCopy    (me; entfrom : SegmentedViewsVisible; entto : SegmentedViewsVisible;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolView.cdl b/src/IGESDraw/IGESDraw_ToolView.cdl
index 4f8fbe6b28..c8f64f1231 100644
--- a/src/IGESDraw/IGESDraw_ToolView.cdl
+++ b/src/IGESDraw/IGESDraw_ToolView.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolView, ready to work
 
 
-    ReadOwnParams (me; ent : mutable View;
+    ReadOwnParams (me; ent : View;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : View; entto : mutable View;
+    OwnCopy    (me; entfrom : View; entto : View;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisible.cdl b/src/IGESDraw/IGESDraw_ToolViewsVisible.cdl
index 0467c39fa4..a7f9b28552 100644
--- a/src/IGESDraw/IGESDraw_ToolViewsVisible.cdl
+++ b/src/IGESDraw/IGESDraw_ToolViewsVisible.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolViewsVisible, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ViewsVisible;
+    ReadOwnParams (me; ent : ViewsVisible;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -61,12 +61,12 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ViewsVisible; entto : mutable ViewsVisible;
+    OwnCopy    (me; entfrom : ViewsVisible; entto : ViewsVisible;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters shared not implied, i.e. all but
     --           the Displayed Entities
 
-    OwnRenew   (me; entfrom : ViewsVisible; entto : mutable ViewsVisible;
+    OwnRenew   (me; entfrom : ViewsVisible; entto : ViewsVisible;
     	        TC : CopyTool)  is static;
     ---Purpose : Copies Specific implied Parameters : the Displayed Entities
     --           which have already been copied
@@ -81,7 +81,7 @@ is
         is static;
     ---Purpose : Dump of Specific Parameters
 
-    OwnCorrect (me; ent : mutable ViewsVisible) returns Boolean is static;
+    OwnCorrect (me; ent : ViewsVisible) returns Boolean is static;
     ---Purpose : Sets automatic unambiguous Correction on a ViewsVisible
     --           (all displayed entities must refer to <ent> in directory part,
     --           else the list is cleared)
diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cdl b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cdl
index 3fab18a0f4..594518d6e1 100644
--- a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cdl
+++ b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolViewsVisibleWithAttr, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ViewsVisibleWithAttr;
+    ReadOwnParams (me; ent : ViewsVisibleWithAttr;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -61,12 +61,12 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ViewsVisibleWithAttr; entto : mutable ViewsVisibleWithAttr;
+    OwnCopy    (me; entfrom : ViewsVisibleWithAttr; entto : ViewsVisibleWithAttr;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters shared not implied, i.e. all but
     --           the Displayed Entities
 
-    OwnRenew   (me; entfrom : ViewsVisibleWithAttr; entto : mutable ViewsVisibleWithAttr;
+    OwnRenew   (me; entfrom : ViewsVisibleWithAttr; entto : ViewsVisibleWithAttr;
     	        TC : CopyTool)  is static;
     ---Purpose : Copies Specific implied Parameters : the Displayed Entities
     --           which have already been copied
@@ -81,7 +81,7 @@ is
         is static;
     ---Purpose : Dump of Specific Parameters
 
-    OwnCorrect (me; ent : mutable ViewsVisibleWithAttr) returns Boolean is static;
+    OwnCorrect (me; ent : ViewsVisibleWithAttr) returns Boolean is static;
     ---Purpose : Sets automatic unambiguous Correction on a ViewsVisibleWithAttr
     --           (all displayed entities must refer to <ent> in directory part,
     --           else the list is cleared)
diff --git a/src/IGESDraw/IGESDraw_View.cdl b/src/IGESDraw/IGESDraw_View.cdl
index 19f16599c2..3e960b8fb9 100644
--- a/src/IGESDraw/IGESDraw_View.cdl
+++ b/src/IGESDraw/IGESDraw_View.cdl
@@ -35,7 +35,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable View;
+        Create returns View;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_ViewsVisible.cdl b/src/IGESDraw/IGESDraw_ViewsVisible.cdl
index 8ff2d86f58..f1ec2fc89b 100644
--- a/src/IGESDraw/IGESDraw_ViewsVisible.cdl
+++ b/src/IGESDraw/IGESDraw_ViewsVisible.cdl
@@ -33,7 +33,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable ViewsVisible;
+        Create returns ViewsVisible;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.cdl b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.cdl
index ee276ff244..50246c43c8 100644
--- a/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.cdl
+++ b/src/IGESDraw/IGESDraw_ViewsVisibleWithAttr.cdl
@@ -39,7 +39,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable ViewsVisibleWithAttr;
+        Create returns ViewsVisibleWithAttr;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_BSplineCurve.cdl b/src/IGESGeom/IGESGeom_BSplineCurve.cdl
index b167eb85fb..1e0b8df99b 100644
--- a/src/IGESGeom/IGESGeom_BSplineCurve.cdl
+++ b/src/IGESGeom/IGESGeom_BSplineCurve.cdl
@@ -33,7 +33,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable BSplineCurve;
+        Create returns BSplineCurve;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_BSplineSurface.cdl b/src/IGESGeom/IGESGeom_BSplineSurface.cdl
index 85a87be587..4c7f793b5c 100644
--- a/src/IGESGeom/IGESGeom_BSplineSurface.cdl
+++ b/src/IGESGeom/IGESGeom_BSplineSurface.cdl
@@ -33,7 +33,7 @@ raises   DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable BSplineSurface;
+        Create returns BSplineSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_Boundary.cdl b/src/IGESGeom/IGESGeom_Boundary.cdl
index a630144330..a6e0920c2d 100644
--- a/src/IGESGeom/IGESGeom_Boundary.cdl
+++ b/src/IGESGeom/IGESGeom_Boundary.cdl
@@ -31,7 +31,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable Boundary;
+        Create returns Boundary;
 
         -- Specific Methods pertaining to the class
 
@@ -101,7 +101,7 @@ is
         -- a model space curve referred to by the Index
         -- raises exception if Index <= 0 or Index > NbModelSpaceCurves()
 
-        ParameterCurve (me; Index, Num: Integer) returns mutable IGESEntity
+        ParameterCurve (me; Index, Num: Integer) returns IGESEntity
         raises OutOfRange;
     	---Purpose : returns an individual parameter curve
         -- raises exception if Index or Num is out of range
diff --git a/src/IGESGeom/IGESGeom_BoundedSurface.cdl b/src/IGESGeom/IGESGeom_BoundedSurface.cdl
index 7d87eb7814..2fe221514f 100644
--- a/src/IGESGeom/IGESGeom_BoundedSurface.cdl
+++ b/src/IGESGeom/IGESGeom_BoundedSurface.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable BoundedSurface;
+        Create returns BoundedSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_CircularArc.cdl b/src/IGESGeom/IGESGeom_CircularArc.cdl
index 0329c52550..8ce79156be 100644
--- a/src/IGESGeom/IGESGeom_CircularArc.cdl
+++ b/src/IGESGeom/IGESGeom_CircularArc.cdl
@@ -34,7 +34,7 @@ uses
 
 is
 
-        Create returns mutable CircularArc;
+        Create returns CircularArc;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_CompositeCurve.cdl b/src/IGESGeom/IGESGeom_CompositeCurve.cdl
index 4492016395..3c38544366 100644
--- a/src/IGESGeom/IGESGeom_CompositeCurve.cdl
+++ b/src/IGESGeom/IGESGeom_CompositeCurve.cdl
@@ -30,7 +30,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable CompositeCurve;
+        Create returns CompositeCurve;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_ConicArc.cdl b/src/IGESGeom/IGESGeom_ConicArc.cdl
index 3e307acee1..1fa16534b4 100644
--- a/src/IGESGeom/IGESGeom_ConicArc.cdl
+++ b/src/IGESGeom/IGESGeom_ConicArc.cdl
@@ -36,7 +36,7 @@ uses
 
 is
 
-        Create returns mutable ConicArc;
+        Create returns ConicArc;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_CopiousData.cdl b/src/IGESGeom/IGESGeom_CopiousData.cdl
index 6841800938..e781e7ff14 100644
--- a/src/IGESGeom/IGESGeom_CopiousData.cdl
+++ b/src/IGESGeom/IGESGeom_CopiousData.cdl
@@ -32,7 +32,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable CopiousData;
+        Create returns CopiousData;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_CurveOnSurface.cdl b/src/IGESGeom/IGESGeom_CurveOnSurface.cdl
index 5bfcaf9ca3..b7b76986f1 100644
--- a/src/IGESGeom/IGESGeom_CurveOnSurface.cdl
+++ b/src/IGESGeom/IGESGeom_CurveOnSurface.cdl
@@ -26,7 +26,7 @@ uses  Integer  -- no one specific type
 
 is
 
-        Create returns mutable CurveOnSurface;
+        Create returns CurveOnSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_Direction.cdl b/src/IGESGeom/IGESGeom_Direction.cdl
index b512cfd742..935d268f58 100644
--- a/src/IGESGeom/IGESGeom_Direction.cdl
+++ b/src/IGESGeom/IGESGeom_Direction.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-        Create returns mutable Direction;
+        Create returns Direction;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_Flash.cdl b/src/IGESGeom/IGESGeom_Flash.cdl
index 70fae9c0a2..8b20a54d43 100644
--- a/src/IGESGeom/IGESGeom_Flash.cdl
+++ b/src/IGESGeom/IGESGeom_Flash.cdl
@@ -36,7 +36,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable Flash;
+        Create returns Flash;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_GeneralModule.cdl b/src/IGESGeom/IGESGeom_GeneralModule.cdl
index b0bdd06013..9e6a3f4fc3 100644
--- a/src/IGESGeom/IGESGeom_GeneralModule.cdl
+++ b/src/IGESGeom/IGESGeom_GeneralModule.cdl
@@ -25,7 +25,7 @@ uses OStream,
 
 is
 
-    Create returns mutable GeneralModule from IGESGeom;
+    Create returns GeneralModule from IGESGeom;
     ---Purpose : Creates a GeneralModule from IGESGeom and puts it into GeneralLib
 
     OwnSharedCase  (me; CN : Integer; ent : IGESEntity;
@@ -43,12 +43,12 @@ is
     ---Purpose : Performs Specific Semantic Check for each type of Entity
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
diff --git a/src/IGESGeom/IGESGeom_Line.cdl b/src/IGESGeom/IGESGeom_Line.cdl
index 96b53e582d..4d7bd79fd9 100644
--- a/src/IGESGeom/IGESGeom_Line.cdl
+++ b/src/IGESGeom/IGESGeom_Line.cdl
@@ -34,7 +34,7 @@ uses
 
 is
 
-        Create returns mutable Line;
+        Create returns Line;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_OffsetCurve.cdl b/src/IGESGeom/IGESGeom_OffsetCurve.cdl
index 463dd5f4e4..6254436d63 100644
--- a/src/IGESGeom/IGESGeom_OffsetCurve.cdl
+++ b/src/IGESGeom/IGESGeom_OffsetCurve.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-        Create returns mutable OffsetCurve;
+        Create returns OffsetCurve;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_OffsetSurface.cdl b/src/IGESGeom/IGESGeom_OffsetSurface.cdl
index 9efe90ea2a..7c397c1415 100644
--- a/src/IGESGeom/IGESGeom_OffsetSurface.cdl
+++ b/src/IGESGeom/IGESGeom_OffsetSurface.cdl
@@ -34,7 +34,7 @@ uses
 
 is
 
-        Create returns mutable OffsetSurface;
+        Create returns OffsetSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_Plane.cdl b/src/IGESGeom/IGESGeom_Plane.cdl
index 2900873357..b9fe5391d6 100644
--- a/src/IGESGeom/IGESGeom_Plane.cdl
+++ b/src/IGESGeom/IGESGeom_Plane.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-        Create returns mutable Plane;
+        Create returns Plane;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_Point.cdl b/src/IGESGeom/IGESGeom_Point.cdl
index a473afb9d7..a4e7a34060 100644
--- a/src/IGESGeom/IGESGeom_Point.cdl
+++ b/src/IGESGeom/IGESGeom_Point.cdl
@@ -26,7 +26,7 @@ uses
         XYZ          from gp
 is
 
-        Create returns mutable Point;
+        Create returns Point;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_Protocol.cdl b/src/IGESGeom/IGESGeom_Protocol.cdl
index 68b901dfbf..60fd79a7e0 100644
--- a/src/IGESGeom/IGESGeom_Protocol.cdl
+++ b/src/IGESGeom/IGESGeom_Protocol.cdl
@@ -22,7 +22,7 @@ uses Type, Protocol from Interface
 
 is
 
-    Create returns mutable Protocol from IGESGeom;
+    Create returns Protocol from IGESGeom;
 
     NbResources (me) returns Integer  is redefined;
     ---Purpose : Gives the count of Resource Protocol. Here, one
diff --git a/src/IGESGeom/IGESGeom_ReadWriteModule.cdl b/src/IGESGeom/IGESGeom_ReadWriteModule.cdl
index 58d330e175..62b72360d5 100644
--- a/src/IGESGeom/IGESGeom_ReadWriteModule.cdl
+++ b/src/IGESGeom/IGESGeom_ReadWriteModule.cdl
@@ -27,13 +27,13 @@ raises DomainError
 
 is
 
-    Create returns mutable ReadWriteModule from IGESGeom;
+    Create returns ReadWriteModule from IGESGeom;
     ---Purpose : Creates a ReadWriteModule & puts it into ReaderLib & WriterLib
 
     CaseIGES (me; typenum, formnum : Integer) returns Integer;
     ---Purpose : Defines Case Numbers for Entities of IGESGeom
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError;
     ---Purpose : Reads own parameters from file for an Entity of IGESGeom
diff --git a/src/IGESGeom/IGESGeom_RuledSurface.cdl b/src/IGESGeom/IGESGeom_RuledSurface.cdl
index f1bbc5d538..ef22914180 100644
--- a/src/IGESGeom/IGESGeom_RuledSurface.cdl
+++ b/src/IGESGeom/IGESGeom_RuledSurface.cdl
@@ -32,7 +32,7 @@ uses
 
 is
 
-        Create returns mutable RuledSurface;
+        Create returns RuledSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_SpecificModule.cdl b/src/IGESGeom/IGESGeom_SpecificModule.cdl
index a1bafdb133..b18de01e90 100644
--- a/src/IGESGeom/IGESGeom_SpecificModule.cdl
+++ b/src/IGESGeom/IGESGeom_SpecificModule.cdl
@@ -23,14 +23,14 @@ uses Messenger from Message, IGESEntity, IGESDumper
 
 is
 
-    Create returns mutable SpecificModule from IGESGeom;
+    Create returns SpecificModule from IGESGeom;
     ---Purpose : Creates a SpecificModule from IGESGeom & puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
     	      dumper : IGESDumper;  S : Messenger from Message; own : Integer);
     ---Purpose : Specific Dump (own parameters) for IGESGeom
 
-    OwnCorrect (me; CN : Integer; ent : mutable IGESEntity)
+    OwnCorrect (me; CN : Integer; ent : IGESEntity)
     	returns Boolean  is redefined;
     ---Purpose : Performs non-ambiguous Correction on Entities which support
     --           them (Boundary,ConicArc,Flash,OffsetCurve,TransformationMatrix)
diff --git a/src/IGESGeom/IGESGeom_SplineCurve.cdl b/src/IGESGeom/IGESGeom_SplineCurve.cdl
index f4a1cb2916..8fae5c4d44 100644
--- a/src/IGESGeom/IGESGeom_SplineCurve.cdl
+++ b/src/IGESGeom/IGESGeom_SplineCurve.cdl
@@ -37,7 +37,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable SplineCurve;
+        Create returns SplineCurve;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_SplineSurface.cdl b/src/IGESGeom/IGESGeom_SplineSurface.cdl
index 73e503a847..f09afc656e 100644
--- a/src/IGESGeom/IGESGeom_SplineSurface.cdl
+++ b/src/IGESGeom/IGESGeom_SplineSurface.cdl
@@ -36,7 +36,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable SplineSurface;
+        Create returns SplineSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_SurfaceOfRevolution.cdl b/src/IGESGeom/IGESGeom_SurfaceOfRevolution.cdl
index a037a447dd..4923efc2c9 100644
--- a/src/IGESGeom/IGESGeom_SurfaceOfRevolution.cdl
+++ b/src/IGESGeom/IGESGeom_SurfaceOfRevolution.cdl
@@ -34,7 +34,7 @@ uses
 
 is
 
-        Create returns mutable SurfaceOfRevolution;
+        Create returns SurfaceOfRevolution;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_TabulatedCylinder.cdl b/src/IGESGeom/IGESGeom_TabulatedCylinder.cdl
index 4ef8389b49..02a3585bbd 100644
--- a/src/IGESGeom/IGESGeom_TabulatedCylinder.cdl
+++ b/src/IGESGeom/IGESGeom_TabulatedCylinder.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-        Create returns mutable TabulatedCylinder;
+        Create returns TabulatedCylinder;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_ToolBSplineCurve.cdl b/src/IGESGeom/IGESGeom_ToolBSplineCurve.cdl
index 87f658effc..58687060db 100644
--- a/src/IGESGeom/IGESGeom_ToolBSplineCurve.cdl
+++ b/src/IGESGeom/IGESGeom_ToolBSplineCurve.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolBSplineCurve, ready to work
 
 
-    ReadOwnParams (me; ent : mutable BSplineCurve;
+    ReadOwnParams (me; ent : BSplineCurve;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : BSplineCurve; entto : mutable BSplineCurve;
+    OwnCopy    (me; entfrom : BSplineCurve; entto : BSplineCurve;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolBSplineSurface.cdl b/src/IGESGeom/IGESGeom_ToolBSplineSurface.cdl
index 71e6893939..72c399769a 100644
--- a/src/IGESGeom/IGESGeom_ToolBSplineSurface.cdl
+++ b/src/IGESGeom/IGESGeom_ToolBSplineSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolBSplineSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable BSplineSurface;
+    ReadOwnParams (me; ent : BSplineSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : BSplineSurface; entto : mutable BSplineSurface;
+    OwnCopy    (me; entfrom : BSplineSurface; entto : BSplineSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolBoundary.cdl b/src/IGESGeom/IGESGeom_ToolBoundary.cdl
index c3a539cf38..cb0cb6d2b9 100644
--- a/src/IGESGeom/IGESGeom_ToolBoundary.cdl
+++ b/src/IGESGeom/IGESGeom_ToolBoundary.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolBoundary, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Boundary;
+    ReadOwnParams (me; ent : Boundary;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Boundary <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Boundary) returns Boolean  is static;
+    OwnCorrect (me; ent : Boundary) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Boundary
     --           (if BoundaryType = 0, Nullify all ParameterCurves)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Boundary; entto : mutable Boundary;
+    OwnCopy    (me; entfrom : Boundary; entto : Boundary;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolBoundedSurface.cdl b/src/IGESGeom/IGESGeom_ToolBoundedSurface.cdl
index c43c416ca6..1c47b8abd0 100644
--- a/src/IGESGeom/IGESGeom_ToolBoundedSurface.cdl
+++ b/src/IGESGeom/IGESGeom_ToolBoundedSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolBoundedSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable BoundedSurface;
+    ReadOwnParams (me; ent : BoundedSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : BoundedSurface; entto : mutable BoundedSurface;
+    OwnCopy    (me; entfrom : BoundedSurface; entto : BoundedSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolCircularArc.cdl b/src/IGESGeom/IGESGeom_ToolCircularArc.cdl
index 4b88fb8346..99f7144629 100644
--- a/src/IGESGeom/IGESGeom_ToolCircularArc.cdl
+++ b/src/IGESGeom/IGESGeom_ToolCircularArc.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCircularArc, ready to work
 
 
-    ReadOwnParams (me; ent : mutable CircularArc;
+    ReadOwnParams (me; ent : CircularArc;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : CircularArc; entto : mutable CircularArc;
+    OwnCopy    (me; entfrom : CircularArc; entto : CircularArc;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolCompositeCurve.cdl b/src/IGESGeom/IGESGeom_ToolCompositeCurve.cdl
index 2317a01de9..7c728f41fc 100644
--- a/src/IGESGeom/IGESGeom_ToolCompositeCurve.cdl
+++ b/src/IGESGeom/IGESGeom_ToolCompositeCurve.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCompositeCurve, ready to work
 
 
-    ReadOwnParams (me; ent : mutable CompositeCurve;
+    ReadOwnParams (me; ent : CompositeCurve;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : CompositeCurve; entto : mutable CompositeCurve;
+    OwnCopy    (me; entfrom : CompositeCurve; entto : CompositeCurve;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolConicArc.cdl b/src/IGESGeom/IGESGeom_ToolConicArc.cdl
index 5aed8b5cbc..5607d37d4c 100644
--- a/src/IGESGeom/IGESGeom_ToolConicArc.cdl
+++ b/src/IGESGeom/IGESGeom_ToolConicArc.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolConicArc, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ConicArc;
+    ReadOwnParams (me; ent : ConicArc;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a ConicArc <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable ConicArc) returns Boolean  is static;
+    OwnCorrect (me; ent : ConicArc) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a ConicArc
     --           (FormNumber recomputed according case Ellips-Parab-Hyperb)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ConicArc; entto : mutable ConicArc;
+    OwnCopy    (me; entfrom : ConicArc; entto : ConicArc;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolCopiousData.cdl b/src/IGESGeom/IGESGeom_ToolCopiousData.cdl
index 6806c23b85..af7b0cf543 100644
--- a/src/IGESGeom/IGESGeom_ToolCopiousData.cdl
+++ b/src/IGESGeom/IGESGeom_ToolCopiousData.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCopiousData, ready to work
 
 
-    ReadOwnParams (me; ent : mutable CopiousData;
+    ReadOwnParams (me; ent : CopiousData;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : CopiousData; entto : mutable CopiousData;
+    OwnCopy    (me; entfrom : CopiousData; entto : CopiousData;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolCurveOnSurface.cdl b/src/IGESGeom/IGESGeom_ToolCurveOnSurface.cdl
index ed28930246..37092184ba 100644
--- a/src/IGESGeom/IGESGeom_ToolCurveOnSurface.cdl
+++ b/src/IGESGeom/IGESGeom_ToolCurveOnSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCurveOnSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable CurveOnSurface;
+    ReadOwnParams (me; ent : CurveOnSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a CurveOnSurface <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable CurveOnSurface) returns Boolean  is static;
+    OwnCorrect (me; ent : CurveOnSurface) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a CurveOnSurface
     --           (its CurveUV must have UseFlag at 5)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : CurveOnSurface; entto : mutable CurveOnSurface;
+    OwnCopy    (me; entfrom : CurveOnSurface; entto : CurveOnSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolDirection.cdl b/src/IGESGeom/IGESGeom_ToolDirection.cdl
index 2e5452276f..2a48d120d1 100644
--- a/src/IGESGeom/IGESGeom_ToolDirection.cdl
+++ b/src/IGESGeom/IGESGeom_ToolDirection.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDirection, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Direction;
+    ReadOwnParams (me; ent : Direction;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Direction; entto : mutable Direction;
+    OwnCopy    (me; entfrom : Direction; entto : Direction;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolFlash.cdl b/src/IGESGeom/IGESGeom_ToolFlash.cdl
index 054dd9369a..61c01d4a75 100644
--- a/src/IGESGeom/IGESGeom_ToolFlash.cdl
+++ b/src/IGESGeom/IGESGeom_ToolFlash.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolFlash, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Flash;
+    ReadOwnParams (me; ent : Flash;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Flash <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Flash) returns Boolean  is static;
+    OwnCorrect (me; ent : Flash) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Flash
     --           (LineFont in Directory Entry forced to Rank = 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Flash; entto : mutable Flash;
+    OwnCopy    (me; entfrom : Flash; entto : Flash;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolLine.cdl b/src/IGESGeom/IGESGeom_ToolLine.cdl
index 0fede51bb4..f2ad81b1af 100644
--- a/src/IGESGeom/IGESGeom_ToolLine.cdl
+++ b/src/IGESGeom/IGESGeom_ToolLine.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLine, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Line;
+    ReadOwnParams (me; ent : Line;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Line; entto : mutable Line;
+    OwnCopy    (me; entfrom : Line; entto : Line;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolOffsetCurve.cdl b/src/IGESGeom/IGESGeom_ToolOffsetCurve.cdl
index 427626ffb7..430964d559 100644
--- a/src/IGESGeom/IGESGeom_ToolOffsetCurve.cdl
+++ b/src/IGESGeom/IGESGeom_ToolOffsetCurve.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolOffsetCurve, ready to work
 
 
-    ReadOwnParams (me; ent : mutable OffsetCurve;
+    ReadOwnParams (me; ent : OffsetCurve;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a OffsetCurve <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable OffsetCurve) returns Boolean  is static;
+    OwnCorrect (me; ent : OffsetCurve) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a OffsetCurve
     --           (if OffsetType is not 3, OffsetFunction is cleared)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : OffsetCurve; entto : mutable OffsetCurve;
+    OwnCopy    (me; entfrom : OffsetCurve; entto : OffsetCurve;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolOffsetSurface.cdl b/src/IGESGeom/IGESGeom_ToolOffsetSurface.cdl
index ed3e775b4d..920628dff3 100644
--- a/src/IGESGeom/IGESGeom_ToolOffsetSurface.cdl
+++ b/src/IGESGeom/IGESGeom_ToolOffsetSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolOffsetSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable OffsetSurface;
+    ReadOwnParams (me; ent : OffsetSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : OffsetSurface; entto : mutable OffsetSurface;
+    OwnCopy    (me; entfrom : OffsetSurface; entto : OffsetSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolPlane.cdl b/src/IGESGeom/IGESGeom_ToolPlane.cdl
index d46d32acf5..1ca086134e 100644
--- a/src/IGESGeom/IGESGeom_ToolPlane.cdl
+++ b/src/IGESGeom/IGESGeom_ToolPlane.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPlane, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Plane;
+    ReadOwnParams (me; ent : Plane;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Plane; entto : mutable Plane;
+    OwnCopy    (me; entfrom : Plane; entto : Plane;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolPoint.cdl b/src/IGESGeom/IGESGeom_ToolPoint.cdl
index 99b8e50ca8..b718f2e9e1 100644
--- a/src/IGESGeom/IGESGeom_ToolPoint.cdl
+++ b/src/IGESGeom/IGESGeom_ToolPoint.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPoint, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Point;
+    ReadOwnParams (me; ent : Point;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Point; entto : mutable Point;
+    OwnCopy    (me; entfrom : Point; entto : Point;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolRuledSurface.cdl b/src/IGESGeom/IGESGeom_ToolRuledSurface.cdl
index c485b3db6e..b935b13be5 100644
--- a/src/IGESGeom/IGESGeom_ToolRuledSurface.cdl
+++ b/src/IGESGeom/IGESGeom_ToolRuledSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolRuledSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable RuledSurface;
+    ReadOwnParams (me; ent : RuledSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : RuledSurface; entto : mutable RuledSurface;
+    OwnCopy    (me; entfrom : RuledSurface; entto : RuledSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolSplineCurve.cdl b/src/IGESGeom/IGESGeom_ToolSplineCurve.cdl
index 57e5d139cc..e9bbe246ed 100644
--- a/src/IGESGeom/IGESGeom_ToolSplineCurve.cdl
+++ b/src/IGESGeom/IGESGeom_ToolSplineCurve.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSplineCurve, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SplineCurve;
+    ReadOwnParams (me; ent : SplineCurve;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SplineCurve; entto : mutable SplineCurve;
+    OwnCopy    (me; entfrom : SplineCurve; entto : SplineCurve;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolSplineSurface.cdl b/src/IGESGeom/IGESGeom_ToolSplineSurface.cdl
index b3eca27149..ff62fc38c1 100644
--- a/src/IGESGeom/IGESGeom_ToolSplineSurface.cdl
+++ b/src/IGESGeom/IGESGeom_ToolSplineSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSplineSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SplineSurface;
+    ReadOwnParams (me; ent : SplineSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SplineSurface; entto : mutable SplineSurface;
+    OwnCopy    (me; entfrom : SplineSurface; entto : SplineSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cdl b/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cdl
index 4bb0289e6e..9c4c30f69f 100644
--- a/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cdl
+++ b/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSurfaceOfRevolution, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SurfaceOfRevolution;
+    ReadOwnParams (me; ent : SurfaceOfRevolution;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SurfaceOfRevolution; entto : mutable SurfaceOfRevolution;
+    OwnCopy    (me; entfrom : SurfaceOfRevolution; entto : SurfaceOfRevolution;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cdl b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cdl
index 296b0bc7a1..ada8f8f7d9 100644
--- a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cdl
+++ b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolTabulatedCylinder, ready to work
 
 
-    ReadOwnParams (me; ent : mutable TabulatedCylinder;
+    ReadOwnParams (me; ent : TabulatedCylinder;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : TabulatedCylinder; entto : mutable TabulatedCylinder;
+    OwnCopy    (me; entfrom : TabulatedCylinder; entto : TabulatedCylinder;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cdl b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cdl
index 87eac27c2a..f3e9558ceb 100644
--- a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cdl
+++ b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolTransformationMatrix, ready to work
 
 
-    ReadOwnParams (me; ent : mutable TransformationMatrix;
+    ReadOwnParams (me; ent : TransformationMatrix;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a TransformationMatrix <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable TransformationMatrix) returns Boolean  is static;
+    OwnCorrect (me; ent : TransformationMatrix) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a TransformationMatrix
     --           (FormNumber if 0 or 1, recomputed according Positive/Negative)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : TransformationMatrix; entto : mutable TransformationMatrix;
+    OwnCopy    (me; entfrom : TransformationMatrix; entto : TransformationMatrix;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cdl b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cdl
index 813a953ad0..36bd724f5e 100644
--- a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cdl
+++ b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolTrimmedSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable TrimmedSurface;
+    ReadOwnParams (me; ent : TrimmedSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : TrimmedSurface; entto : mutable TrimmedSurface;
+    OwnCopy    (me; entfrom : TrimmedSurface; entto : TrimmedSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGeom/IGESGeom_TransformationMatrix.cdl b/src/IGESGeom/IGESGeom_TransformationMatrix.cdl
index a4afeb42f2..26b921d5e4 100644
--- a/src/IGESGeom/IGESGeom_TransformationMatrix.cdl
+++ b/src/IGESGeom/IGESGeom_TransformationMatrix.cdl
@@ -34,7 +34,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable TransformationMatrix;
+        Create returns TransformationMatrix;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGeom/IGESGeom_TrimmedSurface.cdl b/src/IGESGeom/IGESGeom_TrimmedSurface.cdl
index 4393661df9..726e0d172d 100644
--- a/src/IGESGeom/IGESGeom_TrimmedSurface.cdl
+++ b/src/IGESGeom/IGESGeom_TrimmedSurface.cdl
@@ -36,7 +36,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable TrimmedSurface;
+        Create returns TrimmedSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_Color.cdl b/src/IGESGraph/IGESGraph_Color.cdl
index 28485e7cf8..bc47fb314a 100644
--- a/src/IGESGraph/IGESGraph_Color.cdl
+++ b/src/IGESGraph/IGESGraph_Color.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-        Create returns mutable Color;
+        Create returns Color;
 
         -- Specific Methods pertaining to class
 
diff --git a/src/IGESGraph/IGESGraph_DefinitionLevel.cdl b/src/IGESGraph/IGESGraph_DefinitionLevel.cdl
index 43c4f3b791..b0cd550863 100644
--- a/src/IGESGraph/IGESGraph_DefinitionLevel.cdl
+++ b/src/IGESGraph/IGESGraph_DefinitionLevel.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable DefinitionLevel;
+        Create returns DefinitionLevel;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_DrawingSize.cdl b/src/IGESGraph/IGESGraph_DrawingSize.cdl
index 0d4efe73cb..e07cc0f00c 100644
--- a/src/IGESGraph/IGESGraph_DrawingSize.cdl
+++ b/src/IGESGraph/IGESGraph_DrawingSize.cdl
@@ -28,7 +28,7 @@ uses  Integer, Real  -- no one specific type
 
 is
 
-        Create returns mutable DrawingSize;
+        Create returns DrawingSize;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_DrawingUnits.cdl b/src/IGESGraph/IGESGraph_DrawingUnits.cdl
index deb42c357c..df25cfec61 100644
--- a/src/IGESGraph/IGESGraph_DrawingUnits.cdl
+++ b/src/IGESGraph/IGESGraph_DrawingUnits.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable DrawingUnits;
+        Create returns DrawingUnits;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_GeneralModule.cdl b/src/IGESGraph/IGESGraph_GeneralModule.cdl
index a518c630e7..4410a39c57 100644
--- a/src/IGESGraph/IGESGraph_GeneralModule.cdl
+++ b/src/IGESGraph/IGESGraph_GeneralModule.cdl
@@ -25,7 +25,7 @@ uses OStream,
 
 is
 
-    Create returns mutable GeneralModule from IGESGraph;
+    Create returns GeneralModule from IGESGraph;
     ---Purpose : Creates a GeneralModule from IGESGraph and puts it into GeneralLib
 
     OwnSharedCase  (me; CN : Integer; ent : IGESEntity;
@@ -43,12 +43,12 @@ is
     ---Purpose : Performs Specific Semantic Check for each type of Entity
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
diff --git a/src/IGESGraph/IGESGraph_HighLight.cdl b/src/IGESGraph/IGESGraph_HighLight.cdl
index 831608ecdf..6ee5b05b54 100644
--- a/src/IGESGraph/IGESGraph_HighLight.cdl
+++ b/src/IGESGraph/IGESGraph_HighLight.cdl
@@ -27,7 +27,7 @@ uses  Integer  -- no one specific type
 
 is
 
-        Create returns mutable HighLight;
+        Create returns HighLight;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_IntercharacterSpacing.cdl b/src/IGESGraph/IGESGraph_IntercharacterSpacing.cdl
index 4071ca470e..330f8a2457 100644
--- a/src/IGESGraph/IGESGraph_IntercharacterSpacing.cdl
+++ b/src/IGESGraph/IGESGraph_IntercharacterSpacing.cdl
@@ -27,7 +27,7 @@ uses  Integer, Real  -- no one specific type
 
 is
 
-        Create returns mutable IntercharacterSpacing;
+        Create returns IntercharacterSpacing;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_LineFontDefPattern.cdl b/src/IGESGraph/IGESGraph_LineFontDefPattern.cdl
index c20c126ba0..f15483e0df 100644
--- a/src/IGESGraph/IGESGraph_LineFontDefPattern.cdl
+++ b/src/IGESGraph/IGESGraph_LineFontDefPattern.cdl
@@ -34,7 +34,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable LineFontDefPattern;
+        Create returns LineFontDefPattern;
 
         -- Specific Methods pertaining to class
 
diff --git a/src/IGESGraph/IGESGraph_LineFontDefTemplate.cdl b/src/IGESGraph/IGESGraph_LineFontDefTemplate.cdl
index f142646175..ee6bc3da8c 100644
--- a/src/IGESGraph/IGESGraph_LineFontDefTemplate.cdl
+++ b/src/IGESGraph/IGESGraph_LineFontDefTemplate.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-        Create returns mutable LineFontDefTemplate;
+        Create returns LineFontDefTemplate;
 
         -- Specific Methods pertaining to class
 
diff --git a/src/IGESGraph/IGESGraph_LineFontPredefined.cdl b/src/IGESGraph/IGESGraph_LineFontPredefined.cdl
index 20d491e265..5ef9c980bf 100644
--- a/src/IGESGraph/IGESGraph_LineFontPredefined.cdl
+++ b/src/IGESGraph/IGESGraph_LineFontPredefined.cdl
@@ -28,7 +28,7 @@ uses  Integer  -- no one specific type
 
 is
 
-        Create returns mutable LineFontPredefined;
+        Create returns LineFontPredefined;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_NominalSize.cdl b/src/IGESGraph/IGESGraph_NominalSize.cdl
index dfdf3e8995..117cab1123 100644
--- a/src/IGESGraph/IGESGraph_NominalSize.cdl
+++ b/src/IGESGraph/IGESGraph_NominalSize.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable NominalSize;
+        Create returns NominalSize;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_Pick.cdl b/src/IGESGraph/IGESGraph_Pick.cdl
index c0925d98f5..08403d490a 100644
--- a/src/IGESGraph/IGESGraph_Pick.cdl
+++ b/src/IGESGraph/IGESGraph_Pick.cdl
@@ -28,7 +28,7 @@ uses  Integer  -- no one specific type
 
 is
 
-        Create returns mutable Pick;
+        Create returns Pick;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESGraph/IGESGraph_Protocol.cdl b/src/IGESGraph/IGESGraph_Protocol.cdl
index 8c034a6333..26de5b9124 100644
--- a/src/IGESGraph/IGESGraph_Protocol.cdl
+++ b/src/IGESGraph/IGESGraph_Protocol.cdl
@@ -22,7 +22,7 @@ uses Type, Protocol from Interface
 
 is
 
-    Create returns mutable Protocol from IGESGraph;
+    Create returns Protocol from IGESGraph;
 
     NbResources (me) returns Integer  is redefined;
     ---Purpose : Gives the count of Resource Protocol. Here, one
diff --git a/src/IGESGraph/IGESGraph_ReadWriteModule.cdl b/src/IGESGraph/IGESGraph_ReadWriteModule.cdl
index ed415aa97c..8333326231 100644
--- a/src/IGESGraph/IGESGraph_ReadWriteModule.cdl
+++ b/src/IGESGraph/IGESGraph_ReadWriteModule.cdl
@@ -27,13 +27,13 @@ raises DomainError
 
 is
 
-    Create returns mutable ReadWriteModule from IGESGraph;
+    Create returns ReadWriteModule from IGESGraph;
     ---Purpose : Creates a ReadWriteModule & puts it into ReaderLib & WriterLib
 
     CaseIGES (me; typenum, formnum : Integer) returns Integer;
     ---Purpose : Defines Case Numbers for Entities of IGESGraph
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError;
     ---Purpose : Reads own parameters from file for an Entity of IGESGraph
diff --git a/src/IGESGraph/IGESGraph_SpecificModule.cdl b/src/IGESGraph/IGESGraph_SpecificModule.cdl
index 24368009ec..3327682508 100644
--- a/src/IGESGraph/IGESGraph_SpecificModule.cdl
+++ b/src/IGESGraph/IGESGraph_SpecificModule.cdl
@@ -23,14 +23,14 @@ uses Messenger from Message, IGESEntity, IGESDumper
 
 is
 
-    Create returns mutable SpecificModule from IGESGraph;
+    Create returns SpecificModule from IGESGraph;
     ---Purpose : Creates a SpecificModule from IGESGraph & puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
     	      dumper : IGESDumper;  S : Messenger from Message; own : Integer);
     ---Purpose : Specific Dump (own parameters) for IGESGraph
 
-    OwnCorrect (me; CN : Integer; ent : mutable IGESEntity)
+    OwnCorrect (me; CN : Integer; ent : IGESEntity)
     	returns Boolean  is redefined;
     ---Purpose : Performs non-ambiguous Corrections on Entities which support
     --           them (DrawingSize,DrawingUnits,HighLight,IntercharacterSpacing,
diff --git a/src/IGESGraph/IGESGraph_TextDisplayTemplate.cdl b/src/IGESGraph/IGESGraph_TextDisplayTemplate.cdl
index e8a63cd8de..9d0bdae68e 100644
--- a/src/IGESGraph/IGESGraph_TextDisplayTemplate.cdl
+++ b/src/IGESGraph/IGESGraph_TextDisplayTemplate.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-        Create returns mutable TextDisplayTemplate;
+        Create returns TextDisplayTemplate;
 
         -- specific for the entity
 
diff --git a/src/IGESGraph/IGESGraph_TextFontDef.cdl b/src/IGESGraph/IGESGraph_TextFontDef.cdl
index d76f1668a4..bba5ba81e8 100644
--- a/src/IGESGraph/IGESGraph_TextFontDef.cdl
+++ b/src/IGESGraph/IGESGraph_TextFontDef.cdl
@@ -33,7 +33,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable TextFontDef;
+        Create returns TextFontDef;
 
         -- specific for the entity
 
diff --git a/src/IGESGraph/IGESGraph_ToolColor.cdl b/src/IGESGraph/IGESGraph_ToolColor.cdl
index 673f57f2d9..33f5c6eae3 100644
--- a/src/IGESGraph/IGESGraph_ToolColor.cdl
+++ b/src/IGESGraph/IGESGraph_ToolColor.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolColor, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Color;
+    ReadOwnParams (me; ent : Color;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Color; entto : mutable Color;
+    OwnCopy    (me; entfrom : Color; entto : Color;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cdl b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cdl
index d6dd9ab58e..7263c866a7 100644
--- a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cdl
+++ b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDefinitionLevel, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DefinitionLevel;
+    ReadOwnParams (me; ent : DefinitionLevel;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DefinitionLevel; entto : mutable DefinitionLevel;
+    OwnCopy    (me; entfrom : DefinitionLevel; entto : DefinitionLevel;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolDrawingSize.cdl b/src/IGESGraph/IGESGraph_ToolDrawingSize.cdl
index 9de50e60e3..cedd36ebfc 100644
--- a/src/IGESGraph/IGESGraph_ToolDrawingSize.cdl
+++ b/src/IGESGraph/IGESGraph_ToolDrawingSize.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDrawingSize, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DrawingSize;
+    ReadOwnParams (me; ent : DrawingSize;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a DrawingSize <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable DrawingSize) returns Boolean  is static;
+    OwnCorrect (me; ent : DrawingSize) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a DrawingSize
     --           (NbPropertyValues forced to 2)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DrawingSize; entto : mutable DrawingSize;
+    OwnCopy    (me; entfrom : DrawingSize; entto : DrawingSize;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolDrawingUnits.cdl b/src/IGESGraph/IGESGraph_ToolDrawingUnits.cdl
index 079781be63..406803359f 100644
--- a/src/IGESGraph/IGESGraph_ToolDrawingUnits.cdl
+++ b/src/IGESGraph/IGESGraph_ToolDrawingUnits.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolDrawingUnits, ready to work
 
 
-    ReadOwnParams (me; ent : mutable DrawingUnits;
+    ReadOwnParams (me; ent : DrawingUnits;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a DrawingUnits <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable DrawingUnits) returns Boolean  is static;
+    OwnCorrect (me; ent : DrawingUnits) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a DrawingUnits
     --           (NbPropertyValues forced to 2)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : DrawingUnits; entto : mutable DrawingUnits;
+    OwnCopy    (me; entfrom : DrawingUnits; entto : DrawingUnits;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolHighLight.cdl b/src/IGESGraph/IGESGraph_ToolHighLight.cdl
index 43f93dc8e0..81c7cad0f8 100644
--- a/src/IGESGraph/IGESGraph_ToolHighLight.cdl
+++ b/src/IGESGraph/IGESGraph_ToolHighLight.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolHighLight, ready to work
 
 
-    ReadOwnParams (me; ent : mutable HighLight;
+    ReadOwnParams (me; ent : HighLight;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a HighLight <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable HighLight) returns Boolean  is static;
+    OwnCorrect (me; ent : HighLight) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a HighLight
     --           (NbPropertyValues forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : HighLight; entto : mutable HighLight;
+    OwnCopy    (me; entfrom : HighLight; entto : HighLight;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cdl b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cdl
index f43b1c6b5d..3afc8bab52 100644
--- a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cdl
+++ b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolIntercharacterSpacing, ready to work
 
 
-    ReadOwnParams (me; ent : mutable IntercharacterSpacing;
+    ReadOwnParams (me; ent : IntercharacterSpacing;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a IntercharacterSpacing <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable IntercharacterSpacing) returns Boolean  is static;
+    OwnCorrect (me; ent : IntercharacterSpacing) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a IntercharacterSpacing
     --           (NbPropertyValues forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : IntercharacterSpacing; entto : mutable IntercharacterSpacing;
+    OwnCopy    (me; entfrom : IntercharacterSpacing; entto : IntercharacterSpacing;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cdl b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cdl
index 1a45d64e70..8ef2bf2928 100644
--- a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cdl
+++ b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLineFontDefPattern, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LineFontDefPattern;
+    ReadOwnParams (me; ent : LineFontDefPattern;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LineFontDefPattern; entto : mutable LineFontDefPattern;
+    OwnCopy    (me; entfrom : LineFontDefPattern; entto : LineFontDefPattern;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cdl b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cdl
index b603d35e6b..a010c9338e 100644
--- a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cdl
+++ b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLineFontDefTemplate, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LineFontDefTemplate;
+    ReadOwnParams (me; ent : LineFontDefTemplate;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LineFontDefTemplate; entto : mutable LineFontDefTemplate;
+    OwnCopy    (me; entfrom : LineFontDefTemplate; entto : LineFontDefTemplate;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cdl b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cdl
index 5608c5da77..96c6da8218 100644
--- a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cdl
+++ b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLineFontPredefined, ready to work
 
 
-    ReadOwnParams (me; ent : mutable LineFontPredefined;
+    ReadOwnParams (me; ent : LineFontPredefined;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a LineFontPredefined <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable LineFontPredefined) returns Boolean  is static;
+    OwnCorrect (me; ent : LineFontPredefined) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a LineFontPredefined
     --           (NbPropertyValues forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : LineFontPredefined; entto : mutable LineFontPredefined;
+    OwnCopy    (me; entfrom : LineFontPredefined; entto : LineFontPredefined;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolNominalSize.cdl b/src/IGESGraph/IGESGraph_ToolNominalSize.cdl
index 69edd5614e..b8af228475 100644
--- a/src/IGESGraph/IGESGraph_ToolNominalSize.cdl
+++ b/src/IGESGraph/IGESGraph_ToolNominalSize.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolNominalSize, ready to work
 
 
-    ReadOwnParams (me; ent : mutable NominalSize;
+    ReadOwnParams (me; ent : NominalSize;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a NominalSize <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable NominalSize) returns Boolean  is static;
+    OwnCorrect (me; ent : NominalSize) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a NominalSize
     --           (NbPropertyValues forced to 2 or 3 according HasStandardName)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : NominalSize; entto : mutable NominalSize;
+    OwnCopy    (me; entfrom : NominalSize; entto : NominalSize;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolPick.cdl b/src/IGESGraph/IGESGraph_ToolPick.cdl
index 3b497cc2de..9e206846b1 100644
--- a/src/IGESGraph/IGESGraph_ToolPick.cdl
+++ b/src/IGESGraph/IGESGraph_ToolPick.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPick, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Pick;
+    ReadOwnParams (me; ent : Pick;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a Pick <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable Pick) returns Boolean  is static;
+    OwnCorrect (me; ent : Pick) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a Pick
     --           (NbPropertyValues forced to 1)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Pick; entto : mutable Pick;
+    OwnCopy    (me; entfrom : Pick; entto : Pick;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cdl b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cdl
index f0ac06950c..7ffb1f9a7b 100644
--- a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cdl
+++ b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolTextDisplayTemplate, ready to work
 
 
-    ReadOwnParams (me; ent : mutable TextDisplayTemplate;
+    ReadOwnParams (me; ent : TextDisplayTemplate;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : TextDisplayTemplate; entto : mutable TextDisplayTemplate;
+    OwnCopy    (me; entfrom : TextDisplayTemplate; entto : TextDisplayTemplate;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolTextFontDef.cdl b/src/IGESGraph/IGESGraph_ToolTextFontDef.cdl
index e9eef12687..994aefdb0f 100644
--- a/src/IGESGraph/IGESGraph_ToolTextFontDef.cdl
+++ b/src/IGESGraph/IGESGraph_ToolTextFontDef.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolTextFontDef, ready to work
 
 
-    ReadOwnParams (me; ent : mutable TextFontDef;
+    ReadOwnParams (me; ent : TextFontDef;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : TextFontDef; entto : mutable TextFontDef;
+    OwnCopy    (me; entfrom : TextFontDef; entto : TextFontDef;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_ToolUniformRectGrid.cdl b/src/IGESGraph/IGESGraph_ToolUniformRectGrid.cdl
index cd74991dd3..243efe9baf 100644
--- a/src/IGESGraph/IGESGraph_ToolUniformRectGrid.cdl
+++ b/src/IGESGraph/IGESGraph_ToolUniformRectGrid.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolUniformRectGrid, ready to work
 
 
-    ReadOwnParams (me; ent : mutable UniformRectGrid;
+    ReadOwnParams (me; ent : UniformRectGrid;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -47,7 +47,7 @@ is
     ---Purpose : Lists the Entities shared by a UniformRectGrid <ent>, from
     --           its specific (own) parameters
 
-    OwnCorrect (me; ent : mutable UniformRectGrid) returns Boolean  is static;
+    OwnCorrect (me; ent : UniformRectGrid) returns Boolean  is static;
     ---Purpose : Sets automatic unambiguous Correction on a UniformRectGrid
     --           (NbPropertyValues forced to 9)
 
@@ -59,7 +59,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : UniformRectGrid; entto : mutable UniformRectGrid;
+    OwnCopy    (me; entfrom : UniformRectGrid; entto : UniformRectGrid;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESGraph/IGESGraph_UniformRectGrid.cdl b/src/IGESGraph/IGESGraph_UniformRectGrid.cdl
index 7a1b774dd6..48a78f6f18 100644
--- a/src/IGESGraph/IGESGraph_UniformRectGrid.cdl
+++ b/src/IGESGraph/IGESGraph_UniformRectGrid.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-        Create returns mutable UniformRectGrid;
+        Create returns UniformRectGrid;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSelect/IGESSelect_Activator.cdl b/src/IGESSelect/IGESSelect_Activator.cdl
index b9b1a5fea8..937849111d 100644
--- a/src/IGESSelect/IGESSelect_Activator.cdl
+++ b/src/IGESSelect/IGESSelect_Activator.cdl
@@ -23,10 +23,10 @@ uses CString, SessionPilot, ReturnStatus
 
 is
 
-    Create returns mutable Activator from IGESSelect;
+    Create returns Activator from IGESSelect;
 
 
-    Do   (me : mutable; number : Integer; pilot : mutable SessionPilot)
+    Do   (me : mutable; number : Integer; pilot : SessionPilot)
     	returns ReturnStatus;
     ---Purpose : Executes a Command Line for IGESSelect
 
diff --git a/src/IGESSelect/IGESSelect_AddFileComment.cdl b/src/IGESSelect/IGESSelect_AddFileComment.cdl
index 92a98f9377..9e3dbf3572 100644
--- a/src/IGESSelect/IGESSelect_AddFileComment.cdl
+++ b/src/IGESSelect/IGESSelect_AddFileComment.cdl
@@ -26,7 +26,7 @@ uses CString, AsciiString from TCollection,
 
 is
 
-    Create returns mutable AddFileComment;
+    Create returns AddFileComment;
     ---Purpose : Creates a new emoty AddFileComment. Use AddLine to complete it
 
     Clear (me : mutable);
diff --git a/src/IGESSelect/IGESSelect_AddGroup.cdl b/src/IGESSelect/IGESSelect_AddGroup.cdl
index 413e87e05c..ee3c293d33 100644
--- a/src/IGESSelect/IGESSelect_AddGroup.cdl
+++ b/src/IGESSelect/IGESSelect_AddGroup.cdl
@@ -24,11 +24,11 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable AddGroup;
+    Create returns AddGroup;
     ---Purpose : Creates an AddGroup
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : Adds a new group
 
diff --git a/src/IGESSelect/IGESSelect_AutoCorrect.cdl b/src/IGESSelect/IGESSelect_AutoCorrect.cdl
index c1bdc0e02c..44677b697a 100644
--- a/src/IGESSelect/IGESSelect_AutoCorrect.cdl
+++ b/src/IGESSelect/IGESSelect_AutoCorrect.cdl
@@ -44,11 +44,11 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable AutoCorrect;
+    Create returns AutoCorrect;
     ---Purpose : Creates an AutoCorrect.
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : corrects entities when it is absolutely
     --           obvious, i.e. non equivoque (by DirChecker and specific
diff --git a/src/IGESSelect/IGESSelect_ChangeLevelList.cdl b/src/IGESSelect/IGESSelect_ChangeLevelList.cdl
index 5ed5ddb70c..34419f36b3 100644
--- a/src/IGESSelect/IGESSelect_ChangeLevelList.cdl
+++ b/src/IGESSelect/IGESSelect_ChangeLevelList.cdl
@@ -33,7 +33,7 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable ChangeLevelList;
+    Create returns ChangeLevelList;
     ---Purpose : Creates a ChangeLevelList, not yet defined
     --           (see SetOldNumber and SetNewNumber)
 
@@ -42,11 +42,11 @@ is
     --           which have a LevelList which contains the value are processed.
     --           Else, all entities attached to a LevelList are.
 
-    OldNumber (me) returns mutable IntParam;
+    OldNumber (me) returns IntParam;
     ---Purpose : Returns the parameter for OldNumber. If not defined (Null
     --           Handle), it will be interpreted as "all level lists"
 
-    SetOldNumber (me : mutable; param : mutable IntParam);
+    SetOldNumber (me : mutable; param : IntParam);
     ---Purpose : Sets a parameter for OldNumber
 
     HasNewNumber (me) returns Boolean;
@@ -54,16 +54,16 @@ is
     --           value for Level Number. Else, the first value of the LevelList
     --           is used as new Level Number.
 
-    NewNumber (me) returns mutable IntParam;
+    NewNumber (me) returns IntParam;
     ---Purpose : Returns the parameter for NewNumber. If not defined (Null
     --           Handle), it will be interpreted as "new value 0"
 
-    SetNewNumber (me : mutable; param : mutable IntParam);
+    SetNewNumber (me : mutable; param : IntParam);
     ---Purpose : Sets a parameter for NewNumber
 
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : considers selected target entities :
     --           If OldNumber is not defined, all entities attached to a
diff --git a/src/IGESSelect/IGESSelect_ChangeLevelNumber.cdl b/src/IGESSelect/IGESSelect_ChangeLevelNumber.cdl
index e49225c47c..5014bdb9e9 100644
--- a/src/IGESSelect/IGESSelect_ChangeLevelNumber.cdl
+++ b/src/IGESSelect/IGESSelect_ChangeLevelNumber.cdl
@@ -30,7 +30,7 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable ChangeLevelNumber;
+    Create returns ChangeLevelNumber;
     ---Purpose : Creates a ChangeLevelNumber, not yet defined
     --           (see SetOldNumber and SetNewNumber)
 
@@ -39,23 +39,23 @@ is
     --           attached to the value of OldNumber will be considered. Else,
     --           all entities but those attached to a Level List will be.
 
-    OldNumber (me) returns mutable IntParam;
+    OldNumber (me) returns IntParam;
     ---Purpose : Returns the parameter for OldNumber. If not defined (Null
     --           Handle), it will be interpreted as "all level numbers"
 
-    SetOldNumber (me : mutable; param : mutable IntParam);
+    SetOldNumber (me : mutable; param : IntParam);
     ---Purpose : Sets a parameter for OldNumber
 
-    NewNumber (me) returns mutable IntParam;
+    NewNumber (me) returns IntParam;
     ---Purpose : Returns the parameter for NewNumber. If not defined (Null
     --           Handle), it will be interpreted as "new value 0"
 
-    SetNewNumber (me : mutable; param : mutable IntParam);
+    SetNewNumber (me : mutable; param : IntParam);
     ---Purpose : Sets a parameter for NewNumber
 
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : considers selected target entities :
     --           If OldNumber is not defined, all entities but those attached
diff --git a/src/IGESSelect/IGESSelect_ComputeStatus.cdl b/src/IGESSelect/IGESSelect_ComputeStatus.cdl
index 3be7152818..05137feedf 100644
--- a/src/IGESSelect/IGESSelect_ComputeStatus.cdl
+++ b/src/IGESSelect/IGESSelect_ComputeStatus.cdl
@@ -29,12 +29,12 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable ComputeStatus;
+    Create returns ComputeStatus;
     ---Purpose : Creates an ComputeStatus, which uses the system Date
 
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : it first evaluates the required values for
     --           Subordinate Status and Use Flag (in Directory Part of each
diff --git a/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cdl b/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cdl
index 0e0fc1feb3..1096c4b1e9 100644
--- a/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cdl
+++ b/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cdl
@@ -33,7 +33,7 @@ is
 
     Create (withmap  : Boolean = Standard_True;
     	    withlist : Boolean = Standard_False)
-    	 returns mutable CounterOfLevelNumber;
+    	 returns CounterOfLevelNumber;
     ---Purpose : Creates a CounterOfLevelNumber, clear, ready to work
     --           <withmap> and <withlist> are transmitted to SignCounter
 
diff --git a/src/IGESSelect/IGESSelect_DispPerDrawing.cdl b/src/IGESSelect/IGESSelect_DispPerDrawing.cdl
index 86c33bbac4..08fad9d5ce 100644
--- a/src/IGESSelect/IGESSelect_DispPerDrawing.cdl
+++ b/src/IGESSelect/IGESSelect_DispPerDrawing.cdl
@@ -28,7 +28,7 @@ uses AsciiString from TCollection, EntityIterator, Graph, SubPartsIterator,
 
 is
 
-    Create returns mutable DispPerDrawing;
+    Create returns DispPerDrawing;
     ---Purpose : Creates a DispPerDrawing
 
     Label (me) returns AsciiString from TCollection;
diff --git a/src/IGESSelect/IGESSelect_DispPerSingleView.cdl b/src/IGESSelect/IGESSelect_DispPerSingleView.cdl
index 23768bd539..9b342fe514 100644
--- a/src/IGESSelect/IGESSelect_DispPerSingleView.cdl
+++ b/src/IGESSelect/IGESSelect_DispPerSingleView.cdl
@@ -29,7 +29,7 @@ uses AsciiString from TCollection, EntityIterator, Graph, SubPartsIterator,
 
 is
 
-    Create returns mutable DispPerSingleView;
+    Create returns DispPerSingleView;
     ---Purpose : Creates a DispPerSingleView
 
     Label (me) returns AsciiString from TCollection;
diff --git a/src/IGESSelect/IGESSelect_Dumper.cdl b/src/IGESSelect/IGESSelect_Dumper.cdl
index ef684d763e..572c914190 100644
--- a/src/IGESSelect/IGESSelect_Dumper.cdl
+++ b/src/IGESSelect/IGESSelect_Dumper.cdl
@@ -24,7 +24,7 @@ uses Transient, AsciiString from TCollection, SessionFile
 
 is
 
-    Create returns mutable Dumper;
+    Create returns Dumper;
     ---Purpose : Creates a Dumper and puts it into the Library of Dumper
 
     WriteOwn (me; file : in out SessionFile; item : Transient) returns Boolean;
@@ -32,7 +32,7 @@ is
     --           Returns True if <item> has been processed, False else
 
     ReadOwn  (me; file : in out SessionFile;
-    	    type : AsciiString from TCollection; item : out mutable Transient)
+    	    type : AsciiString from TCollection; item : out Transient)
     	returns Boolean;
     ---Purpose : Recognizes and Read Own Parameters for Types of package
     --           IGESSelect. Returns True if done and <item> created, False else
diff --git a/src/IGESSelect/IGESSelect_EditDirPart.cdl b/src/IGESSelect/IGESSelect_EditDirPart.cdl
index 608a7a97a4..59392d5ef3 100644
--- a/src/IGESSelect/IGESSelect_EditDirPart.cdl
+++ b/src/IGESSelect/IGESSelect_EditDirPart.cdl
@@ -35,7 +35,7 @@ is
     Load (me; form : EditForm; ent : Transient; model : InterfaceModel)
     	returns Boolean;
 
-    Update (me; form : mutable EditForm; num : Integer;
+    Update (me; form : EditForm; num : Integer;
     	    newval : HAsciiString; enforce : Boolean)
     	returns Boolean  is redefined;
 	-- for dynamically computed values
diff --git a/src/IGESSelect/IGESSelect_EditHeader.cdl b/src/IGESSelect/IGESSelect_EditHeader.cdl
index 394bce7056..d9cd870a83 100644
--- a/src/IGESSelect/IGESSelect_EditHeader.cdl
+++ b/src/IGESSelect/IGESSelect_EditHeader.cdl
@@ -35,7 +35,7 @@ is
     Load (me; form : EditForm; ent : Transient; model : InterfaceModel)
     	returns Boolean;
 
-    Update (me; form : mutable EditForm; num : Integer;
+    Update (me; form : EditForm; num : Integer;
     	    newval : HAsciiString; enforce : Boolean)
     	returns Boolean  is redefined;
 	-- for dynamically computed values
diff --git a/src/IGESSelect/IGESSelect_FloatFormat.cdl b/src/IGESSelect/IGESSelect_FloatFormat.cdl
index 0fe4bb1608..fc8ed8e8d7 100644
--- a/src/IGESSelect/IGESSelect_FloatFormat.cdl
+++ b/src/IGESSelect/IGESSelect_FloatFormat.cdl
@@ -26,7 +26,7 @@ uses CString, AsciiString from TCollection,
 
 is
 
-    Create returns mutable FloatFormat;
+    Create returns FloatFormat;
     ---Purpose : Creates a new FloatFormat, with standard options :
     --           ZeroSuppress, Main Format = %E,
     --           Format between 0.001 and 1000. = %f
diff --git a/src/IGESSelect/IGESSelect_IGESName.cdl b/src/IGESSelect/IGESSelect_IGESName.cdl
index ac05ce3610..8cd131ba62 100644
--- a/src/IGESSelect/IGESSelect_IGESName.cdl
+++ b/src/IGESSelect/IGESSelect_IGESName.cdl
@@ -25,7 +25,7 @@ uses CString, Transient, InterfaceModel
 
 is
 
-    Create returns mutable IGESName;
+    Create returns IGESName;
     ---Purpose : Creates a Signature for IGES Name (reduced to ShortLabel,
     --           without SubscriptLabel or Long Name)
 
diff --git a/src/IGESSelect/IGESSelect_IGESTypeForm.cdl b/src/IGESSelect/IGESSelect_IGESTypeForm.cdl
index 9da345eaed..15c3942301 100644
--- a/src/IGESSelect/IGESSelect_IGESTypeForm.cdl
+++ b/src/IGESSelect/IGESSelect_IGESTypeForm.cdl
@@ -26,7 +26,7 @@ uses CString, Transient, InterfaceModel
 
 is
 
-    Create (withform : Boolean = Standard_True) returns mutable IGESTypeForm;
+    Create (withform : Boolean = Standard_True) returns IGESTypeForm;
     ---Purpose : Creates a Signature for IGES Type & Form Numbers
     --           If <withform> is False, for IGES Type Number only
 
diff --git a/src/IGESSelect/IGESSelect_RebuildDrawings.cdl b/src/IGESSelect/IGESSelect_RebuildDrawings.cdl
index 135882a4a9..f251a9bfa0 100644
--- a/src/IGESSelect/IGESSelect_RebuildDrawings.cdl
+++ b/src/IGESSelect/IGESSelect_RebuildDrawings.cdl
@@ -32,11 +32,11 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable RebuildDrawings;
+    Create returns RebuildDrawings;
     ---Purpose : Creates an RebuildDrawings, which uses the system Date
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : Rebuilds the original Drawings
 
diff --git a/src/IGESSelect/IGESSelect_RebuildGroups.cdl b/src/IGESSelect/IGESSelect_RebuildGroups.cdl
index 6810475ee7..642a9aaaa1 100644
--- a/src/IGESSelect/IGESSelect_RebuildGroups.cdl
+++ b/src/IGESSelect/IGESSelect_RebuildGroups.cdl
@@ -32,11 +32,11 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable RebuildGroups;
+    Create returns RebuildGroups;
     ---Purpose : Creates an RebuildGroups, which uses the system Date
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : Rebuilds the original groups
 
diff --git a/src/IGESSelect/IGESSelect_RemoveCurves.cdl b/src/IGESSelect/IGESSelect_RemoveCurves.cdl
index 829b74b567..168076bdb0 100644
--- a/src/IGESSelect/IGESSelect_RemoveCurves.cdl
+++ b/src/IGESSelect/IGESSelect_RemoveCurves.cdl
@@ -24,13 +24,13 @@ uses AsciiString from TCollection,
  
 is
 
-    Create (UV : Boolean) returns mutable RemoveCurves;
+    Create (UV : Boolean) returns RemoveCurves;
     ---Purpose : Creates a RemoveCurves from Faces (141/142/143/144)
     --           UV True  : Removes UV Curves (pcurves)
     --           UV False : Removes 3D Curves
 
     Performing (me; ctx : in out ContextModif;
-                target  : mutable IGESModel;
+                target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : Removes the Curves
  
diff --git a/src/IGESSelect/IGESSelect_SelectBasicGeom.cdl b/src/IGESSelect/IGESSelect_SelectBasicGeom.cdl
index 11f780c491..b0a46fa759 100644
--- a/src/IGESSelect/IGESSelect_SelectBasicGeom.cdl
+++ b/src/IGESSelect/IGESSelect_SelectBasicGeom.cdl
@@ -35,7 +35,7 @@ uses AsciiString from TCollection, Transient, EntityIterator, Graph,
 
 is
 
-    Create (mode : Integer) returns mutable SelectBasicGeom;
+    Create (mode : Integer) returns SelectBasicGeom;
     ---Purpose : Creates a SelectBasicGeom, which allways works recursively
     --           mode = -1 : Returns Surfaces (without trimming)
     --           mode = +1 : Returns Curves 3D (free or bound of surface)
diff --git a/src/IGESSelect/IGESSelect_SelectBypassGroup.cdl b/src/IGESSelect/IGESSelect_SelectBypassGroup.cdl
index a43e2e3b4f..a6281cda19 100644
--- a/src/IGESSelect/IGESSelect_SelectBypassGroup.cdl
+++ b/src/IGESSelect/IGESSelect_SelectBypassGroup.cdl
@@ -31,7 +31,7 @@ raises InterfaceError
 
 is
 
-    Create (level : Integer = 0) returns mutable SelectBypassGroup;
+    Create (level : Integer = 0) returns SelectBypassGroup;
     ---Purpose : Creates a SelectBypassGroup, by default all level
     --           (level = 1 explores at first level)
 
diff --git a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.cdl b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.cdl
index 185423e06a..f2e65fb843 100644
--- a/src/IGESSelect/IGESSelect_SelectBypassSubfigure.cdl
+++ b/src/IGESSelect/IGESSelect_SelectBypassSubfigure.cdl
@@ -37,7 +37,7 @@ raises InterfaceError
 
 is
 
-    Create (level : Integer = 0) returns mutable SelectBypassSubfigure;
+    Create (level : Integer = 0) returns SelectBypassSubfigure;
     ---Purpose : Creates a SelectBypassSubfigure, by default all level
     --           (level = 1 explores at first level)
 
diff --git a/src/IGESSelect/IGESSelect_SelectDrawingFrom.cdl b/src/IGESSelect/IGESSelect_SelectDrawingFrom.cdl
index 5198eeda17..0e285a19c7 100644
--- a/src/IGESSelect/IGESSelect_SelectDrawingFrom.cdl
+++ b/src/IGESSelect/IGESSelect_SelectDrawingFrom.cdl
@@ -26,7 +26,7 @@ raises InterfaceError
 
 is
 
-    Create returns mutable SelectDrawingFrom;
+    Create returns SelectDrawingFrom;
     ---Purpose : Creates a SelectDrawingFrom
 
     HasUniqueResult (me) returns Boolean  is redefined protected;
diff --git a/src/IGESSelect/IGESSelect_SelectFaces.cdl b/src/IGESSelect/IGESSelect_SelectFaces.cdl
index c7963c9e6a..316ac99d11 100644
--- a/src/IGESSelect/IGESSelect_SelectFaces.cdl
+++ b/src/IGESSelect/IGESSelect_SelectFaces.cdl
@@ -32,7 +32,7 @@ uses AsciiString from TCollection, Transient, EntityIterator, Graph
 is
 
 
-    Create returns mutable  SelectFaces;
+    Create returns  SelectFaces;
 
 
     Explore (me; level : Integer; ent : Transient; G : Graph;
diff --git a/src/IGESSelect/IGESSelect_SelectFromDrawing.cdl b/src/IGESSelect/IGESSelect_SelectFromDrawing.cdl
index 0cf8833733..166b399603 100644
--- a/src/IGESSelect/IGESSelect_SelectFromDrawing.cdl
+++ b/src/IGESSelect/IGESSelect_SelectFromDrawing.cdl
@@ -27,7 +27,7 @@ raises InterfaceError
 
 is
 
-    Create returns mutable SelectFromDrawing;
+    Create returns SelectFromDrawing;
     ---Purpose : Creates a SelectFromDrawing
 
     RootResult (me; G : Graph) returns EntityIterator  raises InterfaceError;
diff --git a/src/IGESSelect/IGESSelect_SelectFromSingleView.cdl b/src/IGESSelect/IGESSelect_SelectFromSingleView.cdl
index c8170c3fef..7af7cfa208 100644
--- a/src/IGESSelect/IGESSelect_SelectFromSingleView.cdl
+++ b/src/IGESSelect/IGESSelect_SelectFromSingleView.cdl
@@ -27,7 +27,7 @@ raises InterfaceError
 
 is
 
-    Create returns mutable SelectFromSingleView;
+    Create returns SelectFromSingleView;
     ---Purpose : Creates a SelectFromSingleView
 
     RootResult (me; G : Graph) returns EntityIterator  raises InterfaceError;
diff --git a/src/IGESSelect/IGESSelect_SelectLevelNumber.cdl b/src/IGESSelect/IGESSelect_SelectLevelNumber.cdl
index 5be59c3a2b..6659e4bc7e 100644
--- a/src/IGESSelect/IGESSelect_SelectLevelNumber.cdl
+++ b/src/IGESSelect/IGESSelect_SelectLevelNumber.cdl
@@ -29,14 +29,14 @@ uses AsciiString from TCollection, Transient, InterfaceModel, IntParam
 
 is
 
-    Create returns mutable SelectLevelNumber;
+    Create returns SelectLevelNumber;
     ---Purpose : Creates a SelectLevelNumber, with no Level criterium : see
     --           SetLevelNumber. Empty, this selection filters nothing.
 
-    SetLevelNumber (me : mutable; levnum : mutable IntParam);
+    SetLevelNumber (me : mutable; levnum : IntParam);
     ---Purpose : Sets a Parameter as Level criterium
 
-    LevelNumber (me) returns mutable IntParam;
+    LevelNumber (me) returns IntParam;
     ---Purpose : Returns the Level criterium. NullHandle if not yet set
     --           (interpreted as Level = 0 : no level number attached)
 
diff --git a/src/IGESSelect/IGESSelect_SelectName.cdl b/src/IGESSelect/IGESSelect_SelectName.cdl
index 54e392f1a3..922bfc4be2 100644
--- a/src/IGESSelect/IGESSelect_SelectName.cdl
+++ b/src/IGESSelect/IGESSelect_SelectName.cdl
@@ -27,7 +27,7 @@ uses AsciiString from TCollection, HAsciiString from TCollection,
 
 is
 
-    Create returns mutable SelectName;
+    Create returns SelectName;
     ---Purpose : Creates an empty SelectName : every entity is considered
     --           good (no filter active)
 
diff --git a/src/IGESSelect/IGESSelect_SelectPCurves.cdl b/src/IGESSelect/IGESSelect_SelectPCurves.cdl
index a4cca8a9f6..3ead4fcf3f 100644
--- a/src/IGESSelect/IGESSelect_SelectPCurves.cdl
+++ b/src/IGESSelect/IGESSelect_SelectPCurves.cdl
@@ -24,7 +24,7 @@ uses AsciiString from TCollection, Transient, EntityIterator, Graph
 
 is
 
-    Create (basic : Boolean) returns mutable SelectPCurves;
+    Create (basic : Boolean) returns SelectPCurves;
     ---Purpose : Creates a SelectPCurves
     --           basic True  : lists all the components of pcurves
     --           basic False : lists the uppest level definitions
diff --git a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cdl b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cdl
index b9fcb76039..6363568701 100644
--- a/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cdl
+++ b/src/IGESSelect/IGESSelect_SelectSingleViewFrom.cdl
@@ -27,7 +27,7 @@ raises InterfaceError
 
 is
 
-    Create returns mutable SelectSingleViewFrom;
+    Create returns SelectSingleViewFrom;
     ---Purpose : Creates a SelectSingleViewFrom
 
     HasUniqueResult (me) returns Boolean  is redefined protected;
diff --git a/src/IGESSelect/IGESSelect_SelectSubordinate.cdl b/src/IGESSelect/IGESSelect_SelectSubordinate.cdl
index 3b05da8e78..443ed0eddb 100644
--- a/src/IGESSelect/IGESSelect_SelectSubordinate.cdl
+++ b/src/IGESSelect/IGESSelect_SelectSubordinate.cdl
@@ -32,7 +32,7 @@ uses AsciiString from TCollection, Transient, InterfaceModel
  
 is
  
-    Create (status : Integer) returns mutable SelectSubordinate;
+    Create (status : Integer) returns SelectSubordinate;
     ---Purpose : Creates a SelectSubordinate with a status to be sorted
 
     Status (me) returns Integer;
diff --git a/src/IGESSelect/IGESSelect_SelectVisibleStatus.cdl b/src/IGESSelect/IGESSelect_SelectVisibleStatus.cdl
index f9678b75a2..4f46a75690 100644
--- a/src/IGESSelect/IGESSelect_SelectVisibleStatus.cdl
+++ b/src/IGESSelect/IGESSelect_SelectVisibleStatus.cdl
@@ -25,7 +25,7 @@ uses AsciiString from TCollection, Transient, InterfaceModel
 
 is
 
-    Create returns mutable SelectVisibleStatus;
+    Create returns SelectVisibleStatus;
     ---Purpose : Creates a SelectVisibleStatus
 
     Sort (me; rank : Integer; ent : Transient; model : InterfaceModel)
diff --git a/src/IGESSelect/IGESSelect_SetGlobalParameter.cdl b/src/IGESSelect/IGESSelect_SetGlobalParameter.cdl
index 54e1d87101..597095bd01 100644
--- a/src/IGESSelect/IGESSelect_SetGlobalParameter.cdl
+++ b/src/IGESSelect/IGESSelect_SetGlobalParameter.cdl
@@ -32,7 +32,7 @@ uses AsciiString from TCollection, HAsciiString from TCollection,
 
 is
 
-    Create (numpar : Integer) returns mutable SetGlobalParameter;
+    Create (numpar : Integer) returns SetGlobalParameter;
     ---Purpose : Creates an SetGlobalParameter, to be applied on Global
     --           Parameter <numpar>
 
@@ -40,15 +40,15 @@ is
     ---Purpose : Returns the global parameter number to which this modifiers
     --           applies
 
-    SetValue (me : mutable; text : mutable HAsciiString);
+    SetValue (me : mutable; text : HAsciiString);
     ---Purpose : Sets a Text Parameter for the new value
 
-    Value (me) returns mutable HAsciiString;
+    Value (me) returns HAsciiString;
     ---Purpose : Returns the value to set to the global parameter (Text Param)
 
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : only <target> is used : the form of the new
     --           value is checked regarding the parameter number (given at
diff --git a/src/IGESSelect/IGESSelect_SetLabel.cdl b/src/IGESSelect/IGESSelect_SetLabel.cdl
index 9c1df63a31..b537e0d1c0 100644
--- a/src/IGESSelect/IGESSelect_SetLabel.cdl
+++ b/src/IGESSelect/IGESSelect_SetLabel.cdl
@@ -33,7 +33,7 @@ is
     --           Mode : see Purpose of the class
 
     Performing (me; ctx : in out ContextModif;
-                target  : mutable IGESModel;
+                target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : Sets or Clears the Label
 
diff --git a/src/IGESSelect/IGESSelect_SetVersion5.cdl b/src/IGESSelect/IGESSelect_SetVersion5.cdl
index 4ebaeb2537..be840e990f 100644
--- a/src/IGESSelect/IGESSelect_SetVersion5.cdl
+++ b/src/IGESSelect/IGESSelect_SetVersion5.cdl
@@ -27,12 +27,12 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable SetVersion5;
+    Create returns SetVersion5;
     ---Purpose : Creates an SetVersion5, which uses the system Date for Last
     --           Change Date
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : only <target> is used : IGES Version (coded)
     --           is upgraded to 5.1 if it is older, and it this case the new
diff --git a/src/IGESSelect/IGESSelect_SignLevelNumber.cdl b/src/IGESSelect/IGESSelect_SignLevelNumber.cdl
index c5c0f2dc8e..16f9e90f52 100644
--- a/src/IGESSelect/IGESSelect_SignLevelNumber.cdl
+++ b/src/IGESSelect/IGESSelect_SignLevelNumber.cdl
@@ -27,7 +27,7 @@ uses CString, Transient, AsciiString, InterfaceModel
 
 is
 
-    Create (countmode : Boolean) returns mutable SignLevelNumber;
+    Create (countmode : Boolean) returns SignLevelNumber;
     ---Purpose : Creates a SignLevelNumber
     --           <countmode> True : values are naturally displayed
     --           <countmode> False: values are separated by slashes
diff --git a/src/IGESSelect/IGESSelect_SignStatus.cdl b/src/IGESSelect/IGESSelect_SignStatus.cdl
index b549e4c378..5f12d89f5e 100644
--- a/src/IGESSelect/IGESSelect_SignStatus.cdl
+++ b/src/IGESSelect/IGESSelect_SignStatus.cdl
@@ -35,7 +35,7 @@ uses CString, Transient, AsciiString, InterfaceModel
 
 is
 
-    Create returns mutable SignStatus;
+    Create returns SignStatus;
 
     Value   (me; ent : any Transient; model : InterfaceModel) returns CString;
     ---Purpose : Returns the value (see above)
diff --git a/src/IGESSelect/IGESSelect_SplineToBSpline.cdl b/src/IGESSelect/IGESSelect_SplineToBSpline.cdl
index c1eca43c87..f01f936076 100644
--- a/src/IGESSelect/IGESSelect_SplineToBSpline.cdl
+++ b/src/IGESSelect/IGESSelect_SplineToBSpline.cdl
@@ -35,7 +35,7 @@ uses AsciiString from TCollection,
 
 is
 
-    Create (tryC2 : Boolean) returns mutable SplineToBSpline;
+    Create (tryC2 : Boolean) returns SplineToBSpline;
     ---Purpose : Creates a Transformer SplineToBSpline. If <tryC2> is True,
     --           it will in addition try to upgrade continuity up to C2.
 
@@ -44,11 +44,11 @@ is
 
     Perform (me : mutable; G : Graph; protocol : Protocol from Interface;
     	     checks : in out CheckIterator;
-    	     newmod : out mutable InterfaceModel)  returns Boolean;
+    	     newmod : out InterfaceModel)  returns Boolean;
     ---Purpose : Performs the transformation, if there is at least one Spline
     --           Curve (112) or Surface (126). Does nothing if there is none.
 
-    Updated (me; entfrom : Transient; entto : out mutable Transient)
+    Updated (me; entfrom : Transient; entto : out Transient)
     	returns Boolean;
     ---Purpose : Returns the transformed entities.
     --           If original data contained no Spline Curve or Surface,
diff --git a/src/IGESSelect/IGESSelect_UpdateCreationDate.cdl b/src/IGESSelect/IGESSelect_UpdateCreationDate.cdl
index 53e5b5dbfd..528ec9a5ce 100644
--- a/src/IGESSelect/IGESSelect_UpdateCreationDate.cdl
+++ b/src/IGESSelect/IGESSelect_UpdateCreationDate.cdl
@@ -27,11 +27,11 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable UpdateCreationDate;
+    Create returns UpdateCreationDate;
     ---Purpose : Creates an UpdateCreationDate, which uses the system Date
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : only <target> is used : the system Date
     --           is set to Global Section Item n0 18.
diff --git a/src/IGESSelect/IGESSelect_UpdateFileName.cdl b/src/IGESSelect/IGESSelect_UpdateFileName.cdl
index a064f6929c..9719b2d8d9 100644
--- a/src/IGESSelect/IGESSelect_UpdateFileName.cdl
+++ b/src/IGESSelect/IGESSelect_UpdateFileName.cdl
@@ -29,11 +29,11 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable UpdateFileName;
+    Create returns UpdateFileName;
     ---Purpose : Creates an UpdateFileName, which uses the system Date
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : only <target> is used : the system Date
     --           is set to Global Section Item n0 18.
diff --git a/src/IGESSelect/IGESSelect_UpdateLastChange.cdl b/src/IGESSelect/IGESSelect_UpdateLastChange.cdl
index aabc7f8242..e0228f2392 100644
--- a/src/IGESSelect/IGESSelect_UpdateLastChange.cdl
+++ b/src/IGESSelect/IGESSelect_UpdateLastChange.cdl
@@ -29,11 +29,11 @@ uses AsciiString from TCollection,
 
 is
 
-    Create returns mutable UpdateLastChange;
+    Create returns UpdateLastChange;
     ---Purpose : Creates an UpdateLastChange, which uses the system Date
 
     Performing (me; ctx : in out ContextModif;
-    	        target  : mutable IGESModel;
+    	        target  : IGESModel;
                 TC      : in out CopyTool);
     ---Purpose : Specific action : only <target> is used : the system Date
     --           is set to Global Section Item n0 25. Also sets IGES Version
diff --git a/src/IGESSelect/IGESSelect_ViewSorter.cdl b/src/IGESSelect/IGESSelect_ViewSorter.cdl
index cfd3ab3634..668d434a1b 100644
--- a/src/IGESSelect/IGESSelect_ViewSorter.cdl
+++ b/src/IGESSelect/IGESSelect_ViewSorter.cdl
@@ -32,7 +32,7 @@ uses Transient, HSequenceOfTransient,
 
 is
 
-    Create returns mutable ViewSorter;
+    Create returns ViewSorter;
     ---Purpose : Creates a ViewSorter, empty. SetModel remains to be called
 
     SetModel (me : mutable; model : IGESModel);
diff --git a/src/IGESSelect/IGESSelect_WorkLibrary.cdl b/src/IGESSelect/IGESSelect_WorkLibrary.cdl
index 45d27043f2..a8cdd18d3f 100644
--- a/src/IGESSelect/IGESSelect_WorkLibrary.cdl
+++ b/src/IGESSelect/IGESSelect_WorkLibrary.cdl
@@ -26,12 +26,12 @@ uses CString, Transient,
 is
 
     Create (modefnes : Boolean = Standard_False)
-    	returns mutable WorkLibrary from IGESSelect;
+    	returns WorkLibrary from IGESSelect;
     ---Purpose : Creates a IGES WorkLibrary
     --           If <modefnes> is given as True, it will work for FNES
 
     ReadFile (me; name : CString;
-    	      model    : out mutable InterfaceModel;
+    	      model    : out InterfaceModel;
     	      protocol : Protocol from Interface)
     	  returns Integer;
     ---Purpose : Reads a IGES File and returns a IGES Model (into <mod>),
diff --git a/src/IGESSolid/IGESSolid_Block.cdl b/src/IGESSolid/IGESSolid_Block.cdl
index ed22dd27f5..770d1b1a96 100644
--- a/src/IGESSolid/IGESSolid_Block.cdl
+++ b/src/IGESSolid/IGESSolid_Block.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-        Create returns mutable Block;
+        Create returns Block;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_BooleanTree.cdl b/src/IGESSolid/IGESSolid_BooleanTree.cdl
index b1c7c137fd..a4a1ba7ad7 100644
--- a/src/IGESSolid/IGESSolid_BooleanTree.cdl
+++ b/src/IGESSolid/IGESSolid_BooleanTree.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable BooleanTree;
+        Create returns BooleanTree;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_ConeFrustum.cdl b/src/IGESSolid/IGESSolid_ConeFrustum.cdl
index 47adc770a9..363d3deb2c 100644
--- a/src/IGESSolid/IGESSolid_ConeFrustum.cdl
+++ b/src/IGESSolid/IGESSolid_ConeFrustum.cdl
@@ -32,7 +32,7 @@ uses
 
 is
 
-        Create returns mutable ConeFrustum;
+        Create returns ConeFrustum;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_ConicalSurface.cdl b/src/IGESSolid/IGESSolid_ConicalSurface.cdl
index a50685349a..566194e72d 100644
--- a/src/IGESSolid/IGESSolid_ConicalSurface.cdl
+++ b/src/IGESSolid/IGESSolid_ConicalSurface.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-        Create returns mutable ConicalSurface;
+        Create returns ConicalSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_Cylinder.cdl b/src/IGESSolid/IGESSolid_Cylinder.cdl
index 7fddbe02e4..47174f27b0 100644
--- a/src/IGESSolid/IGESSolid_Cylinder.cdl
+++ b/src/IGESSolid/IGESSolid_Cylinder.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable Cylinder;
+        Create returns Cylinder;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_CylindricalSurface.cdl b/src/IGESSolid/IGESSolid_CylindricalSurface.cdl
index fd2801a815..e3a5ff6a9e 100644
--- a/src/IGESSolid/IGESSolid_CylindricalSurface.cdl
+++ b/src/IGESSolid/IGESSolid_CylindricalSurface.cdl
@@ -27,7 +27,7 @@ uses
 
 is
 
-        Create returns mutable CylindricalSurface;
+        Create returns CylindricalSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_EdgeList.cdl b/src/IGESSolid/IGESSolid_EdgeList.cdl
index b5b97a1469..6223011f16 100644
--- a/src/IGESSolid/IGESSolid_EdgeList.cdl
+++ b/src/IGESSolid/IGESSolid_EdgeList.cdl
@@ -31,7 +31,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable EdgeList;
+        Create returns EdgeList;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_Ellipsoid.cdl b/src/IGESSolid/IGESSolid_Ellipsoid.cdl
index a2a3f2b58e..07a84f67ba 100644
--- a/src/IGESSolid/IGESSolid_Ellipsoid.cdl
+++ b/src/IGESSolid/IGESSolid_Ellipsoid.cdl
@@ -32,7 +32,7 @@ uses
 
 is
 
-        Create returns mutable Ellipsoid;
+        Create returns Ellipsoid;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_Face.cdl b/src/IGESSolid/IGESSolid_Face.cdl
index b2c067869c..9874d94f17 100644
--- a/src/IGESSolid/IGESSolid_Face.cdl
+++ b/src/IGESSolid/IGESSolid_Face.cdl
@@ -29,7 +29,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable Face;
+        Create returns Face;
 
             -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_GeneralModule.cdl b/src/IGESSolid/IGESSolid_GeneralModule.cdl
index 0293b17ded..55007ea62f 100644
--- a/src/IGESSolid/IGESSolid_GeneralModule.cdl
+++ b/src/IGESSolid/IGESSolid_GeneralModule.cdl
@@ -25,7 +25,7 @@ uses OStream,
 
 is
 
-    Create returns mutable GeneralModule from IGESSolid;
+    Create returns GeneralModule from IGESSolid;
     ---Purpose : Creates a GeneralModule from IGESSolid and puts it into GeneralLib
 
     OwnSharedCase  (me; CN : Integer; ent : IGESEntity;
@@ -43,12 +43,12 @@ is
     ---Purpose : Performs Specific Semantic Check for each type of Entity
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     OwnCopyCase (me; CN : Integer;
-    	         entfrom : IGESEntity; entto : mutable IGESEntity;
+    	         entfrom : IGESEntity; entto : IGESEntity;
     	         TC : in out CopyTool);
     ---Purpose : Copies parameters which are specific of each Type of Entity
 
diff --git a/src/IGESSolid/IGESSolid_Loop.cdl b/src/IGESSolid/IGESSolid_Loop.cdl
index c7b0f8d231..f1c88172a0 100644
--- a/src/IGESSolid/IGESSolid_Loop.cdl
+++ b/src/IGESSolid/IGESSolid_Loop.cdl
@@ -36,7 +36,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable Loop;
+        Create returns Loop;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_ManifoldSolid.cdl b/src/IGESSolid/IGESSolid_ManifoldSolid.cdl
index 5da75cc08f..0882402151 100644
--- a/src/IGESSolid/IGESSolid_ManifoldSolid.cdl
+++ b/src/IGESSolid/IGESSolid_ManifoldSolid.cdl
@@ -31,7 +31,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable ManifoldSolid;
+        Create returns ManifoldSolid;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_PlaneSurface.cdl b/src/IGESSolid/IGESSolid_PlaneSurface.cdl
index 1737381825..32c04dbdc4 100644
--- a/src/IGESSolid/IGESSolid_PlaneSurface.cdl
+++ b/src/IGESSolid/IGESSolid_PlaneSurface.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable PlaneSurface;
+        Create returns PlaneSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_Protocol.cdl b/src/IGESSolid/IGESSolid_Protocol.cdl
index 8062a6f1e4..fe6c7cb3bc 100644
--- a/src/IGESSolid/IGESSolid_Protocol.cdl
+++ b/src/IGESSolid/IGESSolid_Protocol.cdl
@@ -22,7 +22,7 @@ uses Type, Protocol from Interface
 
 is
 
-    Create returns mutable Protocol from IGESSolid;
+    Create returns Protocol from IGESSolid;
 
     NbResources (me) returns Integer  is redefined;
     ---Purpose : Gives the count of Resource Protocol. Here, one
diff --git a/src/IGESSolid/IGESSolid_ReadWriteModule.cdl b/src/IGESSolid/IGESSolid_ReadWriteModule.cdl
index 61c8fd2281..6241f83e8b 100644
--- a/src/IGESSolid/IGESSolid_ReadWriteModule.cdl
+++ b/src/IGESSolid/IGESSolid_ReadWriteModule.cdl
@@ -27,13 +27,13 @@ raises DomainError
 
 is
 
-    Create returns mutable ReadWriteModule from IGESSolid;
+    Create returns ReadWriteModule from IGESSolid;
     ---Purpose : Creates a ReadWriteModule & puts it into ReaderLib & WriterLib
 
     CaseIGES (me; typenum, formnum : Integer) returns Integer;
     ---Purpose : Defines Case Numbers for Entities of IGESSolid
 
-    ReadOwnParams (me; CN : Integer; ent : mutable IGESEntity;
+    ReadOwnParams (me; CN : Integer; ent : IGESEntity;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError;
     ---Purpose : Reads own parameters from file for an Entity of IGESSolid
diff --git a/src/IGESSolid/IGESSolid_RightAngularWedge.cdl b/src/IGESSolid/IGESSolid_RightAngularWedge.cdl
index d555163c30..e5fc304e18 100644
--- a/src/IGESSolid/IGESSolid_RightAngularWedge.cdl
+++ b/src/IGESSolid/IGESSolid_RightAngularWedge.cdl
@@ -29,7 +29,7 @@ uses
 
 is
 
-        Create returns mutable RightAngularWedge;
+        Create returns RightAngularWedge;
 
         Init (me         : mutable;
               aSize      : XYZ;
diff --git a/src/IGESSolid/IGESSolid_SelectedComponent.cdl b/src/IGESSolid/IGESSolid_SelectedComponent.cdl
index 519b576177..e8af4ee73c 100644
--- a/src/IGESSolid/IGESSolid_SelectedComponent.cdl
+++ b/src/IGESSolid/IGESSolid_SelectedComponent.cdl
@@ -29,7 +29,7 @@ uses
 
 is
 
-        Create returns mutable SelectedComponent;
+        Create returns SelectedComponent;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_Shell.cdl b/src/IGESSolid/IGESSolid_Shell.cdl
index 8f68a62568..2843712101 100644
--- a/src/IGESSolid/IGESSolid_Shell.cdl
+++ b/src/IGESSolid/IGESSolid_Shell.cdl
@@ -34,7 +34,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable Shell;
+        Create returns Shell;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_SolidAssembly.cdl b/src/IGESSolid/IGESSolid_SolidAssembly.cdl
index e8483aae68..c6b182fc8d 100644
--- a/src/IGESSolid/IGESSolid_SolidAssembly.cdl
+++ b/src/IGESSolid/IGESSolid_SolidAssembly.cdl
@@ -35,7 +35,7 @@ raises DimensionMismatch, OutOfRange
 
 is
 
-        Create returns mutable SolidAssembly;
+        Create returns SolidAssembly;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_SolidInstance.cdl b/src/IGESSolid/IGESSolid_SolidInstance.cdl
index 5008bbc0c0..4dccf8e251 100644
--- a/src/IGESSolid/IGESSolid_SolidInstance.cdl
+++ b/src/IGESSolid/IGESSolid_SolidInstance.cdl
@@ -29,7 +29,7 @@ uses  Integer  -- no one specific type
 
 is
 
-        Create returns mutable SolidInstance;
+        Create returns SolidInstance;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.cdl b/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.cdl
index 18188def5b..fac6bfd063 100644
--- a/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.cdl
+++ b/src/IGESSolid/IGESSolid_SolidOfLinearExtrusion.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-        Create returns mutable SolidOfLinearExtrusion;
+        Create returns SolidOfLinearExtrusion;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_SolidOfRevolution.cdl b/src/IGESSolid/IGESSolid_SolidOfRevolution.cdl
index 7058b6a0c6..96b4fd77ec 100644
--- a/src/IGESSolid/IGESSolid_SolidOfRevolution.cdl
+++ b/src/IGESSolid/IGESSolid_SolidOfRevolution.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-        Create returns mutable SolidOfRevolution;
+        Create returns SolidOfRevolution;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_SpecificModule.cdl b/src/IGESSolid/IGESSolid_SpecificModule.cdl
index 50b1ecc881..6599a452f9 100644
--- a/src/IGESSolid/IGESSolid_SpecificModule.cdl
+++ b/src/IGESSolid/IGESSolid_SpecificModule.cdl
@@ -22,7 +22,7 @@ uses Messenger from Message, IGESEntity, IGESDumper
 
 is
 
-    Create returns mutable SpecificModule from IGESSolid;
+    Create returns SpecificModule from IGESSolid;
     ---Purpose : Creates a SpecificModule from IGESSolid & puts it into SpecificLib
 
     OwnDump (me; CN : Integer; ent : IGESEntity;
diff --git a/src/IGESSolid/IGESSolid_Sphere.cdl b/src/IGESSolid/IGESSolid_Sphere.cdl
index b503b7bc93..c48ab6ef88 100644
--- a/src/IGESSolid/IGESSolid_Sphere.cdl
+++ b/src/IGESSolid/IGESSolid_Sphere.cdl
@@ -27,7 +27,7 @@ uses
 
 is
 
-        Create returns mutable Sphere;
+        Create returns Sphere;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_SphericalSurface.cdl b/src/IGESSolid/IGESSolid_SphericalSurface.cdl
index 5d1bb55f1c..db3435dd74 100644
--- a/src/IGESSolid/IGESSolid_SphericalSurface.cdl
+++ b/src/IGESSolid/IGESSolid_SphericalSurface.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-        Create returns mutable SphericalSurface;
+        Create returns SphericalSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_ToolBlock.cdl b/src/IGESSolid/IGESSolid_ToolBlock.cdl
index bea99667b5..6b748b604b 100644
--- a/src/IGESSolid/IGESSolid_ToolBlock.cdl
+++ b/src/IGESSolid/IGESSolid_ToolBlock.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolBlock, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Block;
+    ReadOwnParams (me; ent : Block;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Block; entto : mutable Block;
+    OwnCopy    (me; entfrom : Block; entto : Block;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolBooleanTree.cdl b/src/IGESSolid/IGESSolid_ToolBooleanTree.cdl
index 6fa0890d23..f4c2e1282d 100644
--- a/src/IGESSolid/IGESSolid_ToolBooleanTree.cdl
+++ b/src/IGESSolid/IGESSolid_ToolBooleanTree.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolBooleanTree, ready to work
 
 
-    ReadOwnParams (me; ent : mutable BooleanTree;
+    ReadOwnParams (me; ent : BooleanTree;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : BooleanTree; entto : mutable BooleanTree;
+    OwnCopy    (me; entfrom : BooleanTree; entto : BooleanTree;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolConeFrustum.cdl b/src/IGESSolid/IGESSolid_ToolConeFrustum.cdl
index 8451f78cfc..e604ddd0b3 100644
--- a/src/IGESSolid/IGESSolid_ToolConeFrustum.cdl
+++ b/src/IGESSolid/IGESSolid_ToolConeFrustum.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolConeFrustum, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ConeFrustum;
+    ReadOwnParams (me; ent : ConeFrustum;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ConeFrustum; entto : mutable ConeFrustum;
+    OwnCopy    (me; entfrom : ConeFrustum; entto : ConeFrustum;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolConicalSurface.cdl b/src/IGESSolid/IGESSolid_ToolConicalSurface.cdl
index 4067de5cc8..a8ea7d645c 100644
--- a/src/IGESSolid/IGESSolid_ToolConicalSurface.cdl
+++ b/src/IGESSolid/IGESSolid_ToolConicalSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolConicalSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ConicalSurface;
+    ReadOwnParams (me; ent : ConicalSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ConicalSurface; entto : mutable ConicalSurface;
+    OwnCopy    (me; entfrom : ConicalSurface; entto : ConicalSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolCylinder.cdl b/src/IGESSolid/IGESSolid_ToolCylinder.cdl
index 3b7f3ecba7..24d7823355 100644
--- a/src/IGESSolid/IGESSolid_ToolCylinder.cdl
+++ b/src/IGESSolid/IGESSolid_ToolCylinder.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCylinder, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Cylinder;
+    ReadOwnParams (me; ent : Cylinder;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Cylinder; entto : mutable Cylinder;
+    OwnCopy    (me; entfrom : Cylinder; entto : Cylinder;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cdl b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cdl
index aac43c49dc..8f7e6ed814 100644
--- a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cdl
+++ b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolCylindricalSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable CylindricalSurface;
+    ReadOwnParams (me; ent : CylindricalSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : CylindricalSurface; entto : mutable CylindricalSurface;
+    OwnCopy    (me; entfrom : CylindricalSurface; entto : CylindricalSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolEdgeList.cdl b/src/IGESSolid/IGESSolid_ToolEdgeList.cdl
index 3fe774650a..d518751b93 100644
--- a/src/IGESSolid/IGESSolid_ToolEdgeList.cdl
+++ b/src/IGESSolid/IGESSolid_ToolEdgeList.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolEdgeList, ready to work
 
 
-    ReadOwnParams (me; ent : mutable EdgeList;
+    ReadOwnParams (me; ent : EdgeList;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : EdgeList; entto : mutable EdgeList;
+    OwnCopy    (me; entfrom : EdgeList; entto : EdgeList;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolEllipsoid.cdl b/src/IGESSolid/IGESSolid_ToolEllipsoid.cdl
index 2d447a5706..77f6a3b00e 100644
--- a/src/IGESSolid/IGESSolid_ToolEllipsoid.cdl
+++ b/src/IGESSolid/IGESSolid_ToolEllipsoid.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolEllipsoid, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Ellipsoid;
+    ReadOwnParams (me; ent : Ellipsoid;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Ellipsoid; entto : mutable Ellipsoid;
+    OwnCopy    (me; entfrom : Ellipsoid; entto : Ellipsoid;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolFace.cdl b/src/IGESSolid/IGESSolid_ToolFace.cdl
index 8db005ec0d..ce52e5fa62 100644
--- a/src/IGESSolid/IGESSolid_ToolFace.cdl
+++ b/src/IGESSolid/IGESSolid_ToolFace.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolFace, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Face;
+    ReadOwnParams (me; ent : Face;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Face; entto : mutable Face;
+    OwnCopy    (me; entfrom : Face; entto : Face;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolLoop.cdl b/src/IGESSolid/IGESSolid_ToolLoop.cdl
index 38d45fcc5c..63d3d7157d 100644
--- a/src/IGESSolid/IGESSolid_ToolLoop.cdl
+++ b/src/IGESSolid/IGESSolid_ToolLoop.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolLoop, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Loop;
+    ReadOwnParams (me; ent : Loop;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Loop; entto : mutable Loop;
+    OwnCopy    (me; entfrom : Loop; entto : Loop;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolManifoldSolid.cdl b/src/IGESSolid/IGESSolid_ToolManifoldSolid.cdl
index e9eb1353c1..f15ad525bd 100644
--- a/src/IGESSolid/IGESSolid_ToolManifoldSolid.cdl
+++ b/src/IGESSolid/IGESSolid_ToolManifoldSolid.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolManifoldSolid, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ManifoldSolid;
+    ReadOwnParams (me; ent : ManifoldSolid;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ManifoldSolid; entto : mutable ManifoldSolid;
+    OwnCopy    (me; entfrom : ManifoldSolid; entto : ManifoldSolid;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolPlaneSurface.cdl b/src/IGESSolid/IGESSolid_ToolPlaneSurface.cdl
index f491230aff..872ad9d668 100644
--- a/src/IGESSolid/IGESSolid_ToolPlaneSurface.cdl
+++ b/src/IGESSolid/IGESSolid_ToolPlaneSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolPlaneSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable PlaneSurface;
+    ReadOwnParams (me; ent : PlaneSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : PlaneSurface; entto : mutable PlaneSurface;
+    OwnCopy    (me; entfrom : PlaneSurface; entto : PlaneSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cdl b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cdl
index 98a9fecfc6..178d14c743 100644
--- a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cdl
+++ b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolRightAngularWedge, ready to work
 
 
-    ReadOwnParams (me; ent : mutable RightAngularWedge;
+    ReadOwnParams (me; ent : RightAngularWedge;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : RightAngularWedge; entto : mutable RightAngularWedge;
+    OwnCopy    (me; entfrom : RightAngularWedge; entto : RightAngularWedge;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolSelectedComponent.cdl b/src/IGESSolid/IGESSolid_ToolSelectedComponent.cdl
index 44bd77b327..6d336186a3 100644
--- a/src/IGESSolid/IGESSolid_ToolSelectedComponent.cdl
+++ b/src/IGESSolid/IGESSolid_ToolSelectedComponent.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSelectedComponent, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SelectedComponent;
+    ReadOwnParams (me; ent : SelectedComponent;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SelectedComponent; entto : mutable SelectedComponent;
+    OwnCopy    (me; entfrom : SelectedComponent; entto : SelectedComponent;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolShell.cdl b/src/IGESSolid/IGESSolid_ToolShell.cdl
index a0d681ac2b..6f3cd21a55 100644
--- a/src/IGESSolid/IGESSolid_ToolShell.cdl
+++ b/src/IGESSolid/IGESSolid_ToolShell.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolShell, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Shell;
+    ReadOwnParams (me; ent : Shell;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Shell; entto : mutable Shell;
+    OwnCopy    (me; entfrom : Shell; entto : Shell;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolSolidAssembly.cdl b/src/IGESSolid/IGESSolid_ToolSolidAssembly.cdl
index 556b2c3d95..a08a8ed7d6 100644
--- a/src/IGESSolid/IGESSolid_ToolSolidAssembly.cdl
+++ b/src/IGESSolid/IGESSolid_ToolSolidAssembly.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSolidAssembly, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SolidAssembly;
+    ReadOwnParams (me; ent : SolidAssembly;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SolidAssembly; entto : mutable SolidAssembly;
+    OwnCopy    (me; entfrom : SolidAssembly; entto : SolidAssembly;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolSolidInstance.cdl b/src/IGESSolid/IGESSolid_ToolSolidInstance.cdl
index 1b024f2f27..019adf931e 100644
--- a/src/IGESSolid/IGESSolid_ToolSolidInstance.cdl
+++ b/src/IGESSolid/IGESSolid_ToolSolidInstance.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSolidInstance, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SolidInstance;
+    ReadOwnParams (me; ent : SolidInstance;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SolidInstance; entto : mutable SolidInstance;
+    OwnCopy    (me; entfrom : SolidInstance; entto : SolidInstance;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cdl b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cdl
index 254018b36f..b662b0451c 100644
--- a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cdl
+++ b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSolidOfLinearExtrusion, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SolidOfLinearExtrusion;
+    ReadOwnParams (me; ent : SolidOfLinearExtrusion;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SolidOfLinearExtrusion; entto : mutable SolidOfLinearExtrusion;
+    OwnCopy    (me; entfrom : SolidOfLinearExtrusion; entto : SolidOfLinearExtrusion;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cdl b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cdl
index 00c704b359..d354d95054 100644
--- a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cdl
+++ b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSolidOfRevolution, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SolidOfRevolution;
+    ReadOwnParams (me; ent : SolidOfRevolution;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SolidOfRevolution; entto : mutable SolidOfRevolution;
+    OwnCopy    (me; entfrom : SolidOfRevolution; entto : SolidOfRevolution;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolSphere.cdl b/src/IGESSolid/IGESSolid_ToolSphere.cdl
index 2147eb57e7..b2651cd95b 100644
--- a/src/IGESSolid/IGESSolid_ToolSphere.cdl
+++ b/src/IGESSolid/IGESSolid_ToolSphere.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSphere, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Sphere;
+    ReadOwnParams (me; ent : Sphere;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Sphere; entto : mutable Sphere;
+    OwnCopy    (me; entfrom : Sphere; entto : Sphere;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolSphericalSurface.cdl b/src/IGESSolid/IGESSolid_ToolSphericalSurface.cdl
index 965af56bf4..d7bd5f910c 100644
--- a/src/IGESSolid/IGESSolid_ToolSphericalSurface.cdl
+++ b/src/IGESSolid/IGESSolid_ToolSphericalSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolSphericalSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable SphericalSurface;
+    ReadOwnParams (me; ent : SphericalSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : SphericalSurface; entto : mutable SphericalSurface;
+    OwnCopy    (me; entfrom : SphericalSurface; entto : SphericalSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolToroidalSurface.cdl b/src/IGESSolid/IGESSolid_ToolToroidalSurface.cdl
index e65a8efb76..9b9de72d80 100644
--- a/src/IGESSolid/IGESSolid_ToolToroidalSurface.cdl
+++ b/src/IGESSolid/IGESSolid_ToolToroidalSurface.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolToroidalSurface, ready to work
 
 
-    ReadOwnParams (me; ent : mutable ToroidalSurface;
+    ReadOwnParams (me; ent : ToroidalSurface;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : ToroidalSurface; entto : mutable ToroidalSurface;
+    OwnCopy    (me; entfrom : ToroidalSurface; entto : ToroidalSurface;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolTorus.cdl b/src/IGESSolid/IGESSolid_ToolTorus.cdl
index 6939ba5c20..28c1d2b77b 100644
--- a/src/IGESSolid/IGESSolid_ToolTorus.cdl
+++ b/src/IGESSolid/IGESSolid_ToolTorus.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolTorus, ready to work
 
 
-    ReadOwnParams (me; ent : mutable Torus;
+    ReadOwnParams (me; ent : Torus;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : Torus; entto : mutable Torus;
+    OwnCopy    (me; entfrom : Torus; entto : Torus;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_ToolVertexList.cdl b/src/IGESSolid/IGESSolid_ToolVertexList.cdl
index c871ee025d..e14143d64d 100644
--- a/src/IGESSolid/IGESSolid_ToolVertexList.cdl
+++ b/src/IGESSolid/IGESSolid_ToolVertexList.cdl
@@ -31,7 +31,7 @@ is
     ---Purpose : Returns a ToolVertexList, ready to work
 
 
-    ReadOwnParams (me; ent : mutable VertexList;
+    ReadOwnParams (me; ent : VertexList;
     	    	   IR : IGESReaderData; PR : in out ParamReader)
     	raises DomainError  is static;
     ---Purpose : Reads own parameters from file. <PR> gives access to them,
@@ -55,7 +55,7 @@ is
     ---Purpose : Performs Specific Semantic Check
 
 
-    OwnCopy    (me; entfrom : VertexList; entto : mutable VertexList;
+    OwnCopy    (me; entfrom : VertexList; entto : VertexList;
     	        TC : in out CopyTool)  is static;
     ---Purpose : Copies Specific Parameters
 
diff --git a/src/IGESSolid/IGESSolid_TopoBuilder.cdl b/src/IGESSolid/IGESSolid_TopoBuilder.cdl
index 244f09a958..ab7b94f8c7 100644
--- a/src/IGESSolid/IGESSolid_TopoBuilder.cdl
+++ b/src/IGESSolid/IGESSolid_TopoBuilder.cdl
@@ -48,11 +48,11 @@ is
     ---Purpose : Returns a Vertex, given its rank
     ---C++ : return const &
 
-    VertexList (me) returns mutable VertexList;
+    VertexList (me) returns VertexList;
     ---Purpose : Returns the VertexList. It can be referenced, but it remains
     --           empty until call to EndShell or EndSolid
 
-    AddEdge (me : in out; curve : mutable IGESEntity; vstart, vend : Integer)
+    AddEdge (me : in out; curve : IGESEntity; vstart, vend : Integer)
     ---Purpose : Adds an Edge (3D) to the EdgeList, defined by a Curve and
     --           two number of Vertex, for start and end
     	raises DomainError  is static;
@@ -61,11 +61,11 @@ is
     NbEdges (me) returns Integer  is static;
     ---Purpose : Returns the count of recorded Edges (3D)
 
-    Edge (me; num : Integer; curve : out mutable IGESEntity;
+    Edge (me; num : Integer; curve : out IGESEntity;
     	      vstart, vend : out Integer)  is static;
     ---Purpose : Returns the definition of an Edge (3D) given its rank
 
-    EdgeList (me) returns mutable EdgeList;
+    EdgeList (me) returns EdgeList;
     ---Purpose : Returns the EdgeList. It can be referenced, but it remains
     --           empty until call to EndShell or EndSolid
 
@@ -95,7 +95,7 @@ is
     --             <edgetype> or <orientation> has not admitted value,
     --             or if no current Loop is defined
 
-    AddCurveUV (me : in out; curve : mutable IGESEntity; iso : Integer)
+    AddCurveUV (me : in out; curve : IGESEntity; iso : Integer)
     ---Purpose : Adds a Parametric Curve (UV) to the current Edge(UV)
     	raises DomainError  is static;
     --           Error if curve is Null or not of an admitted type, or if
@@ -110,7 +110,7 @@ is
     --  Warning : EndLoop should not be called directly but through
     --           SetOuter or AddInner, which work on the current Face
 
-    MakeFace (me : in out; surface : mutable IGESEntity)
+    MakeFace (me : in out; surface : IGESEntity)
     ---Purpose : Begins the definition of a new Face, on a surface
     --           All Loops defined by MakeLoop will be added in it, according
     --           the closing call : SetOuter for the Outer Loop (by default,
@@ -156,11 +156,11 @@ is
     ---Purpose : Closes the whole definition as that of a ManifoldSolid
     --           Its call is exclusive from that of EndSimpleShell
 
-    Shell (me) returns mutable Shell  is static;
+    Shell (me) returns Shell  is static;
     ---Purpose : Returns the current Shell. The current Shell is created empty
     --           by MakeShell and filled by EndShell
 
-    Solid (me) returns mutable ManifoldSolid  is static;
+    Solid (me) returns ManifoldSolid  is static;
     ---Purpose : Returns the current ManifoldSolid. It is created empty by
     --           Create and filled by EndSolid
 
diff --git a/src/IGESSolid/IGESSolid_ToroidalSurface.cdl b/src/IGESSolid/IGESSolid_ToroidalSurface.cdl
index b10a77f770..ded06f1af6 100644
--- a/src/IGESSolid/IGESSolid_ToroidalSurface.cdl
+++ b/src/IGESSolid/IGESSolid_ToroidalSurface.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-        Create returns mutable ToroidalSurface;
+        Create returns ToroidalSurface;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_Torus.cdl b/src/IGESSolid/IGESSolid_Torus.cdl
index a8981c7cb4..820ac3f7bd 100644
--- a/src/IGESSolid/IGESSolid_Torus.cdl
+++ b/src/IGESSolid/IGESSolid_Torus.cdl
@@ -29,7 +29,7 @@ uses
 
 is
 
-        Create returns mutable Torus;
+        Create returns Torus;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESSolid/IGESSolid_VertexList.cdl b/src/IGESSolid/IGESSolid_VertexList.cdl
index 1301f5d50f..af764217ef 100644
--- a/src/IGESSolid/IGESSolid_VertexList.cdl
+++ b/src/IGESSolid/IGESSolid_VertexList.cdl
@@ -31,7 +31,7 @@ raises OutOfRange
 
 is
 
-        Create returns mutable VertexList;
+        Create returns VertexList;
 
         -- Specific Methods pertaining to the class
 
diff --git a/src/IGESToBRep/IGESToBRep_Actor.cdl b/src/IGESToBRep/IGESToBRep_Actor.cdl
index c9350c8070..33ddbc4bd4 100644
--- a/src/IGESToBRep/IGESToBRep_Actor.cdl
+++ b/src/IGESToBRep/IGESToBRep_Actor.cdl
@@ -27,7 +27,7 @@ uses TransientProcess, Binder, InterfaceModel from Interface
 
 is
 
-    Create  returns mutable Actor from IGESToBRep;
+    Create  returns Actor from IGESToBRep;
 
     SetModel (me : mutable; model : InterfaceModel from Interface);
     
@@ -41,8 +41,8 @@ is
 
     Recognize (me : mutable; start : Transient) returns Boolean  is redefined;
 
-    Transfer (me : mutable; start : Transient; TP : mutable TransientProcess)
-    	returns mutable Binder  is redefined;
+    Transfer (me : mutable; start : Transient; TP : TransientProcess)
+    	returns Binder  is redefined;
 
     UsedTolerance (me) returns Real;
     ---Purpose : Returns the tolerance which was actually used, either from
diff --git a/src/IGESToBRep/IGESToBRep_AlgoContainer.cdl b/src/IGESToBRep/IGESToBRep_AlgoContainer.cdl
index c9ebdec08f..75ca7def3b 100644
--- a/src/IGESToBRep/IGESToBRep_AlgoContainer.cdl
+++ b/src/IGESToBRep/IGESToBRep_AlgoContainer.cdl
@@ -23,7 +23,7 @@ uses
     
 is
 
-    Create returns mutable AlgoContainer from IGESToBRep;
+    Create returns AlgoContainer from IGESToBRep;
     	---Purpose: Empty constructor
 	
     SetToolContainer (me: mutable; TC: ToolContainer from IGESToBRep);
diff --git a/src/IGESToBRep/IGESToBRep_BasicCurve.cdl b/src/IGESToBRep/IGESToBRep_BasicCurve.cdl
index 78dc7a17e9..a075af1297 100644
--- a/src/IGESToBRep/IGESToBRep_BasicCurve.cdl
+++ b/src/IGESToBRep/IGESToBRep_BasicCurve.cdl
@@ -74,7 +74,7 @@ is
 
     TransferBasicCurve     (me    : in out; 
     	    	    	    start : IGESEntity from IGESData)
-    	returns mutable Curve from Geom;
+    	returns Curve from Geom;
     ---Purpose :  Transfert  a  IGESEntity which  answer True  to  the
     --         member : IGESToBRep::IsBasicCurve(IGESEntity).  If this
     --         Entity could not be converted, this member returns a NullEntity.
@@ -82,7 +82,7 @@ is
            
     Transfer2dBasicCurve   (me    : in out; 
     	    	    	    start : IGESEntity from IGESData) 
-    	returns mutable Curve from Geom2d;
+    	returns Curve from Geom2d;
     ---Purpose :  Transfert  a  IGESEntity which  answer True  to  the
     --         member : IGESToBRep::IsBasicCurve(IGESEntity).
     --         The IGESEntity must be a curve UV and its associed TRSF must
@@ -91,55 +91,55 @@ is
 	
     TransferBSplineCurve   (me    : in out;
     	    	    	    start : BSplineCurve from IGESGeom)
-    	returns mutable Curve from Geom;
+    	returns Curve from Geom;
 	
     Transfer2dBSplineCurve (me    : in out; 
     	    	    	    start : BSplineCurve from IGESGeom)
-    	returns mutable Curve from Geom2d;
+    	returns Curve from Geom2d;
 	
     TransferCircularArc    (me    : in out; 
     	    	    	    start : CircularArc from IGESGeom)
-    	returns mutable Curve from Geom;
+    	returns Curve from Geom;
 	
     Transfer2dCircularArc  (me    : in out; 
     	    	    	    start : CircularArc from IGESGeom)
-    	returns mutable Curve from Geom2d;
+    	returns Curve from Geom2d;
 	
     TransferConicArc       (me    : in out; 
     	    	    	    start : ConicArc from IGESGeom)
-    	returns mutable Curve from Geom;
+    	returns Curve from Geom;
 	
     Transfer2dConicArc     (me    : in out; 
     	    	    	    start : ConicArc from IGESGeom)
-    	returns mutable Curve from Geom2d;
+    	returns Curve from Geom2d;
 
     TransferCopiousData    (me    : in out; 
     	    	    	    start : CopiousData from IGESGeom)
-    	returns mutable BSplineCurve from Geom;
+    	returns BSplineCurve from Geom;
 	
     Transfer2dCopiousData  (me    : in out; 
     	    	    	    start : CopiousData from IGESGeom)
-    	returns mutable BSplineCurve from Geom2d;
+    	returns BSplineCurve from Geom2d;
 
     TransferLine           (me    : in out; 
     	    	    	    start : Line from IGESGeom)
-    	returns mutable Curve from Geom;
+    	returns Curve from Geom;
 	
     Transfer2dLine         (me    : in out; 
     	    	    	    start : Line from IGESGeom)
-    	returns mutable Curve from Geom2d;
+    	returns Curve from Geom2d;
 
     TransferSplineCurve    (me    : in out; 
     	    	    	    start : SplineCurve from IGESGeom)
-       	returns mutable BSplineCurve from Geom;
+       	returns BSplineCurve from Geom;
 	
     Transfer2dSplineCurve  (me    : in out; 
     	    	    	    start : SplineCurve from IGESGeom)
-    	returns mutable BSplineCurve from Geom2d;
+    	returns BSplineCurve from Geom2d;
 
     TransferTransformation (me    : in out;
     	    	    	    start : TransformationMatrix from IGESGeom)
-    	returns mutable Transformation from Geom;
+    	returns Transformation from Geom;
 	
 	
 end BasicCurve;
diff --git a/src/IGESToBRep/IGESToBRep_BasicSurface.cdl b/src/IGESToBRep/IGESToBRep_BasicSurface.cdl
index 63dffec1a7..ac163c2bda 100644
--- a/src/IGESToBRep/IGESToBRep_BasicSurface.cdl
+++ b/src/IGESToBRep/IGESToBRep_BasicSurface.cdl
@@ -63,49 +63,49 @@ is
 
     TransferBasicSurface   (me    : in out;
     	    	    	    start : IGESEntity from IGESData)
-    returns mutable Surface from Geom;
+    returns Surface from Geom;
     	---Purpose: Returns Surface  from Geom if the last transfer has
     	--          succeded.
      
     TransferPlaneSurface   (me    : in out;
 			    start : PlaneSurface from IGESSolid)
-    returns mutable Plane from Geom;
+    returns Plane from Geom;
     	---Purpose: Returns Plane from Geom if the transfer has
      	--          succeded.
     
     TransferRigthCylindricalSurface(me   : in out;
     	    	    	    	    start: CylindricalSurface from IGESSolid)
-    returns mutable CylindricalSurface from Geom;
+    returns CylindricalSurface from Geom;
     	---Purpose: Returns CylindricalSurface from Geom if the transfer has
      	--          succeded.
     
     TransferRigthConicalSurface    (me   : in out;
     	    	    	    	    start: ConicalSurface from IGESSolid)
-    returns mutable ConicalSurface from Geom;
+    returns ConicalSurface from Geom;
     	---Purpose: Returns ConicalSurface from Geom if the transfer has
      	--          succeded.
     
     TransferSphericalSurface(me   : in out;
     	    	    	    start: SphericalSurface from IGESSolid)
-    returns mutable SphericalSurface from Geom;
+    returns SphericalSurface from Geom;
     	---Purpose: Returns SphericalSurface from Geom if the transfer has
      	--          succeded.
 	
     TransferToroidalSurface (me   : in out;
     	    	    	     start: ToroidalSurface from IGESSolid)
-    returns mutable ToroidalSurface from Geom;
+    returns ToroidalSurface from Geom;
     	---Purpose: Returns SphericalSurface from Geom if the transfer has
      	--          succeded.
     
     TransferSplineSurface   (me   : in out; 
     	    	    	     start: SplineSurface from IGESGeom)
-    returns mutable BSplineSurface from Geom;
+    returns BSplineSurface from Geom;
     	---Purpose: Returns BSplineSurface  from Geom if the transfer has
      	--          succeded.
 
     TransferBSplineSurface  (me   : in out; 
     	    	    	     start: BSplineSurface from IGESGeom)
-    returns mutable BSplineSurface from Geom;
+    returns BSplineSurface from Geom;
     	---Purpose: Returns BSplineSurface  from Geom if the transfer has
     	--          succeded.
 
diff --git a/src/IGESToBRep/IGESToBRep_IGESBoundary.cdl b/src/IGESToBRep/IGESToBRep_IGESBoundary.cdl
index c669e2d34e..9e0c4665f7 100644
--- a/src/IGESToBRep/IGESToBRep_IGESBoundary.cdl
+++ b/src/IGESToBRep/IGESToBRep_IGESBoundary.cdl
@@ -33,10 +33,10 @@ uses
 
 is
 
-    Create returns mutable IGESBoundary from IGESToBRep;
+    Create returns IGESBoundary from IGESToBRep;
     	---Purpose: Empty constructor
 
-    Create (CS: CurveAndSurface from IGESToBRep) returns mutable IGESBoundary from IGESToBRep;
+    Create (CS: CurveAndSurface from IGESToBRep) returns IGESBoundary from IGESToBRep;
     	---Purpose: Empty constructor
 	
     Init (me: mutable; CS            : CurveAndSurface from IGESToBRep;
diff --git a/src/IGESToBRep/IGESToBRep_Reader.cdl b/src/IGESToBRep/IGESToBRep_Reader.cdl
index 1b164af205..77c374feaf 100644
--- a/src/IGESToBRep/IGESToBRep_Reader.cdl
+++ b/src/IGESToBRep/IGESToBRep_Reader.cdl
@@ -44,7 +44,7 @@ is
     Model (me) returns IGESModel;
     ---Purpose : Returns the Model to be worked on.
 
-    SetTransientProcess (me : in out; TP : mutable TransientProcess);
+    SetTransientProcess (me : in out; TP : TransientProcess);
     ---Purpose : Allows to set an already defined TransientProcess
     --           (to be called after LoadFile or SetModel)
 
diff --git a/src/IGESToBRep/IGESToBRep_ToolContainer.cdl b/src/IGESToBRep/IGESToBRep_ToolContainer.cdl
index 85a10a38af..32ab6bc945 100644
--- a/src/IGESToBRep/IGESToBRep_ToolContainer.cdl
+++ b/src/IGESToBRep/IGESToBRep_ToolContainer.cdl
@@ -23,7 +23,7 @@ uses
     
 is
 
-    Create returns mutable ToolContainer from IGESToBRep;
+    Create returns ToolContainer from IGESToBRep;
     	---Purpose: Empty constructor
 	
     IGESBoundary (me) returns IGESBoundary from IGESToBRep is virtual;
diff --git a/src/IntPatch/IntPatch_ALine.cdl b/src/IntPatch/IntPatch_ALine.cdl
index 8c28fc510a..f47a2f4bae 100644
--- a/src/IntPatch/IntPatch_ALine.cdl
+++ b/src/IntPatch/IntPatch_ALine.cdl
@@ -45,7 +45,7 @@ is
 	---Purpose: Creates an analytic intersection line
 	--          when the transitions are In or Out.
     
-    	returns mutable ALine from IntPatch;
+    	returns ALine from IntPatch;
 
 
     Create(C: Curve from IntAna; Tang: Boolean from Standard;
@@ -54,7 +54,7 @@ is
 	---Purpose: Creates an analytic intersection line
 	--          when the transitions are Touch.
     
-    	returns mutable ALine from IntPatch;
+    	returns ALine from IntPatch;
 
 
     Create(C: Curve from IntAna; Tang: Boolean from Standard)
@@ -62,7 +62,7 @@ is
 	---Purpose: Creates an analytic intersection line
 	--          when the transitions are Undecided.
     
-    	returns mutable ALine from IntPatch;
+    	returns ALine from IntPatch;
 
 
     AddVertex(me: mutable; Pnt: Point from IntPatch)
diff --git a/src/IntPatch/IntPatch_GLine.cdl b/src/IntPatch/IntPatch_GLine.cdl
index 2c7a4e8a05..4b541acea8 100644
--- a/src/IntPatch/IntPatch_GLine.cdl
+++ b/src/IntPatch/IntPatch_GLine.cdl
@@ -46,7 +46,7 @@ is
 	---Purpose: Creates a Line as intersection line
 	--          when the transitions are In or Out.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(L: Lin from gp; Tang: Boolean from Standard;
@@ -55,7 +55,7 @@ is
 	---Purpose: Creates a Line as intersection line
 	--          when the transitions are Touch.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(L: Lin from gp; Tang: Boolean from Standard)
@@ -63,7 +63,7 @@ is
 	---Purpose: Creates a Line as intersection line
 	--          when the transitions are Undecided.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(C: Circ from gp; Tang: Boolean from Standard;
@@ -72,7 +72,7 @@ is
 	---Purpose: Creates a circle as intersection line
 	--          when the transitions are In or Out.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(C: Circ from gp; Tang: Boolean from Standard;
@@ -81,7 +81,7 @@ is
 	---Purpose: Creates a circle as intersection line
 	--          when the transitions are Touch.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(C: Circ from gp; Tang: Boolean from Standard)
@@ -89,7 +89,7 @@ is
 	---Purpose: Creates a circle as intersection line
 	--          when the transitions are Undecided.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(E: Elips from gp; Tang: Boolean from Standard;
@@ -98,7 +98,7 @@ is
 	---Purpose: Creates an ellipse as intersection line
 	--          when the transitions are In or Out.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(E: Elips from gp; Tang: Boolean from Standard;
@@ -107,7 +107,7 @@ is
 	---Purpose: Creates an ellispe as intersection line
 	--          when the transitions are Touch.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(E: Elips from gp; Tang: Boolean from Standard)
@@ -115,7 +115,7 @@ is
 	---Purpose: Creates an ellipse as intersection line
 	--          when the transitions are Undecided.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(P: Parab from gp; Tang: Boolean from Standard;
@@ -124,7 +124,7 @@ is
 	---Purpose: Creates a parabola as intersection line
 	--          when the transitions are In or Out.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(P: Parab from gp; Tang: Boolean from Standard;
@@ -133,7 +133,7 @@ is
 	---Purpose: Creates a parabola as intersection line
 	--          when the transitions are Touch.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(P: Parab from gp; Tang: Boolean from Standard)
@@ -141,7 +141,7 @@ is
 	---Purpose: Creates a parabola as intersection line 
 	--          when the transitions are Undecided.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(H: Hypr from gp; Tang: Boolean from Standard;
@@ -150,7 +150,7 @@ is
 	---Purpose: Creates an hyperbola as intersection line
 	--          when the transitions are In or Out.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(H: Hypr from gp; Tang: Boolean from Standard;
@@ -159,7 +159,7 @@ is
 	---Purpose: Creates an hyperbola as intersection line
 	--          when the transitions are Touch.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     Create(H: Hypr from gp; Tang: Boolean from Standard)
@@ -167,7 +167,7 @@ is
 	---Purpose: Creates an hyperbola as  intersection line
 	--          when the transitions are Undecided.
     
-    	returns mutable GLine from IntPatch;
+    	returns GLine from IntPatch;
 
 
     AddVertex(me: mutable; Pnt: Point from IntPatch)
diff --git a/src/IntPatch/IntPatch_RLine.cdl b/src/IntPatch/IntPatch_RLine.cdl
index a1f26cf5f8..894507051a 100644
--- a/src/IntPatch/IntPatch_RLine.cdl
+++ b/src/IntPatch/IntPatch_RLine.cdl
@@ -43,7 +43,7 @@ is
 	---Purpose: Creates a restriction as an intersection line
 	--          when the transitions are In or Out.
     
-    	returns mutable RLine from IntPatch;
+    	returns RLine from IntPatch;
 
 
     Create(Tang: Boolean from Standard;
@@ -52,7 +52,7 @@ is
 	---Purpose: Creates a restriction as an intersection line
 	--          when the transitions are Touch.
     
-    	returns mutable RLine from IntPatch;
+    	returns RLine from IntPatch;
 
 
     Create(Tang: Boolean from Standard)
@@ -60,7 +60,7 @@ is
 	---Purpose: Creates a restriction as an intersection line
 	--          when the transitions are Undecided.
     
-    	returns mutable RLine from IntPatch;
+    	returns RLine from IntPatch;
 
 
     AddVertex(me: mutable; Pnt: Point from IntPatch)
diff --git a/src/IntPatch/IntPatch_WLine.cdl b/src/IntPatch/IntPatch_WLine.cdl
index 62b64dda18..eec3ec1805 100644
--- a/src/IntPatch/IntPatch_WLine.cdl
+++ b/src/IntPatch/IntPatch_WLine.cdl
@@ -43,7 +43,7 @@ is
 	---Purpose: Creates a WLine as an intersection when the 
 	--          transitions are In or Out.
     
-    	returns mutable WLine from IntPatch;
+    	returns WLine from IntPatch;
 
 
     Create(Line: LineOn2S from IntSurf; Tang: Boolean from Standard;
@@ -52,7 +52,7 @@ is
 	---Purpose: Creates a WLine as an intersection when the 
 	--          transitions are Touch.
     
-    	returns mutable WLine from IntPatch;
+    	returns WLine from IntPatch;
 
 
     Create(Line: LineOn2S from IntSurf; Tang: Boolean from Standard)
@@ -60,7 +60,7 @@ is
 	---Purpose: Creates a WLine as an intersection when the 
 	--          transitions are Undecided.
     
-    	returns mutable WLine from IntPatch;
+    	returns WLine from IntPatch;
 
 
     AddVertex(me: mutable; Pnt: Point from IntPatch)
diff --git a/src/IntSurf/IntSurf_LineOn2S.cdl b/src/IntSurf/IntSurf_LineOn2S.cdl
index ed72d650a7..259f6757b5 100644
--- a/src/IntSurf/IntSurf_LineOn2S.cdl
+++ b/src/IntSurf/IntSurf_LineOn2S.cdl
@@ -31,7 +31,7 @@ is
 
     Create (theAllocator: Allocator from IntSurf = 0)
     
-    	returns mutable LineOn2S from IntSurf;
+    	returns LineOn2S from IntSurf;
 	
 
     Add(me: mutable; P: PntOn2S from IntSurf)
@@ -83,7 +83,7 @@ is
 	---Purpose: Keeps in <me> the points 1 to Index-1, and returns
 	--          the items Index to the end.
 
-    	returns mutable LineOn2S from IntSurf
+    	returns LineOn2S from IntSurf
 
     	raises OutOfRange from Standard
 	--- The exception OutOfRange is raised when Index <= 0 or
diff --git a/src/IntTools/IntTools_TopolTool.cdl b/src/IntTools/IntTools_TopolTool.cdl
index 8d9b57444c..fbbec31e55 100644
--- a/src/IntTools/IntTools_TopolTool.cdl
+++ b/src/IntTools/IntTools_TopolTool.cdl
@@ -27,13 +27,13 @@ uses
 raises DomainError from Standard
 
 is
-    Create returns mutable TopolTool from IntTools;
+    Create returns TopolTool from IntTools;
     	---Purpose:
 	--- Empty constructor
 	---
 
     Create(theSurface: HSurface from Adaptor3d)
-    	returns mutable TopolTool from IntTools;
+    	returns TopolTool from IntTools;
 	---Purpose:
 	--- Initializes me by surface
 	---
diff --git a/src/IntWalk/IntWalk_IWLine.cdl b/src/IntWalk/IntWalk_IWLine.cdl
index bf1ef3ce53..89c678967d 100644
--- a/src/IntWalk/IntWalk_IWLine.cdl
+++ b/src/IntWalk/IntWalk_IWLine.cdl
@@ -51,7 +51,7 @@ is
 
     Create (theAllocator: Allocator from IntSurf = 0)
     
-    	returns mutable IWLine;
+    	returns IWLine;
 
 
     Reverse(me : mutable)
@@ -154,7 +154,7 @@ is
     
 	---Purpose: Returns the LineOn2S contained in the walking line.
     
-    	returns mutable LineOn2S from IntSurf
+    	returns LineOn2S from IntSurf
 	---C++: return const&
     	---C++: inline
 	
diff --git a/src/IntWalk/IntWalk_IWalking.cdl b/src/IntWalk/IntWalk_IWalking.cdl
index e501d02d10..0b2a043678 100644
--- a/src/IntWalk/IntWalk_IWalking.cdl
+++ b/src/IntWalk/IntWalk_IWalking.cdl
@@ -215,7 +215,7 @@ is
 		    
     TestArretCadre(me : in out; Umult  : SequenceOfReal from TColStd;
                                 Vmult  : SequenceOfReal from TColStd;
-                                Line   : mutable TheIWLine;
+                                Line   : TheIWLine;
 				Section: in out TheIWFunction;
                                 UV     : in out Vector from math;
                                 Irang  : out Integer from Standard)
@@ -244,7 +244,7 @@ is
                           Psol   : PntOn2S from IntSurf;
 			  Pnts1  : ThePOPIterator;
  			  Section: in out TheIWFunction;
-                          Line   : mutable TheIWLine)
+                          Line   : TheIWLine)
     is static protected;	
 
     ComputeCloseLine(me : in out; Umult  : SequenceOfReal from TColStd;
@@ -257,7 +257,7 @@ is
 
     AddPointInCurrentLine(me ; N           : Integer from Standard;
                                PathPnt     : ThePointOfPath;
-                               CurrentLine : mutable TheIWLine)
+                               CurrentLine : TheIWLine)
     is static protected;
 
     MakeWalkingPoint(me : in out ; Case    : Integer from Standard;
diff --git a/src/IntWalk/IntWalk_PWalking.cdl b/src/IntWalk/IntWalk_PWalking.cdl
index 5f4fc2e2ef..99b7bcd644 100644
--- a/src/IntWalk/IntWalk_PWalking.cdl
+++ b/src/IntWalk/IntWalk_PWalking.cdl
@@ -165,7 +165,7 @@ is
 
     Line(me)
     
-    	returns mutable LineOn2S from IntSurf
+    	returns LineOn2S from IntSurf
 	---C++: inline
 	---C++: return const&
 	
diff --git a/src/Interface/Interface_BitMap.cdl b/src/Interface/Interface_BitMap.cdl
index cc52ef996b..6f5e7a50f5 100644
--- a/src/Interface/Interface_BitMap.cdl
+++ b/src/Interface/Interface_BitMap.cdl
@@ -58,8 +58,8 @@ is
     ---Purpose : Initialize a BitMap from another one
 
     Internals (me; nbitems , nbwords, nbflags : out Integer;
-    	       flags : out mutable HArray1OfInteger;
-    	       names : out mutable HSequenceOfAsciiString);
+    	       flags : out HArray1OfInteger;
+    	       names : out HSequenceOfAsciiString);
     ---Purpose : Returns internal values, used for copying
     --           Flags values start at false
 
diff --git a/src/Interface/Interface_CopyControl.cdl b/src/Interface/Interface_CopyControl.cdl
index 835239d7d5..5ba341f3b2 100644
--- a/src/Interface/Interface_CopyControl.cdl
+++ b/src/Interface/Interface_CopyControl.cdl
@@ -33,12 +33,12 @@ is
     ---Purpose : Clears List of Copy Results. Gets Ready to begin another Copy
     --           Process.
 
-    Bind (me : mutable; ent : Transient; res : mutable Transient)
+    Bind (me : mutable; ent : Transient; res : Transient)
     ---Purpose : Bind a Result to a Starting Entity identified by its Number
     	raises InterfaceError  is deferred;
     --           Error if <num> is already bound or is out of range
 
-    Search (me; ent : Transient; res : out mutable Transient)
+    Search (me; ent : Transient; res : out Transient)
     	returns Boolean  is deferred;
     ---Purpose : Searches for the Result bound to a Startingf Entity identified
     --           by its Number.
diff --git a/src/Interface/Interface_CopyMap.cdl b/src/Interface/Interface_CopyMap.cdl
index ce7712f62e..70ae9675f8 100644
--- a/src/Interface/Interface_CopyMap.cdl
+++ b/src/Interface/Interface_CopyMap.cdl
@@ -27,7 +27,7 @@ raises InterfaceError
 
 is
 
-    Create (amodel : InterfaceModel) returns mutable CopyMap;
+    Create (amodel : InterfaceModel) returns CopyMap;
     ---Purpose : Creates a CopyMap adapted to work from a Model
 
     Clear (me : mutable);
@@ -36,13 +36,13 @@ is
     Model (me) returns InterfaceModel  is static;
     ---Purpose : Returns the InterfaceModel used at Creation time
 
-    Bind (me : mutable; ent : Transient; res : mutable Transient)
+    Bind (me : mutable; ent : Transient; res : Transient)
     ---Purpose : Binds a Starting Entity identified by its Number <num> in the
     --           Starting Model, to a Result of Transfer <res>
     	raises InterfaceError;
     --           Error if <num> is already bound to a result, or is out of range
 
-    Search (me; ent : Transient; res : out mutable Transient)
+    Search (me; ent : Transient; res : out Transient)
     	returns Boolean;
     ---Purpose : Search for the result of a Starting Object (i.e. an Entity,
     --           identified by its Number <num> in the Starting Model)
diff --git a/src/Interface/Interface_CopyTool.cdl b/src/Interface/Interface_CopyTool.cdl
index 6f95f56635..b04fddf4ae 100644
--- a/src/Interface/Interface_CopyTool.cdl
+++ b/src/Interface/Interface_CopyTool.cdl
@@ -65,12 +65,12 @@ is
     Model (me) returns InterfaceModel;
     ---Purpose : Returns the Model on which the CopyTool works
 
-    SetControl (me : in out; othermap : mutable CopyControl);
+    SetControl (me : in out; othermap : CopyControl);
     ---Purpose : Changes the Map of Result for another one. This allows to work
     --           with a more sophisticated Mapping Control than the Standard
     --           one which is CopyMap (e.g. TransferProcess from Transfer)
 
-    Control (me) returns mutable CopyControl;
+    Control (me) returns CopyControl;
     ---Purpose : Returns the object used for Control
 
     	--  --    Basic Operations    -- --
@@ -78,7 +78,7 @@ is
     Clear (me : in out)  is virtual;
     ---Purpose : Clears Transfer List. Gets Ready to begin another Transfer
 
-    NewVoid (me : in out; entfrom : Transient; entto : out mutable Transient)
+    NewVoid (me : in out; entfrom : Transient; entto : out Transient)
     	returns Boolean  is virtual protected;
     ---Purpose : Creates a new void instance (just created) of the same class
     --           as <entfrom>. Uses the general service GeneralModule:NewVoid
@@ -88,7 +88,7 @@ is
     --           
     --           No mapping is managed by this method
 
-    Copy (me : in out; entfrom : Transient; entto : out mutable Transient;
+    Copy (me : in out; entfrom : Transient; entto : out Transient;
     	  mapped : Boolean; errstat : Boolean)
     	returns Boolean  is virtual;
     ---Purpose : Creates the CounterPart of an Entity (by ShallowCopy), Binds
@@ -111,11 +111,11 @@ is
     --           It basically makes a Deep Copy without changing the Types.
     --           It can be redefined for special uses.
 
-    Implied (me : in out; entfrom : Transient; entto : mutable Transient)
+    Implied (me : in out; entfrom : Transient; entto : Transient)
     	is virtual private;
     ---Purpose : Renews the Implied References of one already Copied Entity
 
-    Transferred (me : in out; ent : Transient) returns mutable Transient
+    Transferred (me : in out; ent : Transient) returns Transient
     ---Purpose : Transfers one Entity, if not yet bound to a result
     --           Remark : For an Entity which is reported in the Starting Model,
     --           the ReportEntity will also be copied with its Content if it
@@ -125,7 +125,7 @@ is
     --           This method can raise any kind of Interface exception.
     --           Especially if <ent> is not contained in Starting Model.
 
-    Bind (me : in out; ent : Transient; res : mutable Transient)
+    Bind (me : in out; ent : Transient; res : Transient)
     ---Purpose : Defines a Result for the Transfer of a Starting object.
     --           Used by method Transferred (which performs a normal Copy),
     --           but can also be called to enforce a result : in the latter
@@ -134,7 +134,7 @@ is
     	raises InterfaceError;
     --           Error if a Result is already bound with this Starting Object
 
-    Search (me; ent : Transient; res : out mutable Transient)
+    Search (me; ent : Transient; res : out Transient)
     	returns Boolean;
     ---Purpose : Search for the result of a Starting Object (i.e. an Entity)
     --           Returns True  if a  Result is Bound (and fills "result")
@@ -147,7 +147,7 @@ is
     --           distinghished. ClearLastFlags is also called by Clear.
 
     LastCopiedAfter (me; numfrom : Integer;
-    	ent : out Transient; res : out mutable Transient)  returns Integer;
+    	ent : out Transient; res : out Transient)  returns Integer;
     ---Purpose : Returns an copied Entity and its Result which were operated
     --           after last call to ClearLastFlags. It returns the first
     --           "Last Copied Entity" which Number follows <numfrom>, Zero if
@@ -174,7 +174,7 @@ is
     --           Remark : this concerns only some specific references, such as
     --           "back pointers".
 
-    FillModel (me : in out; bmodel : mutable InterfaceModel)
+    FillModel (me : in out; bmodel : InterfaceModel)
     	raises InterfaceError;
     ---Purpose : Fills a Model with the result of the transfer (TransferList)
     --           Commands copy of Header too, and calls RenewImpliedRefs
diff --git a/src/Interface/Interface_EntityCluster.cdl b/src/Interface/Interface_EntityCluster.cdl
index 36d38ebaf0..ff6f744cd0 100644
--- a/src/Interface/Interface_EntityCluster.cdl
+++ b/src/Interface/Interface_EntityCluster.cdl
@@ -33,18 +33,18 @@ raises OutOfRange, NullObject
 
 is
 
-    Create returns mutable EntityCluster;
+    Create returns EntityCluster;
     ---Purpose : Creates an empty, non-chained, EntityCluster
 
-    Create (ent : any Transient)  returns mutable EntityCluster;
+    Create (ent : any Transient)  returns EntityCluster;
     ---Purpose : Creates a non-chained EntityCluster, filled with one Entity
 
-    Create (ec : mutable EntityCluster)  returns mutable EntityCluster;
+    Create (ec : EntityCluster)  returns EntityCluster;
     ---Purpose : Creates an empty EntityCluster, chained with another one
     --           (that is, put BEFORE this other one in the list)
 
-    Create (ant : any Transient; ec : mutable EntityCluster)
-    	returns mutable EntityCluster;
+    Create (ant : any Transient; ec : EntityCluster)
+    	returns EntityCluster;
     ---Purpose : Creates an EntityCluster, filled with a first Entity, and
     --           chained to another EntityCluster (BEFORE it, as above)
 
@@ -102,7 +102,7 @@ is
     HasNext (me) returns Boolean  is static private;
     ---Purpose : Returns True if a Cluster has a Next
 
-    Next (me) returns mutable EntityCluster  is static private;
+    Next (me) returns EntityCluster  is static private;
     ---Purpose : Returns Next Cluster in the chain
 
 fields
diff --git a/src/Interface/Interface_FileReaderData.cdl b/src/Interface/Interface_FileReaderData.cdl
index 3a1e5b435b..ad0602c9f1 100644
--- a/src/Interface/Interface_FileReaderData.cdl
+++ b/src/Interface/Interface_FileReaderData.cdl
@@ -139,7 +139,7 @@ is
     --           (sublists are not objects, but internal descriptions)
 
     ParamEntity (me; num, nump : Integer)
-    	returns mutable Transient  raises NoSuchObject  is static;
+    	returns Transient  raises NoSuchObject  is static;
     ---Purpose : Returns the StepEntity referenced by a parameter
     --           Error if none
     ---C++ : return const &
@@ -161,11 +161,11 @@ is
 
     	-- --   binding empty entities before loading model   -- --
 
-    BoundEntity (me; num : Integer) returns mutable Transient;
+    BoundEntity (me; num : Integer) returns Transient;
     ---Purpose : Returns the entity bound to a record, set by SetEntities
     ---C++ : return const &
 
-    BindEntity (me : mutable; num : Integer; ent : mutable Transient);
+    BindEntity (me : mutable; num : Integer; ent : Transient);
     ---Purpose : Binds an entity to a record
 
     SetErrorLoad (me : mutable; val : Boolean);
diff --git a/src/Interface/Interface_FileReaderTool.cdl b/src/Interface/Interface_FileReaderTool.cdl
index f2c526af53..613429ccd1 100644
--- a/src/Interface/Interface_FileReaderTool.cdl
+++ b/src/Interface/Interface_FileReaderTool.cdl
@@ -43,20 +43,20 @@ is
     Initialize returns FileReaderTool  from Interface;
     ---Purpose: Constructor; sets default fields
 
-    SetData (me : in out; reader : mutable FileReaderData;
+    SetData (me : in out; reader : FileReaderData;
     	     protocol : Protocol from Interface);
     ---Purpose : Sets Data to a FileReaderData. Works with a Protocol
 
     Protocol (me) returns Protocol from Interface;
     ---Purpose : Returns the Protocol given at creation time
 
-    Data (me) returns mutable FileReaderData;
+    Data (me) returns FileReaderData;
     ---Purpose : Returns the FileReaderData which is used to work
 
-    SetModel (me : in out; amodel : mutable InterfaceModel);
+    SetModel (me : in out; amodel : InterfaceModel);
     ---Purpose : Stores a Model. Used when the Model has been loaded
 
-    Model (me) returns mutable InterfaceModel;
+    Model (me) returns InterfaceModel;
     ---Purpose : Returns the stored Model
 
     	-- --   setting empty entities before loading model   -- --
@@ -99,7 +99,7 @@ is
     --           type of FileReaderTool
 
     Recognize (me : in out; num : Integer;
-    	       ach : in out Check; ent : out mutable Transient)
+    	       ach : in out Check; ent : out Transient)
     	returns Boolean  is deferred;
     ---Purpose : Recognizes a record, given its number. Specific to each
     --           Interface; called by SetEntities. It can call the basic method
@@ -114,7 +114,7 @@ is
 
     RecognizeByLib (me; num : Integer;
     	    	    glib : in out GeneralLib; rlib : in out ReaderLib;
-		    ach : in out Check; ent : out mutable Transient)
+		    ach : in out Check; ent : out Transient)
     	 returns Boolean;
     ---Purpose : Recognizes a record with the help of Libraries. Can be used
     --           to implement the method Recognize.
@@ -126,7 +126,7 @@ is
     --           <ent> is the result
     --           Returns False if recognition has failed, True else
 
-    UnknownEntity (me) returns mutable Transient;
+    UnknownEntity (me) returns Transient;
     ---Purpose : Provides an unknown entity, specific to the Interface
     --           called by SetEntities when Recognize has failed (Unknown alone)
     --           or by LoadModel when an Entity has caused a Fail on reading
@@ -135,10 +135,10 @@ is
 
     	-- --   loading entities into the model   -- --
 
-    NewModel (me) returns mutable InterfaceModel;
+    NewModel (me) returns InterfaceModel;
     ---Purpose : Creates an empty Model of the norm. Uses Protocol to do it
 
-    LoadModel (me : in out; amodel : mutable InterfaceModel)
+    LoadModel (me : in out; amodel : InterfaceModel)
     	raises DomainError;
     ---Purpose : Reads and fills Entities from the FileReaderData set by
     --           SetData to an InterfaceModel.
@@ -150,19 +150,19 @@ is
     --           operation, unless Error Handling is set.
     --           This method can also be redefined if judged necessary.
 
-    LoadedEntity (me : in out; num : Integer) returns mutable Transient;
+    LoadedEntity (me : in out; num : Integer) returns Transient;
     ---Purpose : Reads, Fills and Returns one Entity read from a Record of the
     --           FileReaderData. This Method manages also case of Fail or
     --           Warning, by producing a ReportEntyty plus , for a Fail, a
     --           literal Content (as an UnknownEntity). Performs also Trace
 
-    BeginRead (me : in out; amodel : mutable InterfaceModel) is deferred;
+    BeginRead (me : in out; amodel : InterfaceModel) is deferred;
     ---Purpose : Fills model's header; each Interface defines for its Model its
     --           own file header; this method fills it from FileReaderTool.+
     --           It is called by AnalyseFile from InterfaceModel
 
     AnalyseRecord (me : in out;
-        num : Integer; anent : mutable Transient; acheck : in out Check)
+        num : Integer; anent : Transient; acheck : in out Check)
     	returns Boolean  is deferred;
     ---Purpose : Fills an Entity, given record no; specific to each Interface,
     --           called by AnalyseFile from InterfaceModel (which manages its
@@ -180,7 +180,7 @@ is
     Destroy (me: in out) is virtual;
     ---C++ : alias "Standard_EXPORT virtual ~Interface_FileReaderTool() { Destroy(); }"
 
-    EndRead (me : in out; amodel : mutable InterfaceModel)  is virtual;
+    EndRead (me : in out; amodel : InterfaceModel)  is virtual;
     ---Purpose : Ends file reading after reading all the entities
     --           default is doing nothing; redefinable as necessary
     
diff --git a/src/Interface/Interface_GTool.cdl b/src/Interface/Interface_GTool.cdl
index e5464e5685..245a4e7b13 100644
--- a/src/Interface/Interface_GTool.cdl
+++ b/src/Interface/Interface_GTool.cdl
@@ -31,10 +31,10 @@ uses Transient,
 
 is
 
-    Create  returns mutable GTool;
+    Create  returns GTool;
     ---Purpose : Creates an empty, not set, GTool
 
-    Create (proto : Protocol; nbent : Integer = 0)  returns mutable GTool;
+    Create (proto : Protocol; nbent : Integer = 0)  returns GTool;
     ---Purpose : Creates a GTool from a Protocol
     --           Optional starting count of entities
 
@@ -76,7 +76,7 @@ is
     --           its Module and Case Number
 
     Select (me : mutable; ent : Transient;
-    	    gmod : out mutable GeneralModule;
+    	    gmod : out GeneralModule;
     	    CN   : out Integer;
     	    enforce : Boolean = Standard_False)  returns Boolean;
     ---Purpose : Selects for an entity, its Module and Case Number
diff --git a/src/Interface/Interface_GeneralModule.cdl b/src/Interface/Interface_GeneralModule.cdl
index e45f630b22..698e3f9db5 100644
--- a/src/Interface/Interface_GeneralModule.cdl
+++ b/src/Interface/Interface_GeneralModule.cdl
@@ -83,7 +83,7 @@ is
     --           Default returns always False, can be redefined
 
     Dispatch (me; CN : Integer;
-    	      entfrom : Transient; entto : out mutable Transient;
+    	      entfrom : Transient; entto : out Transient;
     	      TC : in out CopyTool)  returns Boolean  is virtual;
     ---Purpose : Dispatches an entity
     --           Returns True if it works by copy, False if it just duplicates
@@ -106,21 +106,21 @@ is
     --           copying, then returns False. Can be redefined
 
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean  is deferred;
     ---Purpose : Creates a new void entity <entto> according to a Case Number
     --           This entity remains to be filled, by reading from a file or
     --           by copying from another entity of same type (see CopyCase)
 
     CopyCase (me; CN : Integer;
-    	      entfrom : Transient; entto : mutable Transient;
+    	      entfrom : Transient; entto : Transient;
     	      TC : in out CopyTool)  is deferred;
     ---Purpose : Specific Copy ("Deep") from <entfrom> to <entto> (same type)
     --           by using a CopyTool which provides its working Map.
     --           Use method Transferred from CopyTool to work
 
     NewCopiedCase (me; CN : Integer;
-    	    	   entfrom : Transient; entto : out mutable Transient;
+    	    	   entfrom : Transient; entto : out Transient;
     	    	   TC : in out CopyTool)  returns Boolean  is virtual;
     ---Purpose : Specific operator (create+copy) defaulted to do nothing.
     --           It can be redefined : When it is not possible to work in two
@@ -131,7 +131,7 @@ is
     --           Returns True if it has produced something, false else
 
     RenewImpliedCase (me; CN : Integer;
-    	         entfrom : Transient; entto : mutable Transient;
+    	         entfrom : Transient; entto : Transient;
     	         TC : CopyTool)  is virtual;
     ---Purpose : Specific Copying of Implied References
     --           A Default is provided which does nothing (must current case !)
@@ -139,7 +139,7 @@ is
     --           Use method Search from CopyTool to work
 
     WhenDeleteCase (me; CN : Integer;
-    	    	ent : mutable Transient; dispatched : Boolean)  is virtual;
+    	    	ent : Transient; dispatched : Boolean)  is virtual;
     ---Purpose : Prepares an entity to be deleted. What does it mean :
     --           Basically, any class of entity may define its own destructor
     --           By default, it does nothing but calling destructors on fields
diff --git a/src/Interface/Interface_HGraph.cdl b/src/Interface/Interface_HGraph.cdl
index 79d9e1ea55..a11728a10b 100644
--- a/src/Interface/Interface_HGraph.cdl
+++ b/src/Interface/Interface_HGraph.cdl
@@ -26,28 +26,28 @@ raises DomainError
 
 is
 
-    Create (agraph : Graph) returns mutable HGraph;
+    Create (agraph : Graph) returns HGraph;
     ---Purpose : Creates an HGraph directly from a Graph.
     --           Remark that the starting Graph is duplicated
     
     Create (amodel : InterfaceModel; lib : GeneralLib;
-     theModeStats : Boolean = Standard_True) returns mutable HGraph;
+     theModeStats : Boolean = Standard_True) returns HGraph;
     ---Purpose : Creates an HGraph with a Graph created from <amodel> and <lib>
 
     Create (amodel : InterfaceModel; protocol : Protocol from Interface;
      theModeStats : Boolean = Standard_True)
-    	returns mutable HGraph;
+    	returns HGraph;
     ---Purpose : Creates an HGraph with a graph itself created from <amodel>
     --           and <protocol>
 
     Create (amodel : InterfaceModel; gtool : GTool from Interface;
      theModeStats : Boolean = Standard_True)
-    	returns mutable HGraph;
+    	returns HGraph;
     ---Purpose : Creates an HGraph with a graph itself created from <amodel>
     --           and <protocol>
 
     Create (amodel : InterfaceModel;
-     theModeStats : Boolean = Standard_True) returns mutable HGraph
+     theModeStats : Boolean = Standard_True) returns HGraph
     ---Purpose : Same a above, but works with the GTool in the model
     	raises DomainError;
     --           Error if no Active Protocol is defined
diff --git a/src/Interface/Interface_IntList.cdl b/src/Interface/Interface_IntList.cdl
index 09e3677a56..296fa73193 100644
--- a/src/Interface/Interface_IntList.cdl
+++ b/src/Interface/Interface_IntList.cdl
@@ -59,7 +59,7 @@ is
     --           else, data are not copied, only the header object is
     Initialize(me : in out;nbe : Integer);
     ---Purpose :Initialize IntList by number of entities.
-    Internals (me; nbrefs : out Integer; ents, refs : out mutable HArray1OfInteger);
+    Internals (me; nbrefs : out Integer; ents, refs : out HArray1OfInteger);
     ---Purpose : Returns internal values, used for copying
 
     NbEntities (me) returns Integer;
diff --git a/src/Interface/Interface_IntVal.cdl b/src/Interface/Interface_IntVal.cdl
index 7f3830f17b..075f77e992 100644
--- a/src/Interface/Interface_IntVal.cdl
+++ b/src/Interface/Interface_IntVal.cdl
@@ -22,7 +22,7 @@ uses Integer
 
 is
 
-    Create returns mutable IntVal;
+    Create returns IntVal;
 
     Value (me) returns Integer;
 
diff --git a/src/Interface/Interface_InterfaceModel.cdl b/src/Interface/Interface_InterfaceModel.cdl
index dd8d4fe410..f2d8014451 100644
--- a/src/Interface/Interface_InterfaceModel.cdl
+++ b/src/Interface/Interface_InterfaceModel.cdl
@@ -122,7 +122,7 @@ is
     --         the  Model if it contains it.   Else returns  0.  For a
     --         ReportEntity, looks at Concerned Entity.
 
-    Value (me; num : Integer) returns mutable Transient    raises OutOfRange;
+    Value (me; num : Integer) returns Transient    raises OutOfRange;
     ---Purpose : Returns an Entity identified by its number in the Model
     --           Each sub-class of InterfaceModel can define its own method
     --           Entity to return its specific class of Entity (e.g. for VDA,
@@ -171,7 +171,7 @@ is
     --           The ReportEntity is defined before call to method AddEntity.
 
     ReportEntity (me; num : Integer; semantic : Boolean = Standard_False)
-    	returns mutable ReportEntity
+    	returns ReportEntity
     ---Purpose : Returns a ReportEntity identified by its number in the Model,
     --           or a Null Handle If <num> does not identify a ReportEntity.
     --           
@@ -199,7 +199,7 @@ is
     	raises OutOfRange;
     --           Error if <num> is out of range
 
-    SetReportEntity (me : mutable; num : Integer; rep : mutable ReportEntity)
+    SetReportEntity (me : mutable; num : Integer; rep : ReportEntity)
     	returns Boolean
     ---Purpose : Sets or Replaces a ReportEntity for the Entity <num>. Returns
     --           True if Report is replaced, False if it has been replaced
@@ -208,7 +208,7 @@ is
     --           Error if <num> is out of range, or if concerned Entity is
     --           not equal to Value(num)
 
-    AddReportEntity (me : mutable; rep : mutable ReportEntity;
+    AddReportEntity (me : mutable; rep : ReportEntity;
     	    	     semantic : Boolean = Standard_False) returns Boolean;
     ---Purpose : Adds a ReportEntity as such. Returns False if the concerned
     --           entity is not recorded in the Model
@@ -248,7 +248,7 @@ is
     --           can be less efficient. <nbent> is the expected count of
     --           Entities to store
 
-    AddEntity (me : mutable; anentity : mutable Transient)
+    AddEntity (me : mutable; anentity : Transient)
     ---Purpose : Internal method for adding an Entity. Used by file reading
     --           (defined by each Interface) and Transfer tools. It adds the
     --           entity required to be added, not its refs : see AddWithRefs.
@@ -259,7 +259,7 @@ is
     	raises InterfaceMismatch  is virtual;
     --           Error if anentity already recorded
 
-    AddWithRefs (me : mutable; anent : mutable Transient; proto : Protocol;
+    AddWithRefs (me : mutable; anent : Transient; proto : Protocol;
     	    	 level : Integer = 0; listall : Boolean = Standard_False);
     ---Purpose : Adds to the Model, an Entity with all its References, as they
     --           are defined by General Services FillShared and ListImplied.
@@ -273,18 +273,18 @@ is
     --           If <listall> is True, all items are analysed (this allows to
     --           ensure the consistency of an adding made by steps)
 
-    AddWithRefs (me : mutable; anent : mutable Transient;
+    AddWithRefs (me : mutable; anent : Transient;
     	    	 level : Integer = 0; listall : Boolean = Standard_False)
     ---Purpose : Same as above, but works with the Protocol of the Model
     	raises InterfaceMismatch;
     --           Error if no Protocol is defined in the Model
 
-    AddWithRefs (me : mutable; anent : mutable Transient; lib : GeneralLib;
+    AddWithRefs (me : mutable; anent : Transient; lib : GeneralLib;
     	    	 level : Integer = 0; listall : Boolean = Standard_False);
     ---Purpose : Same as above, but works with an already created GeneralLib
 
 
-    ReplaceEntity (me : mutable; nument : Integer; anent : mutable Transient);
+    ReplaceEntity (me : mutable; nument : Integer; anent : Transient);
     ---Purpose : Replace Entity with Number=nument on other entity - "anent"
 
     ReverseOrders (me : mutable; after : Integer = 0);
@@ -314,7 +314,7 @@ is
     ---Purpose : Gets header (data specific of a defined Interface) from
     --           another InterfaceModel; called from TransferCopy
 
-    NewEmptyModel (me) returns mutable InterfaceModel  is deferred;
+    NewEmptyModel (me) returns InterfaceModel  is deferred;
     ---Purpose : Returns a New Empty Model, same type as <me> (whatever its
     --           Type); called to Copy parts a Model into other ones, then
     --           followed by a call to GetFromAnother (Header) then filling
@@ -420,10 +420,10 @@ is
     HasTemplate (myclass; name : CString) returns Boolean;
     ---Purpose : Returns true if a template is attached to a given name
 
-    Template (myclass; name : CString) returns mutable InterfaceModel;
+    Template (myclass; name : CString) returns InterfaceModel;
     ---Purpose : Returns the template model attached to a name, or a Null Handle
 
-    SetTemplate (myclass; name : CString; model : mutable InterfaceModel)
+    SetTemplate (myclass; name : CString; model : InterfaceModel)
     	returns Boolean;
     ---Purpose : Records a new template model with a name. If the name was
     --           already recorded, the corresponding template is replaced by
diff --git a/src/Interface/Interface_JaggedArray.cdl b/src/Interface/Interface_JaggedArray.cdl
index e6d6c2e2ce..b875b0c87b 100644
--- a/src/Interface/Interface_JaggedArray.cdl
+++ b/src/Interface/Interface_JaggedArray.cdl
@@ -26,7 +26,7 @@ uses Array1OfTransient
 
 is
 
-    Create (low, up : Integer) returns mutable JaggedArray;
+    Create (low, up : Integer) returns JaggedArray;
 
     Lower  (me) returns Integer;
     Upper  (me) returns Integer;
diff --git a/src/Interface/Interface_LineBuffer.cdl b/src/Interface/Interface_LineBuffer.cdl
index 10e99fd5e3..9be3eef0af 100644
--- a/src/Interface/Interface_LineBuffer.cdl
+++ b/src/Interface/Interface_LineBuffer.cdl
@@ -84,10 +84,10 @@ is
     ---Purpose : Fills a AsciiString <str> with the Content of the Line Buffer,
     --           then Clears the LineBuffer
 
-    Move (me : in out; str : mutable HAsciiString from TCollection)  is static;
+    Move (me : in out; str : HAsciiString from TCollection)  is static;
     ---Purpose : Same as above, but <str> is known through a Handle
 
-    Moved (me : in out) returns mutable HAsciiString from TCollection;
+    Moved (me : in out) returns HAsciiString from TCollection;
     ---Purpose : Same as above, but generates the HAsciiString
 
 
diff --git a/src/Interface/Interface_ParamSet.cdl b/src/Interface/Interface_ParamSet.cdl
index f178be72ed..0c7472aae8 100644
--- a/src/Interface/Interface_ParamSet.cdl
+++ b/src/Interface/Interface_ParamSet.cdl
@@ -25,7 +25,7 @@ raises OutOfRange
 
 is
 
-    Create (nres : Integer; nst : Integer = 1)  returns mutable ParamSet;
+    Create (nres : Integer; nst : Integer = 1)  returns ParamSet;
     ---Purpose : Creates an empty ParamSet, beginning at number "nst" and of
     --           initial reservation "nres" : the "nres" first parameters
     --           which follow "ndeb" (included) will be put in an Array
diff --git a/src/Interface/Interface_Protocol.cdl b/src/Interface/Interface_Protocol.cdl
index 0f4d58ba52..b881538408 100644
--- a/src/Interface/Interface_Protocol.cdl
+++ b/src/Interface/Interface_Protocol.cdl
@@ -90,14 +90,14 @@ is
 
     	-- --    General Services (defined at Norm level)    -- --
 
-    NewModel (me) returns mutable InterfaceModel  is deferred;
+    NewModel (me) returns InterfaceModel  is deferred;
     ---Purpose : Creates an empty Model of the considered Norm
 
     IsSuitableModel (me; model : InterfaceModel)  returns Boolean  is deferred;
     ---Purpose : Returns True if <model> is a Model of the considered Norm
 
 
-    UnknownEntity (me) returns mutable Transient  is deferred;
+    UnknownEntity (me) returns Transient  is deferred;
     ---Purpose : Creates a new Unknown Entity for the considered Norm
 
     IsUnknownEntity (me; ent : Transient) returns Boolean  is deferred;
diff --git a/src/Interface/Interface_ReaderModule.cdl b/src/Interface/Interface_ReaderModule.cdl
index 46df9824fa..f956e06b69 100644
--- a/src/Interface/Interface_ReaderModule.cdl
+++ b/src/Interface/Interface_ReaderModule.cdl
@@ -38,7 +38,7 @@ is
     --           Case Number. If Recognition fails, must return 0
 
     Read (me; casenum : Integer; data : FileReaderData; num : Integer;
-    	  ach : in out Check; ent : mutable Transient)
+    	  ach : in out Check; ent : Transient)
     ---Purpose : Performs the effective loading from <data>, record <num>,
     --           to the Entity <ent> formerly created
     --           In case of Error or Warning, fills <ach> with messages
@@ -48,7 +48,7 @@ is
     --           them and fill the Check
 
     NewRead (me; casenum : Integer; data : FileReaderData; num : Integer;
-    	  ach : in out Check; ent : out mutable Transient) returns Boolean
+    	  ach : in out Check; ent : out Transient) returns Boolean
     ---Purpose : Specific operator (create+read) defaulted to do nothing.
     --           It can be redefined when it is not possible to work in two
     --           steps (NewVoid then Read). This occurs when no default
diff --git a/src/Interface/Interface_Recognizer.cdl b/src/Interface/Interface_Recognizer.cdl
index bc68338f34..34921fb59d 100644
--- a/src/Interface/Interface_Recognizer.cdl
+++ b/src/Interface/Interface_Recognizer.cdl
@@ -37,7 +37,7 @@ is
     Initialize;
     ---Purpose : Assumes that no result has yet been recognized
 
-    Evaluate (me : mutable; akey : TheKey; res : out mutable TheResul)
+    Evaluate (me : mutable; akey : TheKey; res : out TheResul)
     	returns Boolean;
     ---Purpose : Evaluates if recognition has a result, returns it if yes
     --           In case of success, Returns True and puts result in "res"
@@ -45,17 +45,17 @@ is
     --           Works by calling deferred method Eval, and in case of failure,
     --           looks for Added Recognizers to work
 
-    Result (me) returns mutable TheResul  raises NoSuchObject;
+    Result (me) returns TheResul  raises NoSuchObject;
     ---Purpose : Returns result of last recognition (call of Evaluate)
 
-    Add (me : mutable; reco : mutable Recognizer);
+    Add (me : mutable; reco : Recognizer);
     ---Purpose : Adds a new Recognizer to the Compound, at the end
     --           Several calls to Add work by adding in the order of calls :
     --           Hence, when Eval has failed to recognize, Evaluate will call
     --	         Evaluate from the first added Recognizer if there is one,
     --	         and to the second if there is still no result, and so on
 
-    SetOK (me : mutable; aresult : mutable TheResul) is protected;
+    SetOK (me : mutable; aresult : TheResul) is protected;
     ---Purpose : Records the result of the recognition. Called by specific
     --           method Eval to record a result : after calling it, Eval has
     --           finished and can return
diff --git a/src/Interface/Interface_ReportEntity.cdl b/src/Interface/Interface_ReportEntity.cdl
index 6e28aee3c2..881a28e3ba 100644
--- a/src/Interface/Interface_ReportEntity.cdl
+++ b/src/Interface/Interface_ReportEntity.cdl
@@ -44,18 +44,18 @@ uses Check, Transient
 
 is
 
-    Create (unknown : mutable Transient) returns mutable ReportEntity;
+    Create (unknown : Transient) returns ReportEntity;
     ---Purpose : Creates a ReportEntity for an Unknown Entity : Check is empty,
     --           and Concerned equates Content (i.e. the Unknown Entity)
 
-    Create (acheck : Check; concerned : mutable Transient)
-    	returns mutable ReportEntity;
+    Create (acheck : Check; concerned : Transient)
+    	returns ReportEntity;
     ---Purpose : Creates a ReportEntity with its features :
     --           - <acheck> is the Check to be memorised
     --           - <concerned> is the Entity to which the Check is bound
     --           Later, a Content can be set : it is required for an Error
 
-    SetContent (me : mutable; content : mutable Transient);
+    SetContent (me : mutable; content : Transient);
     ---Purpose : Sets a Content : it brings non interpreted data which belong
     --           to the Concerned Entity. It can be empty then loaded later.
     --           Remark that for an Unknown Entity, Content is set by Create.
@@ -68,7 +68,7 @@ is
     ---Purpose : Returns the stored Check in order to change it
     ---C++ : return &
 
-    Concerned (me) returns mutable Transient;
+    Concerned (me) returns Transient;
     ---Purpose : Returns the stored Concerned Entity. It equates the Content
     --           in the case of an Unknown Entity
 
@@ -80,7 +80,7 @@ is
     --           (i.e. redefines content) : used when Concerned could not be
     --           loaded
 
-    Content (me) returns mutable Transient;
+    Content (me) returns Transient;
     ---Purpose : Returns the stored Content, or a Null Handle
     --           Remark that it must be an "Unknown Entity" suitable for
     --           the norm of the containing Model
diff --git a/src/Interface/Interface_SignLabel.cdl b/src/Interface/Interface_SignLabel.cdl
index a16dd718c1..174f08bd7f 100644
--- a/src/Interface/Interface_SignLabel.cdl
+++ b/src/Interface/Interface_SignLabel.cdl
@@ -22,7 +22,7 @@ uses Transient, AsciiString from TCollection
 
 is
 
-    Create returns mutable SignLabel;
+    Create returns SignLabel;
 
     Name (me) returns CString;
     ---Purpose : Returns "Entity Label"
diff --git a/src/Interface/Interface_Static.cdl b/src/Interface/Interface_Static.cdl
index 41749be386..89f0806b82 100644
--- a/src/Interface/Interface_Static.cdl
+++ b/src/Interface/Interface_Static.cdl
@@ -54,7 +54,7 @@ is
 
     Create (family, name : CString;
     	    type : ParamType from Interface = Interface_ParamText;
-	    init : CString = "")  returns mutable Static
+	    init : CString = "")  returns Static
     ---Purpose : Creates and records a Static, with a family and a name
     --           family can report to a name of ressource or to a system or
     --           internal definition. The name must be unique.
@@ -70,7 +70,7 @@ is
     --           Error if <name> is already recorded, or <type> not supported
     --           See also class method Init
 
-    Create (family, name : CString; other : Static) returns mutable Static;
+    Create (family, name : CString; other : Static) returns Static;
     ---Purpose : Creates a new Static with same definition as another one
     --           (value is copied, except for Entity : it remains null)
 
@@ -127,7 +127,7 @@ is
     --           '=' for same definition as, <init> gives the initial Static
     --           Returns False if <type> does not match this list
 
-    Static (myclass; name : CString) returns mutable Static;
+    Static (myclass; name : CString) returns Static;
     ---Purpose : Returns a Static from its name. Null Handle if not present
 
     IsPresent (myclass; name : CString) returns Boolean;
diff --git a/src/Interface/Interface_TypedValue.cdl b/src/Interface/Interface_TypedValue.cdl
index 1450772876..a49026a1f1 100644
--- a/src/Interface/Interface_TypedValue.cdl
+++ b/src/Interface/Interface_TypedValue.cdl
@@ -46,7 +46,7 @@ is
 
     Create (name : CString;
     	    type : ParamType from Interface = Interface_ParamText;
-	    init : CString = "")  returns mutable TypedValue;
+	    init : CString = "")  returns TypedValue;
     ---Purpose : Creates a TypedValue, with a name
     --           
     --           type gives the type of the parameter, default is free text
diff --git a/src/Interface/Interface_UndefinedContent.cdl b/src/Interface/Interface_UndefinedContent.cdl
index ef571dcb4d..983bf4600d 100644
--- a/src/Interface/Interface_UndefinedContent.cdl
+++ b/src/Interface/Interface_UndefinedContent.cdl
@@ -48,7 +48,7 @@ raises OutOfRange, NoSuchObject, InterfaceMismatch, InterfaceError
 
 is
 
-    Create returns mutable UndefinedContent;
+    Create returns UndefinedContent;
     ---Purpose : Defines an empty UndefinedContent
 
     	-- --    Access to Parameters    -- --
@@ -60,7 +60,7 @@ is
     ---Purpose : Gives count of Literal Parameters
 
     ParamData (me; num : Integer; ptype : out ParamType;
-    	    	   ent : out mutable Transient;
+    	    	   ent : out Transient;
     	    	   val : out HAsciiString from TCollection)
     	     	       returns Boolean  is static;
     ---Purpose : Returns data of a Parameter : its type, and the entity if it
@@ -77,7 +77,7 @@ is
     ---Purpose : Returns True if a Parameter is recorded as an entity
     --           Error if num is not between 1 and NbParams
 
-    ParamEntity (me; num : Integer) returns mutable Transient
+    ParamEntity (me; num : Integer) returns Transient
     ---Purpose : Returns Entity corresponding to a Param, given its rank
         raises InterfaceError, OutOfRange  is static;
     --           Error if out of range or if Param num does not designate
@@ -97,7 +97,7 @@ is
 	val : HAsciiString from TCollection)  is static;
     ---Purpose : Adds a literal Parameter to the list
 
-    AddEntity  (me : mutable; ptype : ParamType; ent : mutable Transient)
+    AddEntity  (me : mutable; ptype : ParamType; ent : Transient)
     	is static;
     ---Purpose : Adds a Parameter which references an Entity
 
@@ -114,13 +114,13 @@ is
     --           Error if num is out of range
 
     SetEntity  (me : mutable; num : Integer; ptype : ParamType;
-    	    	ent : mutable Transient)
+    	    	ent : Transient)
     ---Purpose : Sets a new value for the Parameter <num>, to reference an
     --           Entity. To simply change the Entity, see the variant below
     	raises OutOfRange  is static;
     --           Error if num is out of range
 
-    SetEntity  (me : mutable; num : Integer; ent : mutable Transient)
+    SetEntity  (me : mutable; num : Integer; ent : Transient)
     ---Purpose : Changes the Entity referenced by the Parameter <num>
     --           (with same ParamType)
     	raises InterfaceError, OutOfRange  is static;
diff --git a/src/Law/Law.cdl b/src/Law/Law.cdl
index 56b7dae44e..3f688a7a3d 100644
--- a/src/Law/Law.cdl
+++ b/src/Law/Law.cdl
@@ -85,7 +85,7 @@ is
                   DFirst, DLast : Real    from Standard;
                   Rev           : Boolean from Standard;
     	    	  NbPoints      : Integer from Standard)
-    returns mutable BSpline from Law;
+    returns BSpline from Law;
     ---Purpose: Computes a 1 d curve to  reparametrize a curve. Its an
     --          interpolation of NbPoints  points calculated  at quasi
     --          constant abscissa.
@@ -93,7 +93,7 @@ is
     Scale(First, Last   : Real    from Standard;
           HasF, HasL    : Boolean from Standard;
           VFirst, VLast : Real    from Standard)
-    returns mutable BSpline from Law;
+    returns BSpline from Law;
     ---Purpose: Computes a 1  d curve to  scale  a field of  tangency.
     --          Value is 1. for t = (First+Last)/2 .
     --          If HasFirst value for t = First is VFirst (null derivative). 
@@ -110,7 +110,7 @@ is
     ScaleCub(First, Last   : Real    from Standard;
              HasF, HasL    : Boolean from Standard;
              VFirst, VLast : Real    from Standard)
-    returns mutable BSpline from Law;
+    returns BSpline from Law;
 
 end Law;
 
diff --git a/src/Law/Law_BSpFunc.cdl b/src/Law/Law_BSpFunc.cdl
index 4870ba8694..bbf615d74a 100644
--- a/src/Law/Law_BSpFunc.cdl
+++ b/src/Law/Law_BSpFunc.cdl
@@ -30,10 +30,10 @@ raises OutOfRange from Standard
 
 is
 
-    Create returns mutable BSpFunc from Law;
+    Create returns BSpFunc from Law;
     
     Create(C  : BSpline from Law; First, Last: Real) 
-    returns mutable BSpFunc from Law;
+    returns BSpFunc from Law;
     
     Continuity(me) returns Shape from GeomAbs
     is redefined static;
@@ -75,7 +75,7 @@ is
     
     Bounds(me: mutable; PFirst,PLast: out Real from Standard);
     
-    Curve(me) returns mutable BSpline from Law;
+    Curve(me) returns BSpline from Law;
 
     SetCurve(me : mutable; 
              C  : BSpline from Law);
diff --git a/src/Law/Law_BSpline.cdl b/src/Law/Law_BSpline.cdl
index 31ad3c83dd..504091a832 100644
--- a/src/Law/Law_BSpline.cdl
+++ b/src/Law/Law_BSpline.cdl
@@ -95,7 +95,7 @@ is
             Degree         : Integer;
     	    Periodic       : Boolean = Standard_False)
 	  
-    returns mutable BSpline from Law
+    returns BSpline from Law
 
     ---Purpose :  Creates a  non-rational B_spline curve   on  the
     --         basis <Knots, Multiplicities> of degree <Degree>.
@@ -135,7 +135,7 @@ is
             Degree         : Integer;
     	    Periodic       : Boolean = Standard_False)
 	  
-    returns mutable BSpline from Law
+    returns BSpline from Law
 
     ---Purpose : Creates  a rational B_spline  curve  on the basis
     --         <Knots, Multiplicities> of degree <Degree>.
@@ -732,7 +732,7 @@ is
     --           |f(t1) - f(t0)| < Tolerance3D
     
 
-    Copy (me)  returns mutable like me;
+    Copy (me)  returns like me;
 
 
     UpdateKnots(me : mutable)
diff --git a/src/Law/Law_Composite.cdl b/src/Law/Law_Composite.cdl
index b55d5f6e2e..740c85d387 100644
--- a/src/Law/Law_Composite.cdl
+++ b/src/Law/Law_Composite.cdl
@@ -35,13 +35,13 @@ raises OutOfRange from Standard
  
 is
 
-    Create returns mutable Composite from Law;
+    Create returns Composite from Law;
     ---Purpose: Construct an empty Law
     
     Create (First, Last : Real; 
     	    Tol :Real)
 	---Purpose: Construct an empty, trimed Law
-    returns mutable Composite from Law;   
+    returns Composite from Law;   
     
     Continuity(me) returns Shape from GeomAbs
     is redefined static;
@@ -94,7 +94,7 @@ is
 
     ChangeElementaryLaw(me: mutable; W : Real from Standard)
     ---C++: return &
-    returns mutable Function from Law
+    returns Function from Law
     ---Purpose: Returns the elementary  function of the composite used
     --          to compute at parameter W.
     is static;
diff --git a/src/Law/Law_Constant.cdl b/src/Law/Law_Constant.cdl
index 5e840e6a08..b334123b63 100644
--- a/src/Law/Law_Constant.cdl
+++ b/src/Law/Law_Constant.cdl
@@ -26,7 +26,7 @@ raises OutOfRange from Standard
 
 is
 
-    Create returns mutable Constant from Law;
+    Create returns Constant from Law;
     
     
 
diff --git a/src/Law/Law_Interpol.cdl b/src/Law/Law_Interpol.cdl
index 402dc4e989..e3e6cf1ca0 100644
--- a/src/Law/Law_Interpol.cdl
+++ b/src/Law/Law_Interpol.cdl
@@ -24,7 +24,7 @@ uses
 
 is
 
-    Create returns mutable Interpol from Law;
+    Create returns Interpol from Law;
     	---Purpose: Constructs an empty interpolative evolution law.
     	-- The function Set is used to define the law.
     Set(me        : mutable; 
diff --git a/src/Law/Law_Linear.cdl b/src/Law/Law_Linear.cdl
index 72207f54e9..545e8baf5b 100644
--- a/src/Law/Law_Linear.cdl
+++ b/src/Law/Law_Linear.cdl
@@ -27,7 +27,7 @@ is
 
     Create
     
-    	returns mutable Linear from Law;
+    	returns Linear from Law;
     	---Purpose: Constructs an empty linear evolution law.
 
     Set(me: mutable; Pdeb,Valdeb,Pfin,Valfin: Real from Standard)
diff --git a/src/Law/Law_S.cdl b/src/Law/Law_S.cdl
index a76b7a53fd..9e592fba8f 100644
--- a/src/Law/Law_S.cdl
+++ b/src/Law/Law_S.cdl
@@ -21,7 +21,7 @@ class S from Law inherits BSpFunc from Law
 is
 
     Create
-    returns mutable S from Law;
+    returns S from Law;
 
     	---Purpose: Constructs an empty "S" evolution law.
     Set(me: mutable; Pdeb,Valdeb,Pfin,Valfin: Real from Standard)
diff --git a/src/LibCtl/LibCtl_Library.cdl b/src/LibCtl/LibCtl_Library.cdl
index e240a1c902..431e4cf638 100644
--- a/src/LibCtl/LibCtl_Library.cdl
+++ b/src/LibCtl/LibCtl_Library.cdl
@@ -49,7 +49,7 @@ raises NoSuchObject
 
     is
     
-    	Create returns mutable GlobalNode;
+    	Create returns GlobalNode;
 	---Purpose : Creates an empty GlobalNode, with no Next
 
     	Add (me : mutable; amodule : TheModule; aprotocol : TheProtocol)
@@ -88,7 +88,7 @@ raises NoSuchObject
 
     is
 
-    	Create returns mutable Node;
+    	Create returns Node;
 	---Purpose : Creates an empty Node, with no Next
 
     	AddNode (me : mutable; anode : any GlobalNode)  is static;
@@ -103,7 +103,7 @@ raises NoSuchObject
 	---Purpose : Returns the Protocol designated by a precise Node
     	---C++ : return const &
 
-    	Next (me) returns mutable Node  is static;
+    	Next (me) returns Node  is static;
 	---Purpose : Returns the Next Node. If none was defined, returned value
 	--           is a Null Handle
     	---C++ : return const &
diff --git a/src/LocOpe/LocOpe_GluedShape.cdl b/src/LocOpe/LocOpe_GluedShape.cdl
index 4b2d75624c..4ac15e0ce9 100644
--- a/src/LocOpe/LocOpe_GluedShape.cdl
+++ b/src/LocOpe/LocOpe_GluedShape.cdl
@@ -31,12 +31,12 @@ is
 
     Create
     
-    	returns mutable GluedShape from LocOpe;
+    	returns GluedShape from LocOpe;
 
 
     Create(S: Shape from TopoDS)
     
-    	returns mutable GluedShape from LocOpe;
+    	returns GluedShape from LocOpe;
     
 
     Init(me: mutable; S: Shape from TopoDS)
diff --git a/src/LocOpe/LocOpe_HBuilder.cdl b/src/LocOpe/LocOpe_HBuilder.cdl
index 52081c242a..52d9e30c31 100644
--- a/src/LocOpe/LocOpe_HBuilder.cdl
+++ b/src/LocOpe/LocOpe_HBuilder.cdl
@@ -27,7 +27,7 @@ is
     Create(BT: BuildTool from TopOpeBRepDS)
     
 	---C++: inline
-    	returns mutable HBuilder from LocOpe;
+    	returns HBuilder from LocOpe;
     
 
     Classify(me)
diff --git a/src/LocOpe/LocOpe_WiresOnShape.cdl b/src/LocOpe/LocOpe_WiresOnShape.cdl
index f2ae79e9ff..a893a58e61 100644
--- a/src/LocOpe/LocOpe_WiresOnShape.cdl
+++ b/src/LocOpe/LocOpe_WiresOnShape.cdl
@@ -34,7 +34,7 @@ is
 
     Create(S: Shape from TopoDS)
 
-    	returns mutable WiresOnShape from LocOpe;
+    	returns WiresOnShape from LocOpe;
 
 
     Init(me: mutable; S: Shape from TopoDS)
diff --git a/src/MAT/MAT_Arc.cdl b/src/MAT/MAT_Arc.cdl
index 61f6ea635a..ad07d504df 100644
--- a/src/MAT/MAT_Arc.cdl
+++ b/src/MAT/MAT_Arc.cdl
@@ -41,7 +41,7 @@ is
              FirstElement    : BasicElt from MAT;
              SecondElement   : BasicElt from MAT )
     	--- Purpose :
-    returns mutable Arc;
+    returns Arc;
 
     Index (me) 
     	--- Purpose : Returns the index of <me> in Graph.theArcs.
@@ -66,12 +66,12 @@ is
     
     FirstNode (me)  
         --- Purpose : Returns one Node extremity of <me>.
-    returns mutable Node from MAT
+    returns Node from MAT
     is static;
     
     SecondNode (me) 
   	--- Purpose : Returns the other Node extremity of <me>.   
-    returns mutable Node from MAT
+    returns Node from MAT
     is static;    
     
     TheOtherNode (me ; aNode : Node) 
diff --git a/src/MAT/MAT_BasicElt.cdl b/src/MAT/MAT_BasicElt.cdl
index 8f55675009..dc9a28f2b7 100644
--- a/src/MAT/MAT_BasicElt.cdl
+++ b/src/MAT/MAT_BasicElt.cdl
@@ -31,7 +31,7 @@ is
     
     Create (anInteger : Integer) 
     	--- Purpose : Constructor, <anInteger> is the <index> of <me>.
-    returns mutable BasicElt from MAT;
+    returns BasicElt from MAT;
 
     StartArc(me)  
     	--- Purpose : Return <startArcLeft> or <startArcRight> corresponding
diff --git a/src/MAT/MAT_Bisector.cdl b/src/MAT/MAT_Bisector.cdl
index a04b4cf3f5..4d05d6d515 100644
--- a/src/MAT/MAT_Bisector.cdl
+++ b/src/MAT/MAT_Bisector.cdl
@@ -33,7 +33,7 @@ is
 
     ---Purpose:
 
-    returns mutable Bisector from MAT;
+    returns Bisector from MAT;
     
     AddBisector(me ; abisector : any Bisector from MAT)
     
diff --git a/src/MAT/MAT_Edge.cdl b/src/MAT/MAT_Edge.cdl
index ea504c40aa..45865efb18 100644
--- a/src/MAT/MAT_Edge.cdl
+++ b/src/MAT/MAT_Edge.cdl
@@ -31,7 +31,7 @@ uses
 
 is
 
-    Create returns mutable Edge from MAT;
+    Create returns Edge from MAT;
     
     EdgeNumber(me : mutable ; anumber : Integer)
 
diff --git a/src/MAT/MAT_Graph.cdl b/src/MAT/MAT_Graph.cdl
index 2fae6023e3..a607331307 100644
--- a/src/MAT/MAT_Graph.cdl
+++ b/src/MAT/MAT_Graph.cdl
@@ -33,7 +33,7 @@ uses BasicElt                  from MAT,
 
 is
 
-    Create returns mutable Graph from MAT;
+    Create returns Graph from MAT;
         --- Purpose : Empty constructor.
   
 ---Category: Computation
@@ -123,8 +123,8 @@ is
     is static;					    
 
     FusionOfArcs (me        : mutable;
-                  Arc1      : mutable Arc from MAT;
-		  Arc2      : mutable Arc from MAT)
+                  Arc1      : Arc from MAT;
+		  Arc2      : Arc from MAT)
 	---Purpose: Merge two Arcs.  the second node of <Arc2> becomes
 	--          the  first node  of <Arc1>.  Update  of the  first
 	--          node and the neighbours of <Arc1>.
@@ -142,7 +142,7 @@ is
     is static;
 
     ChangeBasicElt(me : mutable ; Index : Integer)	
-    returns mutable BasicElt from MAT
+    returns BasicElt from MAT
     is static;
     
     UpDateNodes(me : mutable ; Index : in out Integer)
diff --git a/src/MAT/MAT_Node.cdl b/src/MAT/MAT_Node.cdl
index 2a905c74ca..f1154ead1e 100644
--- a/src/MAT/MAT_Node.cdl
+++ b/src/MAT/MAT_Node.cdl
@@ -33,7 +33,7 @@ is
     Create (GeomIndex     : Integer;
             LinkedArc     : Arc from MAT;
     	    Distance      : Real)
-    returns mutable Node from MAT;
+    returns Node from MAT;
     
     GeomIndex (me)
 	---Purpose: Returns the index associated of the geometric 
diff --git a/src/MAT/MAT_TList.cdl b/src/MAT/MAT_TList.cdl
index f89ee541c0..8c9df4de39 100644
--- a/src/MAT/MAT_TList.cdl
+++ b/src/MAT/MAT_TList.cdl
@@ -41,11 +41,11 @@ inherits
 
 is
 
-    Create returns mutable TListNode from MAT;
+    Create returns TListNode from MAT;
 
     ---C++: inline
     
-    Create(anitem : Item) returns mutable TListNode from MAT;
+    Create(anitem : Item) returns TListNode from MAT;
 
     ---C++: inline
     
@@ -56,13 +56,13 @@ is
     
     is static;
     
-    Next(me) returns mutable TListNode from MAT
+    Next(me) returns TListNode from MAT
     
     ---C++: inline
 
     is static;
     
-    Previous(me) returns mutable TListNode from MAT
+    Previous(me) returns TListNode from MAT
     
     ---C++: inline
 
@@ -74,13 +74,13 @@ is
 
     is static;
     
-    Next(me : mutable ; atlistnode : mutable TListNode from MAT)
+    Next(me : mutable ; atlistnode : TListNode from MAT)
     
     ---C++: inline
 
     is static;
     
-    Previous(me : mutable ; atlistnode : mutable TListNode from MAT)
+    Previous(me : mutable ; atlistnode : TListNode from MAT)
     
     ---C++: inline
 
@@ -100,7 +100,7 @@ end TListNode;
 
 is
 
-    Create returns mutable TList from MAT;
+    Create returns TList from MAT;
     
     First(me : mutable)
     
diff --git a/src/MAT/MAT_Zone.cdl b/src/MAT/MAT_Zone.cdl
index 10f503cc7e..3f9698113c 100644
--- a/src/MAT/MAT_Zone.cdl
+++ b/src/MAT/MAT_Zone.cdl
@@ -35,11 +35,11 @@ uses
     Node           from MAT
 is
 
-    Create returns mutable Zone from MAT;
+    Create returns Zone from MAT;
     
     Create(aBasicElt : BasicElt from MAT)
         --- Purpose: Compute the frontier of the Zone of proximity.
-    returns mutable Zone from MAT;
+    returns Zone from MAT;
     	
     Perform(me : mutable ; aBasicElt : BasicElt from MAT)
         --- Purpose: Compute the frontier of the Zone of proximity.
diff --git a/src/MAT2d/MAT2d_Circuit.cdl b/src/MAT2d/MAT2d_Circuit.cdl
index 7521e21005..248aa6de3d 100644
--- a/src/MAT2d/MAT2d_Circuit.cdl
+++ b/src/MAT2d/MAT2d_Circuit.cdl
@@ -40,7 +40,7 @@ uses
 
 is
 
-    Create returns mutable Circuit from MAT2d;
+    Create returns Circuit from MAT2d;
 
 ---Category:  Computation
 
@@ -75,7 +75,7 @@ is
     DoubleLine(me ; 
                Line       : in out  SequenceOfGeometry;
                Connexions : in out  SequenceOfConnexion from MAT2d; 
-	       Father     : mutable Connexion from MAT2d;
+	       Father     : Connexion from MAT2d;
 	       Side       : Real)
     is static private;
     
diff --git a/src/MAT2d/MAT2d_Connexion.cdl b/src/MAT2d/MAT2d_Connexion.cdl
index 77a20b8abf..14e96c605b 100644
--- a/src/MAT2d/MAT2d_Connexion.cdl
+++ b/src/MAT2d/MAT2d_Connexion.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-    Create returns mutable Connexion from MAT2d;
+    Create returns Connexion from MAT2d;
     
     Create(LineA        : Integer;
 	   LineB        : Integer;
@@ -41,7 +41,7 @@ is
            ParameterOnB : Real;
            PointA       : Pnt2d from gp;
            PointB       : Pnt2d from gp)
-    returns mutable Connexion from MAT2d;	    	   
+    returns Connexion from MAT2d;	    	   
 
     IndexFirstLine(me) returns Integer
     	---Purpose:  Returns the Index on the first line.
@@ -110,7 +110,7 @@ is
        ---Purpose: Returns the reverse connexion of <me>.
        --          the firstpoint  is the secondpoint.
        --          the secondpoint is the firstpoint.
-    returns mutable Connexion from MAT2d
+    returns Connexion from MAT2d
     is static;
     
     IsAfter(me ; aConnexion : Connexion from MAT2d ; aSense : Real)
diff --git a/src/MAT2d/MAT2d_Mat2d.cdl b/src/MAT2d/MAT2d_Mat2d.cdl
index 30a5046172..1280d7cfb7 100644
--- a/src/MAT2d/MAT2d_Mat2d.cdl
+++ b/src/MAT2d/MAT2d_Mat2d.cdl
@@ -59,8 +59,8 @@ is
     	       atool                : in out  Tool2d from MAT2d;
     	       aside                :         Integer          ;
     	       noofbisectorstoremove: in out  Integer           ;
-	       bisector1            : mutable Bisector from MAT;
-	       bisector2            : mutable Bisector from MAT)
+	       bisector1            : Bisector from MAT;
+	       bisector2            : Bisector from MAT)
     is static private;	       
   			       
 
diff --git a/src/MAT2d/MAT2d_MiniPath.cdl b/src/MAT2d/MAT2d_MiniPath.cdl
index 9391a45c81..adfa7e01ff 100644
--- a/src/MAT2d/MAT2d_MiniPath.cdl
+++ b/src/MAT2d/MAT2d_MiniPath.cdl
@@ -95,7 +95,7 @@ is
     Father(me : in out ; Index : Integer)
 	---Purpose: Returns    the  connexion  which ends  on line
 	--          designed  by <Index>.
-    returns mutable Connexion from MAT2d
+    returns Connexion from MAT2d
     is static;
 
     Append (me        : in out;
@@ -115,7 +115,7 @@ is
        ---Purpose: Returns the connexion which realises the minimum of
        --          distance between the lines of index <L1> and <L2> in
        --          <aFigure>. The connexion is oriented from <L1> to <L2>.
-    returns mutable Connexion from MAT2d
+    returns Connexion from MAT2d
     is static private;
     
 fields
diff --git a/src/MAT2d/MAT2d_Tool2d.cdl b/src/MAT2d/MAT2d_Tool2d.cdl
index 3338ef6def..1b6cc0c818 100644
--- a/src/MAT2d/MAT2d_Tool2d.cdl
+++ b/src/MAT2d/MAT2d_Tool2d.cdl
@@ -90,11 +90,11 @@ is
     	--            <theGeomVecs>
     returns Integer is static;
     
-    CreateBisector(me : in out ; abisector : mutable Bisector from MAT)
+    CreateBisector(me : in out ; abisector : Bisector from MAT)
 	--- Purpose : Creates the geometric bisector defined by <abisector>.
     is static;
     
-    TrimBisector(me : in out ; abisector : mutable Bisector from MAT)   
+    TrimBisector(me : in out ; abisector : Bisector from MAT)   
 	--- Purpose : Trims the geometric bisector by the <firstparameter>
 	--            of <abisector>.
 	--            If the parameter is out of the bisector, Return FALSE.
@@ -102,7 +102,7 @@ is
     returns Boolean is static;
     
     TrimBisector(me        : in out ; 
-    	    	 abisector : mutable Bisector from MAT ;
+    	    	 abisector : Bisector from MAT ;
                  apoint    : Integer)
         --- Purpose : Trims the geometric bisector by the point of index
         --            <apoint> in <theGeomPnts>.
@@ -111,8 +111,8 @@ is
     returns Boolean is static;
 
     IntersectBisector(me          : in out ;
-                      bisectorone : mutable Bisector from MAT ;
-                      bisectortwo : mutable Bisector from MAT ;
+                      bisectorone : Bisector from MAT ;
+                      bisectortwo : Bisector from MAT ;
                       intpnt      : in out Integer)
         --- Purpose  : Computes  the point  of  intersection between  the
         --             bisectors defined  by  <bisectorone>  and  
diff --git a/src/MDF/MDF_ARDriver.cdl b/src/MDF/MDF_ARDriver.cdl
index e9cc26fc68..479a380dae 100644
--- a/src/MDF/MDF_ARDriver.cdl
+++ b/src/MDF/MDF_ARDriver.cdl
@@ -49,13 +49,13 @@ is
 	--          Attribute from PDF.
 
     NewEmpty(me)
-    	returns mutable Attribute from TDF
+    	returns Attribute from TDF
     	is deferred;
 	---Purpose: Creates a new attribute from PDF.
 
     Paste(me;
     	  aSource     :         Attribute from PDF;
-    	  aTarget     : mutable Attribute from TDF;
+    	  aTarget     : Attribute from TDF;
     	  aRelocTable : RRelocationTable from MDF)
     	is deferred;
 	---Purpose: Translate the contents of <aSource> and put it
diff --git a/src/MDF/MDF_ASDriver.cdl b/src/MDF/MDF_ASDriver.cdl
index f039755733..225513ce61 100644
--- a/src/MDF/MDF_ASDriver.cdl
+++ b/src/MDF/MDF_ASDriver.cdl
@@ -49,13 +49,13 @@ is
 	--          Attribute from TDF.
 
     NewEmpty(me)
-    	returns mutable Attribute from PDF
+    	returns Attribute from PDF
     	is deferred;
 	---Purpose: Creates a new attribute from PDF.
 
     Paste(me;
     	  aSource     :         Attribute from TDF;
-    	  aTarget     : mutable Attribute from PDF;
+    	  aTarget     : Attribute from PDF;
     	  aRelocTable : SRelocationTable from MDF)
     	is deferred;
 	---Purpose: Translate the contents of <aSource> and put it
diff --git a/src/MDF/MDF_DriverTable.cdl b/src/MDF/MDF_DriverTable.cdl
index d1e0a07a0f..d8a3879a4b 100644
--- a/src/MDF/MDF_DriverTable.cdl
+++ b/src/MDF/MDF_DriverTable.cdl
@@ -54,7 +54,7 @@ uses
 
 is
 
-    Create returns mutable DriverTable from MDF;
+    Create returns DriverTable from MDF;
 	---Purpose: Creates a mutable DriverTable from MDF.
 
     SetDriver(me : mutable;
diff --git a/src/MDF/MDF_ReferenceRetrievalDriver.cdl b/src/MDF/MDF_ReferenceRetrievalDriver.cdl
index 38655738ad..08f723d394 100644
--- a/src/MDF/MDF_ReferenceRetrievalDriver.cdl
+++ b/src/MDF/MDF_ReferenceRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable ReferenceRetrievalDriver from MDF;
+    returns ReferenceRetrievalDriver from MDF;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Reference from PDF.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end ReferenceRetrievalDriver;
diff --git a/src/MDF/MDF_ReferenceStorageDriver.cdl b/src/MDF/MDF_ReferenceStorageDriver.cdl
index 9e34c9fa6e..735e0ae7d1 100644
--- a/src/MDF/MDF_ReferenceStorageDriver.cdl
+++ b/src/MDF/MDF_ReferenceStorageDriver.cdl
@@ -26,7 +26,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM) 
-    returns mutable ReferenceStorageDriver from MDF;
+    returns ReferenceStorageDriver from MDF;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDF.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDF/MDF_RelocationTable.cdl b/src/MDF/MDF_RelocationTable.cdl
index 4d7b8461b1..ba254379bb 100644
--- a/src/MDF/MDF_RelocationTable.cdl
+++ b/src/MDF/MDF_RelocationTable.cdl
@@ -42,7 +42,7 @@ uses
 is
 
     Create(theSelfRelocation : Boolean from Standard = Standard_False) 
-    returns mutable RelocationTable from MDF;
+    returns RelocationTable from MDF;
 	---Purpose: Creates a relocation table. 
 	--          <theSelfRelocation> status says that the relocation table allows self relocation.
 
@@ -65,7 +65,7 @@ is
 
     HasRelocation(me : mutable;
     	    	  aSourceAttribute :                TheSourceType;
-    	    	  aTargetAttribute : in out mutable TheTargetType)
+    	    	  aTargetAttribute : in out TheTargetType)
 	returns Boolean from Standard;
 	---Purpose: Finds the relocation value of <aSourceAttribute>
 	--          and returns it into <aTargetAttribute>.
@@ -84,7 +84,7 @@ is
 
     HasOtherRelocation(me : mutable;
     	    	       aSource :                TheOtherSourceType;
-    	    	       aTarget : in out mutable TheOtherTargetType)
+    	    	       aTarget : in out TheOtherTargetType)
 	returns Boolean from Standard;
 	---Purpose: Finds the relocation value of <aSource>
 	--          and returns it into <aTarget>.
diff --git a/src/MDF/MDF_TagSourceRetrievalDriver.cdl b/src/MDF/MDF_TagSourceRetrievalDriver.cdl
index d108400c70..5aacf6bd7b 100644
--- a/src/MDF/MDF_TagSourceRetrievalDriver.cdl
+++ b/src/MDF/MDF_TagSourceRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create (theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable TagSourceRetrievalDriver from MDF;
+    returns TagSourceRetrievalDriver from MDF;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: TagSource from PDF.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end TagSourceRetrievalDriver;
diff --git a/src/MDF/MDF_TagSourceStorageDriver.cdl b/src/MDF/MDF_TagSourceStorageDriver.cdl
index e5c8f400c7..511fb25d42 100644
--- a/src/MDF/MDF_TagSourceStorageDriver.cdl
+++ b/src/MDF/MDF_TagSourceStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM) 
-    returns mutable TagSourceStorageDriver from MDF;
+    returns TagSourceStorageDriver from MDF;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDF.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_AsciiStringRetrievalDriver.cdl b/src/MDataStd/MDataStd_AsciiStringRetrievalDriver.cdl
index 9ea33f33ca..7b322237f4 100644
--- a/src/MDataStd/MDataStd_AsciiStringRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_AsciiStringRetrievalDriver.cdl
@@ -25,7 +25,7 @@ uses
      
 is    
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable AsciiStringRetrievalDriver from MDataStd;
+    returns AsciiStringRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,12 +35,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: AsciiString from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_AsciiStringStorageDriver.cdl b/src/MDataStd/MDataStd_AsciiStringStorageDriver.cdl
index e3e612a11f..232714061a 100644
--- a/src/MDataStd/MDataStd_AsciiStringStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_AsciiStringStorageDriver.cdl
@@ -26,7 +26,7 @@ uses
 
 is
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable AsciiStringStorageDriver from MDataStd;
+    returns AsciiStringStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end AsciiStringStorageDriver;
diff --git a/src/MDataStd/MDataStd_BooleanArrayRetrievalDriver.cdl b/src/MDataStd/MDataStd_BooleanArrayRetrievalDriver.cdl
index 5cfefdd479..d816c6d578 100644
--- a/src/MDataStd/MDataStd_BooleanArrayRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_BooleanArrayRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable BooleanArrayRetrievalDriver from MDataStd;
+    returns BooleanArrayRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end BooleanArrayRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_BooleanArrayStorageDriver.cdl b/src/MDataStd/MDataStd_BooleanArrayStorageDriver.cdl
index a207852d05..6d1a9b231d 100644
--- a/src/MDataStd/MDataStd_BooleanArrayStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_BooleanArrayStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable BooleanArrayStorageDriver from MDataStd;
+    returns BooleanArrayStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end BooleanArrayStorageDriver;
diff --git a/src/MDataStd/MDataStd_BooleanListRetrievalDriver.cdl b/src/MDataStd/MDataStd_BooleanListRetrievalDriver.cdl
index ae8dcbd889..919d01e82d 100644
--- a/src/MDataStd/MDataStd_BooleanListRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_BooleanListRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable BooleanListRetrievalDriver from MDataStd;
+    returns BooleanListRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end BooleanListRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_BooleanListStorageDriver.cdl b/src/MDataStd/MDataStd_BooleanListStorageDriver.cdl
index 3660dff546..62f26a7b2e 100644
--- a/src/MDataStd/MDataStd_BooleanListStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_BooleanListStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable BooleanListStorageDriver from MDataStd;
+    returns BooleanListStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end BooleanListStorageDriver;
diff --git a/src/MDataStd/MDataStd_ByteArrayRetrievalDriver.cdl b/src/MDataStd/MDataStd_ByteArrayRetrievalDriver.cdl
index c4b7a6aa13..55484fd969 100644
--- a/src/MDataStd/MDataStd_ByteArrayRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_ByteArrayRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ByteArrayRetrievalDriver from MDataStd;
+    returns ByteArrayRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end ByteArrayRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_ByteArrayRetrievalDriver_1.cdl b/src/MDataStd/MDataStd_ByteArrayRetrievalDriver_1.cdl
index 4d018102d3..fcaa1e6904 100644
--- a/src/MDataStd/MDataStd_ByteArrayRetrievalDriver_1.cdl
+++ b/src/MDataStd/MDataStd_ByteArrayRetrievalDriver_1.cdl
@@ -27,17 +27,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ByteArrayRetrievalDriver_1 from MDataStd;
+    returns ByteArrayRetrievalDriver_1 from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_ByteArrayStorageDriver.cdl b/src/MDataStd/MDataStd_ByteArrayStorageDriver.cdl
index aa8195e6af..d2057b5cc0 100644
--- a/src/MDataStd/MDataStd_ByteArrayStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_ByteArrayStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ByteArrayStorageDriver from MDataStd;
+    returns ByteArrayStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end ByteArrayStorageDriver;
diff --git a/src/MDataStd/MDataStd_CommentRetrievalDriver.cdl b/src/MDataStd/MDataStd_CommentRetrievalDriver.cdl
index 45520f1ae6..0b007a1cdb 100644
--- a/src/MDataStd/MDataStd_CommentRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_CommentRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable CommentRetrievalDriver from MDataStd;
+    returns CommentRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Comment from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end CommentRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_CommentStorageDriver.cdl b/src/MDataStd/MDataStd_CommentStorageDriver.cdl
index ebb8805541..fcd4aca3a6 100644
--- a/src/MDataStd/MDataStd_CommentStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_CommentStorageDriver.cdl
@@ -28,7 +28,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM) 
-    returns mutable CommentStorageDriver from MDataStd;
+    returns CommentStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -38,12 +38,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_DirectoryRetrievalDriver.cdl b/src/MDataStd/MDataStd_DirectoryRetrievalDriver.cdl
index f19d754ba5..a1a060f5c7 100644
--- a/src/MDataStd/MDataStd_DirectoryRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_DirectoryRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable DirectoryRetrievalDriver from MDataStd;
+    returns DirectoryRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Directory from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end DirectoryRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_DirectoryStorageDriver.cdl b/src/MDataStd/MDataStd_DirectoryStorageDriver.cdl
index e4a1d84e53..701e967c92 100644
--- a/src/MDataStd/MDataStd_DirectoryStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_DirectoryStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM) 
-    returns mutable DirectoryStorageDriver from MDataStd;
+    returns DirectoryStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_ExpressionRetrievalDriver.cdl b/src/MDataStd/MDataStd_ExpressionRetrievalDriver.cdl
index 67d7a942a4..117cebfb5a 100644
--- a/src/MDataStd/MDataStd_ExpressionRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_ExpressionRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable ExpressionRetrievalDriver from MDataStd;
+    returns ExpressionRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Expression from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end ExpressionRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_ExpressionStorageDriver.cdl b/src/MDataStd/MDataStd_ExpressionStorageDriver.cdl
index b89bb924c7..313e48e241 100644
--- a/src/MDataStd/MDataStd_ExpressionStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_ExpressionStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM) 
-    returns mutable ExpressionStorageDriver from MDataStd;
+    returns ExpressionStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,11 +37,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me; Source     :         Attribute from TDF;
-    	      Target     : mutable Attribute from PDF;
+    	      Target     : Attribute from PDF;
     	      RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_ExtStringArrayRetrievalDriver.cdl b/src/MDataStd/MDataStd_ExtStringArrayRetrievalDriver.cdl
index eab02fd395..ea105d411a 100644
--- a/src/MDataStd/MDataStd_ExtStringArrayRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_ExtStringArrayRetrievalDriver.cdl
@@ -24,7 +24,7 @@ uses RRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable ExtStringArrayRetrievalDriver from MDataStd;
+    returns ExtStringArrayRetrievalDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -34,12 +34,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: ExtStringArray from PDataStd.
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_ExtStringArrayRetrievalDriver_1.cdl b/src/MDataStd/MDataStd_ExtStringArrayRetrievalDriver_1.cdl
index b4c6ddb3f7..b35ba9630a 100644
--- a/src/MDataStd/MDataStd_ExtStringArrayRetrievalDriver_1.cdl
+++ b/src/MDataStd/MDataStd_ExtStringArrayRetrievalDriver_1.cdl
@@ -26,7 +26,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ExtStringArrayRetrievalDriver_1 from MDataStd;
+    returns ExtStringArrayRetrievalDriver_1 from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: ExtStringArray from PDataStd.
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end ExtStringArrayRetrievalDriver_1;
diff --git a/src/MDataStd/MDataStd_ExtStringArrayStorageDriver.cdl b/src/MDataStd/MDataStd_ExtStringArrayStorageDriver.cdl
index 6c3cdf4875..6aaa8fd69f 100644
--- a/src/MDataStd/MDataStd_ExtStringArrayStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_ExtStringArrayStorageDriver.cdl
@@ -24,7 +24,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable ExtStringArrayStorageDriver from MDataStd;
+    returns ExtStringArrayStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -34,12 +34,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: ExtStringArray from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_ExtStringListRetrievalDriver.cdl b/src/MDataStd/MDataStd_ExtStringListRetrievalDriver.cdl
index 34a69e024c..b194aeb0c7 100644
--- a/src/MDataStd/MDataStd_ExtStringListRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_ExtStringListRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ExtStringListRetrievalDriver from MDataStd;
+    returns ExtStringListRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end ExtStringListRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_ExtStringListStorageDriver.cdl b/src/MDataStd/MDataStd_ExtStringListStorageDriver.cdl
index 4b63f00f34..041d005163 100644
--- a/src/MDataStd/MDataStd_ExtStringListStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_ExtStringListStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ExtStringListStorageDriver from MDataStd;
+    returns ExtStringListStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end ExtStringListStorageDriver;
diff --git a/src/MDataStd/MDataStd_IntPackedMapRetrievalDriver.cdl b/src/MDataStd/MDataStd_IntPackedMapRetrievalDriver.cdl
index a4cc980a97..0b5deb6ab6 100644
--- a/src/MDataStd/MDataStd_IntPackedMapRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_IntPackedMapRetrievalDriver.cdl
@@ -25,7 +25,7 @@ uses
 
 is
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable IntPackedMapRetrievalDriver from MDataStd;
+    returns IntPackedMapRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,12 +35,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: IntPackedMap from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end IntPackedMapRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_IntPackedMapRetrievalDriver_1.cdl b/src/MDataStd/MDataStd_IntPackedMapRetrievalDriver_1.cdl
index bb9d930c66..ffacc87ac8 100644
--- a/src/MDataStd/MDataStd_IntPackedMapRetrievalDriver_1.cdl
+++ b/src/MDataStd/MDataStd_IntPackedMapRetrievalDriver_1.cdl
@@ -26,7 +26,7 @@ uses
 
 is
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable IntPackedMapRetrievalDriver_1 from MDataStd;
+    returns IntPackedMapRetrievalDriver_1 from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: IntPackedMap_1 from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_IntPackedMapStorageDriver.cdl b/src/MDataStd/MDataStd_IntPackedMapStorageDriver.cdl
index 475c50b4f3..a7d052d503 100644
--- a/src/MDataStd/MDataStd_IntPackedMapStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_IntPackedMapStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable IntPackedMapStorageDriver from MDataStd;
+    returns IntPackedMapStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,12 +35,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end IntPackedMapStorageDriver;
diff --git a/src/MDataStd/MDataStd_IntegerArrayRetrievalDriver.cdl b/src/MDataStd/MDataStd_IntegerArrayRetrievalDriver.cdl
index a296e76c67..a82eb0551e 100644
--- a/src/MDataStd/MDataStd_IntegerArrayRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_IntegerArrayRetrievalDriver.cdl
@@ -26,7 +26,7 @@ uses RRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable IntegerArrayRetrievalDriver from MDataStd;
+    returns IntegerArrayRetrievalDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: IntegerArray from PDataStd.
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_IntegerArrayRetrievalDriver_1.cdl b/src/MDataStd/MDataStd_IntegerArrayRetrievalDriver_1.cdl
index 8ddcf725f4..2f981e3169 100644
--- a/src/MDataStd/MDataStd_IntegerArrayRetrievalDriver_1.cdl
+++ b/src/MDataStd/MDataStd_IntegerArrayRetrievalDriver_1.cdl
@@ -27,7 +27,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM) 
-    returns mutable IntegerArrayRetrievalDriver_1 from MDataStd;
+    returns IntegerArrayRetrievalDriver_1 from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: IntegerArray from PDataStd.
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_IntegerArrayStorageDriver.cdl b/src/MDataStd/MDataStd_IntegerArrayStorageDriver.cdl
index d1bbd4ae52..3d7dcfca6e 100644
--- a/src/MDataStd/MDataStd_IntegerArrayStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_IntegerArrayStorageDriver.cdl
@@ -25,7 +25,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable IntegerArrayStorageDriver from MDataStd;
+    returns IntegerArrayStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,12 +35,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: IntegerArray from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_IntegerListRetrievalDriver.cdl b/src/MDataStd/MDataStd_IntegerListRetrievalDriver.cdl
index fcd5ac1ca9..5cc67f5fbe 100644
--- a/src/MDataStd/MDataStd_IntegerListRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_IntegerListRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable IntegerListRetrievalDriver from MDataStd;
+    returns IntegerListRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end IntegerListRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_IntegerListStorageDriver.cdl b/src/MDataStd/MDataStd_IntegerListStorageDriver.cdl
index b5bec22636..b94a6b254e 100644
--- a/src/MDataStd/MDataStd_IntegerListStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_IntegerListStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable IntegerListStorageDriver from MDataStd;
+    returns IntegerListStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end IntegerListStorageDriver;
diff --git a/src/MDataStd/MDataStd_IntegerRetrievalDriver.cdl b/src/MDataStd/MDataStd_IntegerRetrievalDriver.cdl
index 58452267a6..92b1499021 100644
--- a/src/MDataStd/MDataStd_IntegerRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_IntegerRetrievalDriver.cdl
@@ -27,7 +27,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable IntegerRetrievalDriver from MDataStd;
+    returns IntegerRetrievalDriver from MDataStd;
     
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -36,11 +36,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end IntegerRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_IntegerStorageDriver.cdl b/src/MDataStd/MDataStd_IntegerStorageDriver.cdl
index 89215b29fe..db516d75a3 100644
--- a/src/MDataStd/MDataStd_IntegerStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_IntegerStorageDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create (theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable IntegerStorageDriver from MDataStd;
+    returns IntegerStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_NameRetrievalDriver.cdl b/src/MDataStd/MDataStd_NameRetrievalDriver.cdl
index 4cc8cc3038..e97acc6ad8 100644
--- a/src/MDataStd/MDataStd_NameRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_NameRetrievalDriver.cdl
@@ -26,7 +26,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable NameRetrievalDriver from MDataStd;
+    returns NameRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Name from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end NameRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_NameStorageDriver.cdl b/src/MDataStd/MDataStd_NameStorageDriver.cdl
index 68a7202dd7..d191bb21d1 100644
--- a/src/MDataStd/MDataStd_NameStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_NameStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable NameStorageDriver from MDataStd;
+    returns NameStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_NamedDataRetrievalDriver.cdl b/src/MDataStd/MDataStd_NamedDataRetrievalDriver.cdl
index 0d48c4f9d7..2197f4dafe 100644
--- a/src/MDataStd/MDataStd_NamedDataRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_NamedDataRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 
 is
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable NamedDataRetrievalDriver from MDataStd;
+    returns NamedDataRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end NamedDataRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_NamedDataStorageDriver.cdl b/src/MDataStd/MDataStd_NamedDataStorageDriver.cdl
index 407af35bda..06a5aeeff4 100644
--- a/src/MDataStd/MDataStd_NamedDataStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_NamedDataStorageDriver.cdl
@@ -26,7 +26,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable NamedDataStorageDriver from MDataStd;
+    returns NamedDataStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -35,11 +35,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end NamedDataStorageDriver;
diff --git a/src/MDataStd/MDataStd_NoteBookRetrievalDriver.cdl b/src/MDataStd/MDataStd_NoteBookRetrievalDriver.cdl
index d7641f8726..c3bcd37377 100644
--- a/src/MDataStd/MDataStd_NoteBookRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_NoteBookRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable NoteBookRetrievalDriver from MDataStd;
+    returns NoteBookRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: NoteBook from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end NoteBookRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_NoteBookStorageDriver.cdl b/src/MDataStd/MDataStd_NoteBookStorageDriver.cdl
index b65a060d5d..2f08a994f6 100644
--- a/src/MDataStd/MDataStd_NoteBookStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_NoteBookStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM) 
-    returns mutable NoteBookStorageDriver from MDataStd;
+    returns NoteBookStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_RealArrayRetrievalDriver.cdl b/src/MDataStd/MDataStd_RealArrayRetrievalDriver.cdl
index 3946ef9cd0..a0e5c46951 100644
--- a/src/MDataStd/MDataStd_RealArrayRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_RealArrayRetrievalDriver.cdl
@@ -25,7 +25,7 @@ uses RRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable RealArrayRetrievalDriver from MDataStd;
+    returns RealArrayRetrievalDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,12 +35,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: RealArray from PDataStd.
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_RealArrayRetrievalDriver_1.cdl b/src/MDataStd/MDataStd_RealArrayRetrievalDriver_1.cdl
index f503e36a60..2a56b11555 100644
--- a/src/MDataStd/MDataStd_RealArrayRetrievalDriver_1.cdl
+++ b/src/MDataStd/MDataStd_RealArrayRetrievalDriver_1.cdl
@@ -26,7 +26,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  
-    returns mutable RealArrayRetrievalDriver_1 from MDataStd;
+    returns RealArrayRetrievalDriver_1 from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: RealArray from PDataStd.
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_RealArrayStorageDriver.cdl b/src/MDataStd/MDataStd_RealArrayStorageDriver.cdl
index 7c1545cb7e..b2f0a2a1e2 100644
--- a/src/MDataStd/MDataStd_RealArrayStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_RealArrayStorageDriver.cdl
@@ -25,7 +25,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable RealArrayStorageDriver from MDataStd;
+    returns RealArrayStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,12 +35,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: RealArray from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_RealListRetrievalDriver.cdl b/src/MDataStd/MDataStd_RealListRetrievalDriver.cdl
index 6e4ff81da6..60d34b62ec 100644
--- a/src/MDataStd/MDataStd_RealListRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_RealListRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable RealListRetrievalDriver from MDataStd;
+    returns RealListRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end RealListRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_RealListStorageDriver.cdl b/src/MDataStd/MDataStd_RealListStorageDriver.cdl
index bd324606c8..883642f2e3 100644
--- a/src/MDataStd/MDataStd_RealListStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_RealListStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable RealListStorageDriver from MDataStd;
+    returns RealListStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end RealListStorageDriver;
diff --git a/src/MDataStd/MDataStd_RealRetrievalDriver.cdl b/src/MDataStd/MDataStd_RealRetrievalDriver.cdl
index c3378557a0..832ddf7b4d 100644
--- a/src/MDataStd/MDataStd_RealRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_RealRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable RealRetrievalDriver from MDataStd;
+    returns RealRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Real from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end RealRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_RealStorageDriver.cdl b/src/MDataStd/MDataStd_RealStorageDriver.cdl
index 0ee00eff70..2ef1fdb711 100644
--- a/src/MDataStd/MDataStd_RealStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_RealStorageDriver.cdl
@@ -25,7 +25,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable RealStorageDriver from MDataStd;
+    returns RealStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,12 +35,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Real from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_ReferenceArrayRetrievalDriver.cdl b/src/MDataStd/MDataStd_ReferenceArrayRetrievalDriver.cdl
index 41001f30ae..04f55e0a8f 100644
--- a/src/MDataStd/MDataStd_ReferenceArrayRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_ReferenceArrayRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ReferenceArrayRetrievalDriver from MDataStd;
+    returns ReferenceArrayRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end ReferenceArrayRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_ReferenceArrayStorageDriver.cdl b/src/MDataStd/MDataStd_ReferenceArrayStorageDriver.cdl
index e1e1d00552..6e331676e2 100644
--- a/src/MDataStd/MDataStd_ReferenceArrayStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_ReferenceArrayStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ReferenceArrayStorageDriver from MDataStd;
+    returns ReferenceArrayStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end ReferenceArrayStorageDriver;
diff --git a/src/MDataStd/MDataStd_ReferenceListRetrievalDriver.cdl b/src/MDataStd/MDataStd_ReferenceListRetrievalDriver.cdl
index 62888b5b34..d5fcae8ec5 100644
--- a/src/MDataStd/MDataStd_ReferenceListRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_ReferenceListRetrievalDriver.cdl
@@ -25,17 +25,17 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ReferenceListRetrievalDriver from MDataStd;
+    returns ReferenceListRetrievalDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end ReferenceListRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_ReferenceListStorageDriver.cdl b/src/MDataStd/MDataStd_ReferenceListStorageDriver.cdl
index addafb34ea..de27bdb3cf 100644
--- a/src/MDataStd/MDataStd_ReferenceListStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_ReferenceListStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable ReferenceListStorageDriver from MDataStd;
+    returns ReferenceListStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     returns Type from Standard;
 
     NewEmpty (me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end ReferenceListStorageDriver;
diff --git a/src/MDataStd/MDataStd_RelationRetrievalDriver.cdl b/src/MDataStd/MDataStd_RelationRetrievalDriver.cdl
index 7d3ece83da..b7b9201a3d 100644
--- a/src/MDataStd/MDataStd_RelationRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_RelationRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)   -- Version 0
-    returns mutable RelationRetrievalDriver from MDataStd;
+    returns RelationRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,11 +37,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Relation from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me; Source     :         Attribute from PDF;
-    	      Target     : mutable Attribute from TDF;
+    	      Target     : Attribute from TDF;
     	      RelocTable : RRelocationTable  from MDF);
 
 end RelationRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_RelationStorageDriver.cdl b/src/MDataStd/MDataStd_RelationStorageDriver.cdl
index 0e2f804b99..9378f35e85 100644
--- a/src/MDataStd/MDataStd_RelationStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_RelationStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM) 
-    returns mutable RelationStorageDriver from MDataStd;
+    returns RelationStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,11 +37,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me; Source     :         Attribute from TDF;
-    	      Target     : mutable Attribute from PDF;
+    	      Target     : Attribute from PDF;
     	      RelocTable : SRelocationTable from MDF);
 
 end RelationStorageDriver;
diff --git a/src/MDataStd/MDataStd_TickRetrievalDriver.cdl b/src/MDataStd/MDataStd_TickRetrievalDriver.cdl
index d524d4a5da..84b1bc93b7 100644
--- a/src/MDataStd/MDataStd_TickRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_TickRetrievalDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM)
-    returns mutable TickRetrievalDriver from MDataStd;
+    returns TickRetrievalDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -35,11 +35,11 @@ is
     ---Purpose: Returns the type Tick from PDataStd.
 
     NewEmpty(me) 
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end TickRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_TickStorageDriver.cdl b/src/MDataStd/MDataStd_TickStorageDriver.cdl
index 45067d0dd9..ca1a9eb9ce 100644
--- a/src/MDataStd/MDataStd_TickStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_TickStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create (theMessageDriver : MessageDriver from CDM) 
-    returns mutable TickStorageDriver from MDataStd;
+    returns TickStorageDriver from MDataStd;
 
     VersionNumber(me) 
     returns Integer from Standard;
@@ -35,11 +35,11 @@ is
     ---Purpose: Returns the type Tick from TDataStd.
 
     NewEmpty(me) 
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end TickStorageDriver;
diff --git a/src/MDataStd/MDataStd_TreeNodeRetrievalDriver.cdl b/src/MDataStd/MDataStd_TreeNodeRetrievalDriver.cdl
index ad2bbf651f..a223f9bf89 100644
--- a/src/MDataStd/MDataStd_TreeNodeRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_TreeNodeRetrievalDriver.cdl
@@ -27,7 +27,7 @@ uses
 is
  
     Create (theMessageDriver : MessageDriver from CDM) 
-     returns mutable TreeNodeRetrievalDriver from MDataStd;
+     returns TreeNodeRetrievalDriver from MDataStd;
     
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end TreeNodeRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_TreeNodeStorageDriver.cdl b/src/MDataStd/MDataStd_TreeNodeStorageDriver.cdl
index 018a5813eb..3db2db4c56 100644
--- a/src/MDataStd/MDataStd_TreeNodeStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_TreeNodeStorageDriver.cdl
@@ -26,7 +26,7 @@ uses
 is 
 
     Create (theMessageDriver : MessageDriver from CDM) 
-    returns mutable TreeNodeStorageDriver from MDataStd;
+    returns TreeNodeStorageDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -34,11 +34,11 @@ is
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end TreeNodeStorageDriver;
diff --git a/src/MDataStd/MDataStd_UAttributeRetrievalDriver.cdl b/src/MDataStd/MDataStd_UAttributeRetrievalDriver.cdl
index 7a830bdc2a..77fbb3bff7 100644
--- a/src/MDataStd/MDataStd_UAttributeRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_UAttributeRetrievalDriver.cdl
@@ -25,7 +25,7 @@ uses RRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable UAttributeRetrievalDriver from MDataStd;
+    returns UAttributeRetrievalDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,12 +35,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: UAttribute from PDataStd.
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_UAttributeStorageDriver.cdl b/src/MDataStd/MDataStd_UAttributeStorageDriver.cdl
index 42443dda85..31dbe664b5 100644
--- a/src/MDataStd/MDataStd_UAttributeStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_UAttributeStorageDriver.cdl
@@ -26,7 +26,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable UAttributeStorageDriver from MDataStd;
+    returns UAttributeStorageDriver from MDataStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: UAttribute from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataStd/MDataStd_VariableRetrievalDriver.cdl b/src/MDataStd/MDataStd_VariableRetrievalDriver.cdl
index 77325c54a2..a9a54c0829 100644
--- a/src/MDataStd/MDataStd_VariableRetrievalDriver.cdl
+++ b/src/MDataStd/MDataStd_VariableRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)   -- Version 0
-    returns mutable VariableRetrievalDriver from MDataStd;
+    returns VariableRetrievalDriver from MDataStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,11 +37,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Variable from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me; Source     :         Attribute from PDF;
-    	      Target     : mutable Attribute from TDF;
+    	      Target     : Attribute from TDF;
     	      RelocTable : RRelocationTable  from MDF);
 
 end VariableRetrievalDriver;
diff --git a/src/MDataStd/MDataStd_VariableStorageDriver.cdl b/src/MDataStd/MDataStd_VariableStorageDriver.cdl
index c04550ef65..7a1b83deff 100644
--- a/src/MDataStd/MDataStd_VariableStorageDriver.cdl
+++ b/src/MDataStd/MDataStd_VariableStorageDriver.cdl
@@ -26,7 +26,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable VariableStorageDriver from MDataStd;
+    returns VariableStorageDriver from MDataStd;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Variable from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me; Source     :         Attribute from TDF;
-    	      Target     : mutable Attribute from PDF;
+    	      Target     : Attribute from PDF;
     	      RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataXtd/MDataXtd_AxisRetrievalDriver.cdl b/src/MDataXtd/MDataXtd_AxisRetrievalDriver.cdl
index 44e92ba16a..39d66a21ac 100644
--- a/src/MDataXtd/MDataXtd_AxisRetrievalDriver.cdl
+++ b/src/MDataXtd/MDataXtd_AxisRetrievalDriver.cdl
@@ -31,7 +31,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable AxisRetrievalDriver from MDataXtd;
+    returns AxisRetrievalDriver from MDataXtd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -41,12 +41,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Axis from PDataXtd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end AxisRetrievalDriver;
diff --git a/src/MDataXtd/MDataXtd_AxisStorageDriver.cdl b/src/MDataXtd/MDataXtd_AxisStorageDriver.cdl
index 678cfafe4f..bb48631d13 100644
--- a/src/MDataXtd/MDataXtd_AxisStorageDriver.cdl
+++ b/src/MDataXtd/MDataXtd_AxisStorageDriver.cdl
@@ -29,7 +29,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable AxisStorageDriver from MDataXtd;
+    returns AxisStorageDriver from MDataXtd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -39,12 +39,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataXtd/MDataXtd_ConstraintRetrievalDriver.cdl b/src/MDataXtd/MDataXtd_ConstraintRetrievalDriver.cdl
index 38c95bf078..b5feb9ba35 100644
--- a/src/MDataXtd/MDataXtd_ConstraintRetrievalDriver.cdl
+++ b/src/MDataXtd/MDataXtd_ConstraintRetrievalDriver.cdl
@@ -32,7 +32,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable ConstraintRetrievalDriver from MDataXtd;
+    returns ConstraintRetrievalDriver from MDataXtd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -42,12 +42,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Constraint from PDataXtd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end ConstraintRetrievalDriver;
diff --git a/src/MDataXtd/MDataXtd_ConstraintStorageDriver.cdl b/src/MDataXtd/MDataXtd_ConstraintStorageDriver.cdl
index fbe19dddde..496a8f9bec 100644
--- a/src/MDataXtd/MDataXtd_ConstraintStorageDriver.cdl
+++ b/src/MDataXtd/MDataXtd_ConstraintStorageDriver.cdl
@@ -29,7 +29,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM) 
-    returns mutable ConstraintStorageDriver from MDataXtd;
+    returns ConstraintStorageDriver from MDataXtd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -39,12 +39,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataXtd/MDataXtd_GeometryRetrievalDriver.cdl b/src/MDataXtd/MDataXtd_GeometryRetrievalDriver.cdl
index 58122cf9a3..2780cb1f40 100644
--- a/src/MDataXtd/MDataXtd_GeometryRetrievalDriver.cdl
+++ b/src/MDataXtd/MDataXtd_GeometryRetrievalDriver.cdl
@@ -31,7 +31,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable GeometryRetrievalDriver from MDataXtd;
+    returns GeometryRetrievalDriver from MDataXtd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -41,12 +41,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Geometry from PDataXtd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end GeometryRetrievalDriver;
diff --git a/src/MDataXtd/MDataXtd_GeometryStorageDriver.cdl b/src/MDataXtd/MDataXtd_GeometryStorageDriver.cdl
index d2896765c6..cc3c59dc76 100644
--- a/src/MDataXtd/MDataXtd_GeometryStorageDriver.cdl
+++ b/src/MDataXtd/MDataXtd_GeometryStorageDriver.cdl
@@ -30,7 +30,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM) 
-    returns mutable GeometryStorageDriver from MDataXtd;
+    returns GeometryStorageDriver from MDataXtd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -40,12 +40,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataXtd/MDataXtd_PatternStdRetrievalDriver.cdl b/src/MDataXtd/MDataXtd_PatternStdRetrievalDriver.cdl
index 140ec794b6..c336fcc6f7 100644
--- a/src/MDataXtd/MDataXtd_PatternStdRetrievalDriver.cdl
+++ b/src/MDataXtd/MDataXtd_PatternStdRetrievalDriver.cdl
@@ -29,7 +29,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable PatternStdRetrievalDriver from MDataXtd;
+    returns PatternStdRetrievalDriver from MDataXtd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -39,12 +39,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: PatternStd from PDataXtd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end PatternStdRetrievalDriver;
diff --git a/src/MDataXtd/MDataXtd_PatternStdStorageDriver.cdl b/src/MDataXtd/MDataXtd_PatternStdStorageDriver.cdl
index 51b5deb3a8..d150e5433d 100644
--- a/src/MDataXtd/MDataXtd_PatternStdStorageDriver.cdl
+++ b/src/MDataXtd/MDataXtd_PatternStdStorageDriver.cdl
@@ -30,7 +30,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable PatternStdStorageDriver from MDataXtd;
+    returns PatternStdStorageDriver from MDataXtd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -40,12 +40,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataXtd/MDataXtd_PlacementRetrievalDriver.cdl b/src/MDataXtd/MDataXtd_PlacementRetrievalDriver.cdl
index 770c9fe7e2..7687c41318 100644
--- a/src/MDataXtd/MDataXtd_PlacementRetrievalDriver.cdl
+++ b/src/MDataXtd/MDataXtd_PlacementRetrievalDriver.cdl
@@ -30,7 +30,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable PlacementRetrievalDriver from MDataXtd;
+    returns PlacementRetrievalDriver from MDataXtd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -40,12 +40,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Placement from PDataXtd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end PlacementRetrievalDriver;
diff --git a/src/MDataXtd/MDataXtd_PlacementStorageDriver.cdl b/src/MDataXtd/MDataXtd_PlacementStorageDriver.cdl
index f48d8e4d56..dc7510c45a 100644
--- a/src/MDataXtd/MDataXtd_PlacementStorageDriver.cdl
+++ b/src/MDataXtd/MDataXtd_PlacementStorageDriver.cdl
@@ -28,7 +28,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM) 
-    returns mutable PlacementStorageDriver from MDataXtd;
+    returns PlacementStorageDriver from MDataXtd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -38,12 +38,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataXtd/MDataXtd_PlaneRetrievalDriver.cdl b/src/MDataXtd/MDataXtd_PlaneRetrievalDriver.cdl
index 90f89a4c40..10da8291c1 100644
--- a/src/MDataXtd/MDataXtd_PlaneRetrievalDriver.cdl
+++ b/src/MDataXtd/MDataXtd_PlaneRetrievalDriver.cdl
@@ -29,7 +29,7 @@ is
 
 
     Create (theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable PlaneRetrievalDriver from MDataXtd;
+    returns PlaneRetrievalDriver from MDataXtd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -39,12 +39,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Plane from PDataXtd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end PlaneRetrievalDriver;
diff --git a/src/MDataXtd/MDataXtd_PlaneStorageDriver.cdl b/src/MDataXtd/MDataXtd_PlaneStorageDriver.cdl
index 3a7620399c..484d901607 100644
--- a/src/MDataXtd/MDataXtd_PlaneStorageDriver.cdl
+++ b/src/MDataXtd/MDataXtd_PlaneStorageDriver.cdl
@@ -29,7 +29,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable PlaneStorageDriver from MDataXtd;
+    returns PlaneStorageDriver from MDataXtd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -39,12 +39,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataXtd/MDataXtd_PointRetrievalDriver.cdl b/src/MDataXtd/MDataXtd_PointRetrievalDriver.cdl
index 6b81e0bda2..623e5009f2 100644
--- a/src/MDataXtd/MDataXtd_PointRetrievalDriver.cdl
+++ b/src/MDataXtd/MDataXtd_PointRetrievalDriver.cdl
@@ -30,7 +30,7 @@ is
 
 
     Create (theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable PointRetrievalDriver from MDataXtd;
+    returns PointRetrievalDriver from MDataXtd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -40,12 +40,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Point from PDataXtd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end PointRetrievalDriver;
diff --git a/src/MDataXtd/MDataXtd_PointStorageDriver.cdl b/src/MDataXtd/MDataXtd_PointStorageDriver.cdl
index 71f4c9fa33..96ce49c874 100644
--- a/src/MDataXtd/MDataXtd_PointStorageDriver.cdl
+++ b/src/MDataXtd/MDataXtd_PointStorageDriver.cdl
@@ -29,7 +29,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable PointStorageDriver from MDataXtd;
+    returns PointStorageDriver from MDataXtd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -39,12 +39,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDataXtd/MDataXtd_ShapeRetrievalDriver.cdl b/src/MDataXtd/MDataXtd_ShapeRetrievalDriver.cdl
index dc4dce4148..0235248932 100644
--- a/src/MDataXtd/MDataXtd_ShapeRetrievalDriver.cdl
+++ b/src/MDataXtd/MDataXtd_ShapeRetrievalDriver.cdl
@@ -30,7 +30,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable ShapeRetrievalDriver from MDataXtd;
+    returns ShapeRetrievalDriver from MDataXtd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -40,12 +40,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Shape from PDataXtd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end ShapeRetrievalDriver;
diff --git a/src/MDataXtd/MDataXtd_ShapeStorageDriver.cdl b/src/MDataXtd/MDataXtd_ShapeStorageDriver.cdl
index e08902c91b..62f4fe0e03 100644
--- a/src/MDataXtd/MDataXtd_ShapeStorageDriver.cdl
+++ b/src/MDataXtd/MDataXtd_ShapeStorageDriver.cdl
@@ -29,7 +29,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM) 
-    returns mutable ShapeStorageDriver from MDataXtd;
+    returns ShapeStorageDriver from MDataXtd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -39,12 +39,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MDocStd/MDocStd_DocumentRetrievalDriver.cdl b/src/MDocStd/MDocStd_DocumentRetrievalDriver.cdl
index f3dddfc0ad..5b1a59b814 100644
--- a/src/MDocStd/MDocStd_DocumentRetrievalDriver.cdl
+++ b/src/MDocStd/MDocStd_DocumentRetrievalDriver.cdl
@@ -31,7 +31,7 @@ is
 
 
     Create
-    returns mutable DocumentRetrievalDriver from MDocStd;    
+    returns DocumentRetrievalDriver from MDocStd;    
 
     Paste (me : mutable; PDOC   : Document from PDocStd;
                          TDOC   : Document from TDocStd;
@@ -40,7 +40,7 @@ is
     ---Purpose: deferred methods of RetrievalDriver from PCDM
     --          =============================================
 
-    Make (me : mutable; aPCDM: Document from PCDM; aCDM : mutable Document from CDM); 
+    Make (me : mutable; aPCDM: Document from PCDM; aCDM : Document from CDM); 
 
     ---Purpose: virtual methods (may be redefined by specialized application)
     --          =============================================================
diff --git a/src/MDocStd/MDocStd_DocumentStorageDriver.cdl b/src/MDocStd/MDocStd_DocumentStorageDriver.cdl
index 6c1ff8977b..4d558dd1a1 100644
--- a/src/MDocStd/MDocStd_DocumentStorageDriver.cdl
+++ b/src/MDocStd/MDocStd_DocumentStorageDriver.cdl
@@ -33,7 +33,7 @@ is
 
 
     Create
-    returns mutable  DocumentStorageDriver from MDocStd;
+    returns  DocumentStorageDriver from MDocStd;
     
     CreateDocument (me: mutable) returns Document from PCDM
     ---Purpose: returns an empty PDocStd_Document. may be redefined;
diff --git a/src/MDocStd/MDocStd_XLinkRetrievalDriver.cdl b/src/MDocStd/MDocStd_XLinkRetrievalDriver.cdl
index 31ecf7a25a..4a1d01d695 100644
--- a/src/MDocStd/MDocStd_XLinkRetrievalDriver.cdl
+++ b/src/MDocStd/MDocStd_XLinkRetrievalDriver.cdl
@@ -36,7 +36,7 @@ uses
 is
 
     Create (theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable XLinkRetrievalDriver from MDocStd;
+    returns XLinkRetrievalDriver from MDocStd;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -46,12 +46,12 @@ is
 	---Purpose: Returns the type XLink from PXref.
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
 
     Paste(me;
     	  aSource     :          Attribute        from PDF;
-    	  aTarget     : mutable  Attribute        from TDF;
+    	  aTarget     :  Attribute        from TDF;
     	  aRelocTable :          RRelocationTable from MDF);
 
 
diff --git a/src/MDocStd/MDocStd_XLinkStorageDriver.cdl b/src/MDocStd/MDocStd_XLinkStorageDriver.cdl
index 6754bcd8b2..33139ad8de 100644
--- a/src/MDocStd/MDocStd_XLinkStorageDriver.cdl
+++ b/src/MDocStd/MDocStd_XLinkStorageDriver.cdl
@@ -36,7 +36,7 @@ uses
 is
 
     Create(theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable XLinkStorageDriver from MDocStd;
+    returns XLinkStorageDriver from MDocStd;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -46,12 +46,12 @@ is
 	---Purpose: Returns the type: XLink from TXLink.
 
     NewEmpty (me)
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
 
     Paste(me;
     	  aSource     :         Attribute        from TDF;
-    	  aTarget     : mutable Attribute        from PDF;
+    	  aTarget     : Attribute        from PDF;
     	  aRelocTable :         SRelocationTable from MDF);
 	  
 	  
diff --git a/src/MFunction/MFunction_FunctionRetrievalDriver.cdl b/src/MFunction/MFunction_FunctionRetrievalDriver.cdl
index 8e1f26dbfb..da5cd15aaf 100644
--- a/src/MFunction/MFunction_FunctionRetrievalDriver.cdl
+++ b/src/MFunction/MFunction_FunctionRetrievalDriver.cdl
@@ -27,7 +27,7 @@ uses
 is
  
     Create(theMessageDriver : MessageDriver from CDM) 
-     returns mutable FunctionRetrievalDriver from MFunction;
+     returns FunctionRetrievalDriver from MFunction;
     
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end FunctionRetrievalDriver;
diff --git a/src/MFunction/MFunction_FunctionStorageDriver.cdl b/src/MFunction/MFunction_FunctionStorageDriver.cdl
index 5bcbd35a16..08f37857a6 100644
--- a/src/MFunction/MFunction_FunctionStorageDriver.cdl
+++ b/src/MFunction/MFunction_FunctionStorageDriver.cdl
@@ -26,7 +26,7 @@ uses
 is 
 
     Create(theMessageDriver : MessageDriver from CDM)  
-    returns mutable FunctionStorageDriver from MFunction;
+    returns FunctionStorageDriver from MFunction;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -34,11 +34,11 @@ is
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end FunctionStorageDriver;
diff --git a/src/MNaming/MNaming_NamedShapeRetrievalDriver.cdl b/src/MNaming/MNaming_NamedShapeRetrievalDriver.cdl
index 1c6209f0ab..eb65adf429 100644
--- a/src/MNaming/MNaming_NamedShapeRetrievalDriver.cdl
+++ b/src/MNaming/MNaming_NamedShapeRetrievalDriver.cdl
@@ -29,7 +29,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable NamedShapeRetrievalDriver from MNaming;
+    returns NamedShapeRetrievalDriver from MNaming;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -39,12 +39,12 @@ is
 	---Purpose: Returns the type NamedShape from PNaming.
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :          Attribute        from PDF;
-    	  Target     : mutable  Attribute        from TDF;
+    	  Target     :  Attribute        from TDF;
     	  RelocTable :          RRelocationTable from MDF);
 
 
diff --git a/src/MNaming/MNaming_NamedShapeStorageDriver.cdl b/src/MNaming/MNaming_NamedShapeStorageDriver.cdl
index 729b02d5ce..2c23dd630b 100644
--- a/src/MNaming/MNaming_NamedShapeStorageDriver.cdl
+++ b/src/MNaming/MNaming_NamedShapeStorageDriver.cdl
@@ -28,7 +28,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM) -- Version 0
-    returns mutable NamedShapeStorageDriver from MNaming;
+    returns NamedShapeStorageDriver from MNaming;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -38,12 +38,12 @@ is
 	---Purpose: Returns the type: NamedShape from PNaming.
 
     NewEmpty (me)
-    returns mutable Attribute from PDF;
+    returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute        from TDF;
-    	  Target     : mutable Attribute        from PDF;
+    	  Target     : Attribute        from PDF;
     	  RelocTable :         SRelocationTable from MDF);
 	  
 	  
diff --git a/src/MNaming/MNaming_NamingRetrievalDriver.cdl b/src/MNaming/MNaming_NamingRetrievalDriver.cdl
index de1621cbfb..10a7b30f22 100644
--- a/src/MNaming/MNaming_NamingRetrievalDriver.cdl
+++ b/src/MNaming/MNaming_NamingRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable NamingRetrievalDriver from MNaming;
+    returns NamingRetrievalDriver from MNaming;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Constraint from PDataStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 
diff --git a/src/MNaming/MNaming_NamingRetrievalDriver_1.cdl b/src/MNaming/MNaming_NamingRetrievalDriver_1.cdl
index 041241026d..357330e9f5 100644
--- a/src/MNaming/MNaming_NamingRetrievalDriver_1.cdl
+++ b/src/MNaming/MNaming_NamingRetrievalDriver_1.cdl
@@ -26,7 +26,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  
-    returns mutable NamingRetrievalDriver_1 from MNaming;
+    returns NamingRetrievalDriver_1 from MNaming;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Naming from PNaming.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 
diff --git a/src/MNaming/MNaming_NamingRetrievalDriver_2.cdl b/src/MNaming/MNaming_NamingRetrievalDriver_2.cdl
index b64d99c6ba..02fcbce927 100644
--- a/src/MNaming/MNaming_NamingRetrievalDriver_2.cdl
+++ b/src/MNaming/MNaming_NamingRetrievalDriver_2.cdl
@@ -26,7 +26,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  
-    returns mutable NamingRetrievalDriver_2 from MNaming;
+    returns NamingRetrievalDriver_2 from MNaming;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Naming from PNaming.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 
diff --git a/src/MNaming/MNaming_NamingStorageDriver.cdl b/src/MNaming/MNaming_NamingStorageDriver.cdl
index 63b7a0088d..f9c1acbc9f 100644
--- a/src/MNaming/MNaming_NamingStorageDriver.cdl
+++ b/src/MNaming/MNaming_NamingStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
    
     Create(theMessageDriver : MessageDriver from CDM) 
-    returns mutable NamingStorageDriver from MNaming;
+    returns NamingStorageDriver from MNaming;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -36,12 +36,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: Integer from TDataStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver.cdl b/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver.cdl
index 896d6dafcb..f9cc433e89 100644
--- a/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver.cdl
+++ b/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable AISPresentationRetrievalDriver from MPrsStd;
+    returns AISPresentationRetrievalDriver from MPrsStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: AISPresentation from PPrsStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end AISPresentationRetrievalDriver;
diff --git a/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver_1.cdl b/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver_1.cdl
index c12f49cbed..f9ba1dea4a 100644
--- a/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver_1.cdl
+++ b/src/MPrsStd/MPrsStd_AISPresentationRetrievalDriver_1.cdl
@@ -27,7 +27,7 @@ is
 
 
     Create (theMessageDriver : MessageDriver from CDM) -- Version 1
-    returns mutable AISPresentationRetrievalDriver_1 from MPrsStd;
+    returns AISPresentationRetrievalDriver_1 from MPrsStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: AISPresentation from PPrsStd.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
  
diff --git a/src/MPrsStd/MPrsStd_AISPresentationStorageDriver.cdl b/src/MPrsStd/MPrsStd_AISPresentationStorageDriver.cdl
index a0e3865fb1..d1fc5e094c 100644
--- a/src/MPrsStd/MPrsStd_AISPresentationStorageDriver.cdl
+++ b/src/MPrsStd/MPrsStd_AISPresentationStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable AISPresentationStorageDriver from MPrsStd;
+    returns AISPresentationStorageDriver from MPrsStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: AISPresentation from TPrsStd.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MPrsStd/MPrsStd_PositionRetrievalDriver.cdl b/src/MPrsStd/MPrsStd_PositionRetrievalDriver.cdl
index 6d0b968c48..9d5c0b857b 100644
--- a/src/MPrsStd/MPrsStd_PositionRetrievalDriver.cdl
+++ b/src/MPrsStd/MPrsStd_PositionRetrievalDriver.cdl
@@ -28,7 +28,7 @@ is
 
 
     Create(theMessageDriver : MessageDriver from CDM)  -- Version 0
-    returns mutable PositionRetrievalDriver from MPrsStd;
+    returns PositionRetrievalDriver from MPrsStd;
     
 
     VersionNumber(me) returns Integer from Standard;
@@ -38,12 +38,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: ColorAttribute from PGraphicAttribute.
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end PositionRetrievalDriver;
diff --git a/src/MPrsStd/MPrsStd_PositionStorageDriver.cdl b/src/MPrsStd/MPrsStd_PositionStorageDriver.cdl
index 9491e6a78c..27ca4ee734 100644
--- a/src/MPrsStd/MPrsStd_PositionStorageDriver.cdl
+++ b/src/MPrsStd/MPrsStd_PositionStorageDriver.cdl
@@ -27,7 +27,7 @@ uses SRelocationTable from MDF,
 is
 
     Create(theMessageDriver : MessageDriver from CDM)  
-    returns mutable PositionStorageDriver from MPrsStd;
+    returns PositionStorageDriver from MPrsStd;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: ColorAttribute from TGraphicAttribute.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cdl
index 52f538c740..3091c4ddaa 100644
--- a/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_AreaRetrievalDriver.cdl
@@ -24,9 +24,9 @@ uses
 
 is
 --    Create  
---    returns mutable AreaRetrievalDriver from MXCAFDoc;
+--    returns AreaRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable AreaRetrievalDriver from MXCAFDoc;
+    returns AreaRetrievalDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Area
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end AreaRetrievalDriver from MXCAFDoc;
diff --git a/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cdl
index 17a43f8aa8..7f2d22aeb4 100644
--- a/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_AreaStorageDriver.cdl
@@ -25,9 +25,9 @@ uses
 is
 
 --    Create 
---    returns mutable AreaStorageDriver from MXCAFDoc;
+--    returns AreaStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable AreaStorageDriver from MXCAFDoc;
+    returns AreaStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -36,11 +36,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Area.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end AreaStorageDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cdl
index 67e92187ff..7846c7ee82 100644
--- a/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_CentroidRetrievalDriver.cdl
@@ -25,9 +25,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable CentroidRetrievalDriver from MXCAFDoc;
+--    returns CentroidRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable CentroidRetrievalDriver from MXCAFDoc;
+    returns CentroidRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -36,11 +36,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Centroid
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end CentroidRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cdl
index 6352f6cb79..9ba2bb28ff 100644
--- a/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_CentroidStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable CentroidStorageDriver from MXCAFDoc;
+--    returns CentroidStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable CentroidStorageDriver from MXCAFDoc;
+    returns CentroidStorageDriver from MXCAFDoc;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -38,11 +38,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Centroid.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end CentroidStorageDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_ColorRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_ColorRetrievalDriver.cdl
index 6ff4aa3072..fa3bfab71b 100644
--- a/src/MXCAFDoc/MXCAFDoc_ColorRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_ColorRetrievalDriver.cdl
@@ -25,9 +25,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable ColorRetrievalDriver from MXCAFDoc;
+--    returns ColorRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable ColorRetrievalDriver from MXCAFDoc;
+    returns ColorRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -36,11 +36,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Color
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end ColorRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_ColorStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_ColorStorageDriver.cdl
index 3e0f4571f5..de87ee5053 100644
--- a/src/MXCAFDoc/MXCAFDoc_ColorStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_ColorStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable ColorStorageDriver from MXCAFDoc;
+--    returns ColorStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable ColorStorageDriver from MXCAFDoc;
+    returns ColorStorageDriver from MXCAFDoc;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -38,12 +38,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Color.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_ColorToolRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_ColorToolRetrievalDriver.cdl
index 564b345532..601bb20103 100644
--- a/src/MXCAFDoc/MXCAFDoc_ColorToolRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_ColorToolRetrievalDriver.cdl
@@ -24,9 +24,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable ColorToolRetrievalDriver from MXCAFDoc;
+--    returns ColorToolRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable ColorToolRetrievalDriver from MXCAFDoc;
+    returns ColorToolRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Color
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end ColorToolRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_ColorToolStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_ColorToolStorageDriver.cdl
index 9d35e4d5b2..968ac94cde 100644
--- a/src/MXCAFDoc/MXCAFDoc_ColorToolStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_ColorToolStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable ColorToolStorageDriver from MXCAFDoc;
+--    returns ColorToolStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable ColorToolStorageDriver from MXCAFDoc;
+    returns ColorToolStorageDriver from MXCAFDoc;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -38,12 +38,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Color.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cdl
index 35252c18dd..732461970a 100644
--- a/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_DatumRetrievalDriver.cdl
@@ -24,7 +24,7 @@ uses
 
 is
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable DatumRetrievalDriver from MXCAFDoc;
+    returns DatumRetrievalDriver from MXCAFDoc;
 	---Purpose: Returns mutable DatumRetrievalDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Datum
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end DatumRetrievalDriver from MXCAFDoc;
diff --git a/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cdl
index 55966dcf60..5dcfcc50c7 100644
--- a/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_DatumStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable DatumStorageDriver from MXCAFDoc;
+    returns DatumStorageDriver from MXCAFDoc;
 	---Purpose: Returns mutable DatumStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Datum.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end DatumStorageDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cdl
index 848b9d80b4..3ab7845e16 100644
--- a/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_DimTolRetrievalDriver.cdl
@@ -24,7 +24,7 @@ uses
 
 is
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable DimTolRetrievalDriver from MXCAFDoc;
+    returns DimTolRetrievalDriver from MXCAFDoc;
 	---Purpose: Returns mutable DimTolRetrievalDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_DimTol
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end DimTolRetrievalDriver from MXCAFDoc;
diff --git a/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cdl
index d8f1309aa2..4461bbbb2d 100644
--- a/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_DimTolStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable DimTolStorageDriver from MXCAFDoc;
+    returns DimTolStorageDriver from MXCAFDoc;
 	---Purpose: Returns mutable DimTolStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_DimTol.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end DimTolStorageDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_DimTolToolRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_DimTolToolRetrievalDriver.cdl
index e4a14d3cf8..8f74684fc1 100644
--- a/src/MXCAFDoc/MXCAFDoc_DimTolToolRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_DimTolToolRetrievalDriver.cdl
@@ -24,9 +24,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable DimTolToolRetrievalDriver from MXCAFDoc;
+--    returns DimTolToolRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable DimTolToolRetrievalDriver from MXCAFDoc;
+    returns DimTolToolRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_DimTolTool
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end DimTolToolRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_DimTolToolStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_DimTolToolStorageDriver.cdl
index 39e20786ff..caa0a9cc7a 100644
--- a/src/MXCAFDoc/MXCAFDoc_DimTolToolStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_DimTolToolStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable DimTolToolStorageDriver from MXCAFDoc;
+--    returns DimTolToolStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable DimTolToolStorageDriver from MXCAFDoc;
+    returns DimTolToolStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_DimTolTool
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_DocumentToolRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_DocumentToolRetrievalDriver.cdl
index f688683381..fc29705d8b 100644
--- a/src/MXCAFDoc/MXCAFDoc_DocumentToolRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_DocumentToolRetrievalDriver.cdl
@@ -25,9 +25,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable DocumentToolRetrievalDriver from MXCAFDoc;
+--    returns DocumentToolRetrievalDriver from MXCAFDoc;
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable DocumentToolRetrievalDriver from MXCAFDoc;
+    returns DocumentToolRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -36,11 +36,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Color
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end DocumentToolRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_DocumentToolStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_DocumentToolStorageDriver.cdl
index 2f0dc75032..270ed85ef8 100644
--- a/src/MXCAFDoc/MXCAFDoc_DocumentToolStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_DocumentToolStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable DocumentToolStorageDriver from MXCAFDoc;
+--    returns DocumentToolStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable DocumentToolStorageDriver from MXCAFDoc;
+    returns DocumentToolStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Color.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_GraphNodeRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_GraphNodeRetrievalDriver.cdl
index c7c60b5a44..3d3045630c 100644
--- a/src/MXCAFDoc/MXCAFDoc_GraphNodeRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_GraphNodeRetrievalDriver.cdl
@@ -24,9 +24,9 @@ uses
 
 is
 
---    Create returns mutable GraphNodeRetrievalDriver from MXCAFDoc;
+--    Create returns GraphNodeRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable GraphNodeRetrievalDriver from MXCAFDoc;
+    returns GraphNodeRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -34,11 +34,11 @@ is
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable  from MDF);
 
 end GraphNodeRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_GraphNodeStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_GraphNodeStorageDriver.cdl
index df9e8eafda..4b93045b86 100644
--- a/src/MXCAFDoc/MXCAFDoc_GraphNodeStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_GraphNodeStorageDriver.cdl
@@ -23,9 +23,9 @@ uses
      MessageDriver    from CDM
 
 is
---    Create returns mutable GraphNodeStorageDriver from MXCAFDoc;
+--    Create returns GraphNodeStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable GraphNodeStorageDriver from MXCAFDoc;
+    returns GraphNodeStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -33,11 +33,11 @@ is
 
     SourceType(me) returns Type from Standard;
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end GraphNodeStorageDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_LayerToolRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_LayerToolRetrievalDriver.cdl
index 51fbb9f339..78dd744e53 100644
--- a/src/MXCAFDoc/MXCAFDoc_LayerToolRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_LayerToolRetrievalDriver.cdl
@@ -24,9 +24,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable LayerToolRetrievalDriver from MXCAFDoc;
+--    returns LayerToolRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable LayerToolRetrievalDriver from MXCAFDoc;
+    returns LayerToolRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Layer
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end LayerToolRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_LayerToolStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_LayerToolStorageDriver.cdl
index d1e9bbae3d..3fdbe0fd25 100644
--- a/src/MXCAFDoc/MXCAFDoc_LayerToolStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_LayerToolStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable LayerToolStorageDriver from MXCAFDoc;
+--    returns LayerToolStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable LayerToolStorageDriver from MXCAFDoc;
+    returns LayerToolStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Layer.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_LocationRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_LocationRetrievalDriver.cdl
index 04793be238..7b1ffd07e0 100644
--- a/src/MXCAFDoc/MXCAFDoc_LocationRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_LocationRetrievalDriver.cdl
@@ -25,9 +25,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable LocationRetrievalDriver from MXCAFDoc;
+--    returns LocationRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable LocationRetrievalDriver from MXCAFDoc;
+    returns LocationRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -36,11 +36,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Location
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end LocationRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_LocationStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_LocationStorageDriver.cdl
index 8bc26398d2..9e543da162 100644
--- a/src/MXCAFDoc/MXCAFDoc_LocationStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_LocationStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable LocationStorageDriver from MXCAFDoc;
+--    returns LocationStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable LocationStorageDriver from MXCAFDoc;
+    returns LocationStorageDriver from MXCAFDoc;
 
 
     VersionNumber(me) returns Integer from Standard;
@@ -38,12 +38,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Location.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cdl
index 101a5a664d..9f5992d19c 100644
--- a/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_MaterialRetrievalDriver.cdl
@@ -24,7 +24,7 @@ uses
 
 is
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable MaterialRetrievalDriver from MXCAFDoc;
+    returns MaterialRetrievalDriver from MXCAFDoc;
 	---Purpose: Returns mutable MaterialRetrievalDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
@@ -34,11 +34,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Material
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end MaterialRetrievalDriver from MXCAFDoc;
diff --git a/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cdl
index 66590a284d..9bf5fccb9e 100644
--- a/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_MaterialStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable MaterialStorageDriver from MXCAFDoc;
+    returns MaterialStorageDriver from MXCAFDoc;
 	---Purpose: Returns mutable MaterialStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Material.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end MaterialStorageDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_MaterialToolRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_MaterialToolRetrievalDriver.cdl
index a348815324..b4521bef06 100644
--- a/src/MXCAFDoc/MXCAFDoc_MaterialToolRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_MaterialToolRetrievalDriver.cdl
@@ -24,9 +24,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable MaterialToolRetrievalDriver from MXCAFDoc;
+--    returns MaterialToolRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable MaterialToolRetrievalDriver from MXCAFDoc;
+    returns MaterialToolRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_MaterialTool
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end MaterialToolRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_MaterialToolStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_MaterialToolStorageDriver.cdl
index 7adf0db299..b2975fc782 100644
--- a/src/MXCAFDoc/MXCAFDoc_MaterialToolStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_MaterialToolStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable MaterialToolStorageDriver from MXCAFDoc;
+--    returns MaterialToolStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable MaterialToolStorageDriver from MXCAFDoc;
+    returns MaterialToolStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_MaterialTool
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_ShapeToolRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_ShapeToolRetrievalDriver.cdl
index a14dfac083..ce42c97d0d 100644
--- a/src/MXCAFDoc/MXCAFDoc_ShapeToolRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_ShapeToolRetrievalDriver.cdl
@@ -25,9 +25,9 @@ uses
 
 is
 --    Create -- Version 0
---    returns mutable ShapeToolRetrievalDriver from MXCAFDoc;
+--    returns ShapeToolRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable ShapeToolRetrievalDriver from MXCAFDoc;
+    returns ShapeToolRetrievalDriver from MXCAFDoc;
     
     VersionNumber(me) returns Integer from Standard;
     ---Purpose: Returns the version number from which the driver
@@ -36,11 +36,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Color
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end ShapeToolRetrievalDriver;
diff --git a/src/MXCAFDoc/MXCAFDoc_ShapeToolStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_ShapeToolStorageDriver.cdl
index f8aeaac37e..70d567d125 100644
--- a/src/MXCAFDoc/MXCAFDoc_ShapeToolStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_ShapeToolStorageDriver.cdl
@@ -26,9 +26,9 @@ uses
 is
 
 --    Create  -- Version 0
---    returns mutable ShapeToolStorageDriver from MXCAFDoc;
+--    returns ShapeToolStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable ShapeToolStorageDriver from MXCAFDoc;
+    returns ShapeToolStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -37,12 +37,12 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Color.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 
diff --git a/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cdl b/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cdl
index c2c69889f6..0559cb5c1c 100644
--- a/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_VolumeRetrievalDriver.cdl
@@ -24,9 +24,9 @@ uses
 
 is
 --    Create  
---    returns mutable VolumeRetrievalDriver from MXCAFDoc;
+--    returns VolumeRetrievalDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable VolumeRetrievalDriver from MXCAFDoc;
+    returns VolumeRetrievalDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -35,11 +35,11 @@ is
     SourceType(me) returns Type from Standard;
     ---Purpose: Returns the type: XCAFDoc_Volume
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me;
     	  Source     :         Attribute from PDF;
-    	  Target     : mutable Attribute from TDF;
+    	  Target     : Attribute from TDF;
     	  RelocTable : RRelocationTable from MDF);
 
 end VolumeRetrievalDriver from MXCAFDoc;
diff --git a/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cdl b/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cdl
index 335d1c6f17..ecb94385f9 100644
--- a/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cdl
+++ b/src/MXCAFDoc/MXCAFDoc_VolumeStorageDriver.cdl
@@ -25,9 +25,9 @@ uses
 is
 
 --    Create 
---    returns mutable VolumeStorageDriver from MXCAFDoc;
+--    returns VolumeStorageDriver from MXCAFDoc;
     Create (theMsgDriver : MessageDriver from CDM)
-    returns mutable VolumeStorageDriver from MXCAFDoc;
+    returns VolumeStorageDriver from MXCAFDoc;
 
     VersionNumber(me) returns Integer from Standard;
 	---Purpose: Returns the version number from which the driver
@@ -36,11 +36,11 @@ is
     SourceType(me) returns Type from Standard;
 	---Purpose: Returns the type: XCAFDoc_Volume.
 
-    NewEmpty (me) returns mutable Attribute from PDF;
+    NewEmpty (me) returns Attribute from PDF;
 
     Paste(me;
     	  Source     :         Attribute from TDF;
-    	  Target     : mutable Attribute from PDF;
+    	  Target     : Attribute from PDF;
     	  RelocTable : SRelocationTable from MDF);
 
 end VolumeStorageDriver;
diff --git a/src/MeshTest/MeshTest_DrawableMesh.cdl b/src/MeshTest/MeshTest_DrawableMesh.cdl
index 06ecd1ff21..75a1c30ce5 100644
--- a/src/MeshTest/MeshTest_DrawableMesh.cdl
+++ b/src/MeshTest/MeshTest_DrawableMesh.cdl
@@ -28,15 +28,15 @@ uses
 
 is
 
-    Create returns mutable DrawableMesh from MeshTest;
+    Create returns DrawableMesh from MeshTest;
 
     Create(S : Shape from TopoDS; Deflect : Real; 
            Partage : Boolean; InShape: Boolean from Standard= Standard_False)
-    returns mutable DrawableMesh from MeshTest;
+    returns DrawableMesh from MeshTest;
 
 
     Create(Tr: FastDiscret from BRepMesh)
-    returns mutable DrawableMesh from MeshTest;
+    returns DrawableMesh from MeshTest;
     
     AddInShape(me: mutable; inshape: Boolean)
     is static;
@@ -58,7 +58,7 @@ is
     
     DrawOn(me; dis : in out Display from Draw);
     
-    Copy(me) returns mutable Drawable3D from Draw
+    Copy(me) returns Drawable3D from Draw
     is redefined;
 
     Dump(me; S : in out OStream)
@@ -67,7 +67,7 @@ is
     Whatis(me; S : in out Interpretor from Draw)
     is redefined;
     
-    Mesh(me) returns mutable FastDiscret from BRepMesh
+    Mesh(me) returns FastDiscret from BRepMesh
     is static;
 
 fields
diff --git a/src/MeshVS/MeshVS_DeformedDataSource.cdl b/src/MeshVS/MeshVS_DeformedDataSource.cdl
index 576db445e9..d59a6cedb5 100644
--- a/src/MeshVS/MeshVS_DeformedDataSource.cdl
+++ b/src/MeshVS/MeshVS_DeformedDataSource.cdl
@@ -39,7 +39,7 @@ uses
 is
 
   Create ( theNonDeformDS : DataSource from MeshVS;
-           theMagnify     : Real ) returns mutable DeformedDataSource from MeshVS;
+           theMagnify     : Real ) returns DeformedDataSource from MeshVS;
 	---Purpose:  Constructor
         -- theNonDeformDS is canonical non-deformed data source, by which we are able to calculate
         --   deformed mesh geometry
diff --git a/src/MeshVS/MeshVS_DummySensitiveEntity.cdl b/src/MeshVS/MeshVS_DummySensitiveEntity.cdl
index d04a58e6df..f419867c88 100644
--- a/src/MeshVS/MeshVS_DummySensitiveEntity.cdl
+++ b/src/MeshVS/MeshVS_DummySensitiveEntity.cdl
@@ -28,7 +28,7 @@ uses
   Box2d         from Bnd
 
 is
-   Create   ( OwnerId : EntityOwner from SelectBasics ) returns mutable DummySensitiveEntity from MeshVS;
+   Create   ( OwnerId : EntityOwner from SelectBasics ) returns DummySensitiveEntity from MeshVS;
 
    Areas    ( me: mutable;
               aresult: in out ListOfBox2d from SelectBasics ) is redefined;
diff --git a/src/MeshVS/MeshVS_ElementalColorPrsBuilder.cdl b/src/MeshVS/MeshVS_ElementalColorPrsBuilder.cdl
index 5e1720a1d5..afbd0a2796 100644
--- a/src/MeshVS/MeshVS_ElementalColorPrsBuilder.cdl
+++ b/src/MeshVS/MeshVS_ElementalColorPrsBuilder.cdl
@@ -43,7 +43,7 @@ is
             DS       : DataSource from MeshVS = 0;
             Id       : Integer = -1;
             Priority : BuilderPriority from MeshVS = MeshVS_BP_ElemColor )
-    returns mutable ElementalColorPrsBuilder from MeshVS;
+    returns ElementalColorPrsBuilder from MeshVS;
 	---Purpose: Constructor
 
   Build   ( me; Prs      : Presentation from Prs3d;
diff --git a/src/MeshVS/MeshVS_Mesh.cdl b/src/MeshVS/MeshVS_Mesh.cdl
index e50153493c..043d884656 100644
--- a/src/MeshVS/MeshVS_Mesh.cdl
+++ b/src/MeshVS/MeshVS_Mesh.cdl
@@ -45,7 +45,7 @@ uses
 
 is
 
-  Create ( theIsAllowOverlapped : Boolean = Standard_False ) returns mutable Mesh;
+  Create ( theIsAllowOverlapped : Boolean = Standard_False ) returns Mesh;
 	---Purpose: Constructor.
         -- theIsAllowOverlapped is Standard_True, if it is allowed to draw edges overlapped with beams
         --   Its value is stored in drawer
diff --git a/src/MeshVS/MeshVS_MeshEntityOwner.cdl b/src/MeshVS/MeshVS_MeshEntityOwner.cdl
index 44c99aba8e..6d8a511788 100644
--- a/src/MeshVS/MeshVS_MeshEntityOwner.cdl
+++ b/src/MeshVS/MeshVS_MeshEntityOwner.cdl
@@ -42,7 +42,7 @@ is
            MeshEntity  : Address;
            Type        : EntityType from MeshVS;
            Priority    : Integer = 0;
-           IsGroup     : Boolean = Standard_False ) returns mutable MeshEntityOwner from MeshVS;
+           IsGroup     : Boolean = Standard_False ) returns MeshEntityOwner from MeshVS;
 
   Owner            ( me ) returns Address;
 	---Purpose: Returns an address of element or node data structure
diff --git a/src/MeshVS/MeshVS_MeshOwner.cdl b/src/MeshVS/MeshVS_MeshOwner.cdl
index 1827c106ff..6743fd1a43 100644
--- a/src/MeshVS/MeshVS_MeshOwner.cdl
+++ b/src/MeshVS/MeshVS_MeshOwner.cdl
@@ -33,7 +33,7 @@ is
 
   Create ( theSelObj      : SOPtr from SelectMgr;  
     	   theDS          : DataSource from MeshVS; 
-           thePriority    : Integer = 0 ) returns mutable MeshOwner from MeshVS;  
+           thePriority    : Integer = 0 ) returns MeshOwner from MeshVS;  
  
   GetDataSource( me ) returns DataSource from MeshVS; 
     	---C++: return const & 
diff --git a/src/MeshVS/MeshVS_MeshPrsBuilder.cdl b/src/MeshVS/MeshVS_MeshPrsBuilder.cdl
index b057ec7f43..50c3ec2873 100644
--- a/src/MeshVS/MeshVS_MeshPrsBuilder.cdl
+++ b/src/MeshVS/MeshVS_MeshPrsBuilder.cdl
@@ -47,7 +47,7 @@ is
             Flags    : DisplayModeFlags from MeshVS = MeshVS_DMF_OCCMask;
             DS       : DataSource from MeshVS = 0;
             Id       : Integer = -1;
-            Priority : BuilderPriority from MeshVS = MeshVS_BP_Mesh ) returns mutable MeshPrsBuilder from MeshVS;
+            Priority : BuilderPriority from MeshVS = MeshVS_BP_Mesh ) returns MeshPrsBuilder from MeshVS;
 	---Purpose: Creates builder with certain display mode flags, data source, ID and priority
 
   Build   ( me; Prs     : Presentation from Prs3d;
diff --git a/src/MeshVS/MeshVS_NodalColorPrsBuilder.cdl b/src/MeshVS/MeshVS_NodalColorPrsBuilder.cdl
index 86b09590cf..00981f40e5 100644
--- a/src/MeshVS/MeshVS_NodalColorPrsBuilder.cdl
+++ b/src/MeshVS/MeshVS_NodalColorPrsBuilder.cdl
@@ -54,7 +54,7 @@ is
             DS       : DataSource from MeshVS = 0;
             Id       : Integer = -1;
             Priority : BuilderPriority from MeshVS = MeshVS_BP_NodalColor )
-     returns mutable NodalColorPrsBuilder from MeshVS;
+     returns NodalColorPrsBuilder from MeshVS;
 
   Build   ( me; Prs      : Presentation from Prs3d;
             IDs          : PackedMapOfInteger;
diff --git a/src/MeshVS/MeshVS_SensitiveFace.cdl b/src/MeshVS/MeshVS_SensitiveFace.cdl
index 0310b0e66e..554327f5d8 100644
--- a/src/MeshVS/MeshVS_SensitiveFace.cdl
+++ b/src/MeshVS/MeshVS_SensitiveFace.cdl
@@ -37,7 +37,7 @@ is
   Create ( theOwner    : EntityOwner from SelectBasics;
            thePoints   : Array1OfPnt from TColgp;
            theSensType : TypeOfSensitivity from Select3D = Select3D_TOS_INTERIOR )
-    returns mutable SensitiveFace from MeshVS;
+    returns SensitiveFace from MeshVS;
 
   Project( me: mutable; aProjector : Projector from Select3D ) is redefined;
 
diff --git a/src/MeshVS/MeshVS_SensitiveMesh.cdl b/src/MeshVS/MeshVS_SensitiveMesh.cdl
index a18703941b..f96826a860 100644
--- a/src/MeshVS/MeshVS_SensitiveMesh.cdl
+++ b/src/MeshVS/MeshVS_SensitiveMesh.cdl
@@ -32,7 +32,7 @@ is
 
   Create ( theOwner    : EntityOwner from SelectBasics; 
            theMode     : Integer = 0 )
-    returns mutable SensitiveMesh from MeshVS; 
+    returns SensitiveMesh from MeshVS; 
       
   GetMode( me ) returns Integer from Standard;     
      
diff --git a/src/MeshVS/MeshVS_SensitivePolyhedron.cdl b/src/MeshVS/MeshVS_SensitivePolyhedron.cdl
index fcfe8ee62b..20325d63b0 100644
--- a/src/MeshVS/MeshVS_SensitivePolyhedron.cdl
+++ b/src/MeshVS/MeshVS_SensitivePolyhedron.cdl
@@ -36,7 +36,7 @@ uses
 is
     Create( Owner : EntityOwner from SelectBasics;
             Nodes : Array1OfPnt from TColgp;
-            Topo  : HArray1OfSequenceOfInteger from MeshVS ) returns mutable SensitivePolyhedron from MeshVS;
+            Topo  : HArray1OfSequenceOfInteger from MeshVS ) returns SensitivePolyhedron from MeshVS;
 
     Project( me:mutable; aProjector: Projector from Select3D ) is redefined;
 
diff --git a/src/MeshVS/MeshVS_SensitiveSegment.cdl b/src/MeshVS/MeshVS_SensitiveSegment.cdl
index 0f897599a0..917cf03e9b 100644
--- a/src/MeshVS/MeshVS_SensitiveSegment.cdl
+++ b/src/MeshVS/MeshVS_SensitiveSegment.cdl
@@ -36,7 +36,7 @@ is
 
   Create ( theOwner              : EntityOwner from SelectBasics;
            theFirstP, theLastP   : Pnt from gp;
-           theMaxRect            : Integer = 1 ) returns mutable SensitiveSegment from MeshVS;
+           theMaxRect            : Integer = 1 ) returns SensitiveSegment from MeshVS;
 
   Project( me: mutable; aProjector : Projector from Select3D ) is redefined;
 
diff --git a/src/MeshVS/MeshVS_TextPrsBuilder.cdl b/src/MeshVS/MeshVS_TextPrsBuilder.cdl
index 453acfc42a..e2bc1750a1 100644
--- a/src/MeshVS/MeshVS_TextPrsBuilder.cdl
+++ b/src/MeshVS/MeshVS_TextPrsBuilder.cdl
@@ -44,7 +44,7 @@ is
             Flags    : DisplayModeFlags from MeshVS = MeshVS_DMF_TextDataPrs;
             DS       : DataSource from MeshVS = 0;
             Id       : Integer = -1;
-            Priority : BuilderPriority from MeshVS = MeshVS_BP_Text ) returns mutable TextPrsBuilder from MeshVS;
+            Priority : BuilderPriority from MeshVS = MeshVS_BP_Text ) returns TextPrsBuilder from MeshVS;
 
   Build   ( me; Prs        : Presentation from Prs3d;
             IDs            : PackedMapOfInteger;
diff --git a/src/MeshVS/MeshVS_VectorPrsBuilder.cdl b/src/MeshVS/MeshVS_VectorPrsBuilder.cdl
index cb0ecc3467..66b8b4c3e4 100644
--- a/src/MeshVS/MeshVS_VectorPrsBuilder.cdl
+++ b/src/MeshVS/MeshVS_VectorPrsBuilder.cdl
@@ -53,7 +53,7 @@ is
            DS           : DataSource from MeshVS = 0;
            Id           : Integer = -1;
            Priority     : BuilderPriority from MeshVS = MeshVS_BP_Vector;
-           IsSimplePrs  : Boolean = Standard_False ) returns mutable VectorPrsBuilder from MeshVS;
+           IsSimplePrs  : Boolean = Standard_False ) returns VectorPrsBuilder from MeshVS;
 
   Build   ( me; Prs        : Presentation from Prs3d;
             IDs            : PackedMapOfInteger;
diff --git a/src/Message/Message_ProgressIndicator.cdl b/src/Message/Message_ProgressIndicator.cdl
index eb0b79afae..4624dc5310 100644
--- a/src/Message/Message_ProgressIndicator.cdl
+++ b/src/Message/Message_ProgressIndicator.cdl
@@ -69,7 +69,7 @@ is
 
     ---Scope: Initialisations
     
-    Initialize returns mutable ProgressIndicator from Message;
+    Initialize returns ProgressIndicator from Message;
     	---Purpose: Constructor, just calls own Reset() (not yet redefined)
 
     Reset (me: mutable) is virtual;
diff --git a/src/MgtBRep/MgtBRep_TranslateTool.cdl b/src/MgtBRep/MgtBRep_TranslateTool.cdl
index b530c8275e..4ad50dd6fc 100644
--- a/src/MgtBRep/MgtBRep_TranslateTool.cdl
+++ b/src/MgtBRep/MgtBRep_TranslateTool.cdl
@@ -43,7 +43,7 @@ raises
 is
 
     Create(aTriMode : TriangleMode from MgtBRep)
-    returns mutable TranslateTool from MgtBRep;
+    returns TranslateTool from MgtBRep;
     	---Purpose: Creates a new TranslateTool
 
     --
@@ -120,7 +120,7 @@ is
     	TypeMismatch from Standard;
     
     MakeVertex(me; 
-    	       S  : mutable HShape from PTopoDS) 
+    	       S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard;
@@ -132,7 +132,7 @@ is
     	TypeMismatch from Standard;
     
     MakeEdge(me; 
-    	     S  : mutable HShape from PTopoDS) 
+    	     S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard;
@@ -144,7 +144,7 @@ is
     	TypeMismatch from Standard;
     
     MakeWire(me; 
-    	     S  : mutable HShape from PTopoDS) 
+    	     S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard;
@@ -156,7 +156,7 @@ is
     	TypeMismatch from Standard;
     
     MakeFace(me; 
-    	     S  : mutable HShape from PTopoDS) 
+    	     S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard;
@@ -168,7 +168,7 @@ is
     	TypeMismatch from Standard;
     
     MakeShell(me; 
-    	      S  : mutable HShape from PTopoDS) 
+    	      S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard;
@@ -180,7 +180,7 @@ is
     	TypeMismatch from Standard;
     
     MakeSolid(me; 
-    	      S  : mutable HShape from PTopoDS) 
+    	      S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard;
@@ -192,7 +192,7 @@ is
     	TypeMismatch from Standard;
     
     MakeCompSolid(me; 
-    	    	  S  : mutable HShape from PTopoDS) 
+    	    	  S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard;
@@ -204,7 +204,7 @@ is
     	TypeMismatch from Standard;
     
     MakeCompound(me; 
-    	    	 S  : mutable HShape from PTopoDS) 
+    	    	 S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard;
@@ -220,7 +220,7 @@ is
     
     UpdateVertex(me;
     	         S1 :         Shape                  from TopoDS;
-		 S2 : mutable HShape                 from PTopoDS;
+		 S2 : HShape                 from PTopoDS;
 		 M  : in out  TransientPersistentMap from PTColStd)
 	---Level: Internal 
     is redefined;
@@ -234,7 +234,7 @@ is
     
     UpdateEdge(me;
     	       S1 :         Shape                  from TopoDS;
-	       S2 : mutable HShape                 from PTopoDS;
+	       S2 : HShape                 from PTopoDS;
 	       M  : in out  TransientPersistentMap from PTColStd)
 	---Level: Internal 
     is redefined;
@@ -248,7 +248,7 @@ is
     
     UpdateFace(me;
     	       S1 :         Shape                  from TopoDS;
-	       S2 : mutable HShape                 from PTopoDS;
+	       S2 : HShape                 from PTopoDS;
 	       M  : in out  TransientPersistentMap from PTColStd)
 	---Level: Internal 
     is redefined;
diff --git a/src/MgtTopoDS/MgtTopoDS_TranslateTool.cdl b/src/MgtTopoDS/MgtTopoDS_TranslateTool.cdl
index 19e31a7bac..cd3e731f3a 100644
--- a/src/MgtTopoDS/MgtTopoDS_TranslateTool.cdl
+++ b/src/MgtTopoDS/MgtTopoDS_TranslateTool.cdl
@@ -64,7 +64,7 @@ is
     is deferred;
     
     MakeVertex(me; 
-    	       S  : mutable HShape from PTopoDS) 
+    	       S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard
@@ -78,7 +78,7 @@ is
     is deferred;
     
     MakeEdge(me; 
-    	     S  : mutable HShape from PTopoDS) 
+    	     S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard
@@ -92,7 +92,7 @@ is
     is deferred;
     
     MakeWire(me; 
-    	     S  : mutable HShape from PTopoDS) 
+    	     S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard
@@ -106,7 +106,7 @@ is
     is deferred;
     
     MakeFace(me; 
-    	     S  : mutable HShape from PTopoDS) 
+    	     S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard
@@ -120,7 +120,7 @@ is
     is deferred;
     
     MakeShell(me; 
-    	      S  : mutable HShape from PTopoDS) 
+    	      S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard
@@ -134,7 +134,7 @@ is
     is deferred;
     
     MakeSolid(me; 
-    	      S  : mutable HShape from PTopoDS) 
+    	      S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard
@@ -148,7 +148,7 @@ is
     is deferred;
     
     MakeCompSolid(me; 
-    	    	  S  : mutable HShape from PTopoDS) 
+    	    	  S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard
@@ -162,7 +162,7 @@ is
     is deferred;
     
     MakeCompound(me; 
-    	    	 S  : mutable HShape from PTopoDS) 
+    	    	 S  : HShape from PTopoDS) 
 	---Level: Internal 
     raises
     	TypeMismatch from Standard
@@ -179,7 +179,7 @@ is
     
     UpdateShape(me;
     	        S1 :         Shape  from TopoDS;
-		S2 : mutable HShape from PTopoDS)
+		S2 : HShape from PTopoDS)
 	---Purpose: Basic update method
 	---Level: Internal 
     is static;
@@ -193,7 +193,7 @@ is
     
     UpdateVertex(me;
     	         S1 :         Shape                  from TopoDS;
-		 S2 : mutable HShape                 from PTopoDS;
+		 S2 : HShape                 from PTopoDS;
     	    	 M  : in out  TransientPersistentMap from PTColStd)
 	---Level: Internal 
     is virtual;
@@ -207,7 +207,7 @@ is
     
     UpdateEdge(me;
     	       S1 :         Shape                  from TopoDS;
-	       S2 : mutable HShape                 from PTopoDS;
+	       S2 : HShape                 from PTopoDS;
     	       M  : in out  TransientPersistentMap from PTColStd)
 	---Level: Internal 
     is virtual;
@@ -221,7 +221,7 @@ is
     
     UpdateWire(me;
     	       S1 :         Shape  from TopoDS;
-	       S2 : mutable HShape from PTopoDS)
+	       S2 : HShape from PTopoDS)
 	---Level: Internal 
     is virtual;
     
@@ -233,7 +233,7 @@ is
     
     UpdateFace(me;
     	       S1 :         Shape                  from TopoDS;
-	       S2 : mutable HShape                 from PTopoDS;
+	       S2 : HShape                 from PTopoDS;
     	       M  : in out  TransientPersistentMap from PTColStd)
 	---Level: Internal 
     is virtual;
@@ -247,7 +247,7 @@ is
     
     UpdateShell(me;
     	        S1 :         Shape  from TopoDS;
-	        S2 : mutable HShape from PTopoDS)
+	        S2 : HShape from PTopoDS)
 	---Level: Internal 
     is virtual;
     
@@ -259,7 +259,7 @@ is
     
     UpdateSolid(me;
     	        S1 :         Shape  from TopoDS;
-	        S2 : mutable HShape from PTopoDS)
+	        S2 : HShape from PTopoDS)
 	---Level: Internal 
     is virtual;
     
@@ -271,7 +271,7 @@ is
     
     UpdateCompSolid(me;
     	            S1 :         Shape  from TopoDS;
-	            S2 : mutable HShape from PTopoDS)
+	            S2 : HShape from PTopoDS)
 	---Level: Internal 
     is virtual;
     
@@ -283,7 +283,7 @@ is
     
     UpdateCompound(me;
     	           S1 :         Shape  from TopoDS;
-	           S2 : mutable HShape from PTopoDS)
+	           S2 : HShape from PTopoDS)
 	---Level: Internal 
     is virtual;
     
diff --git a/src/MoniTool/MoniTool_AttrList.cdl b/src/MoniTool/MoniTool_AttrList.cdl
index ddcaa24060..944a8d1797 100644
--- a/src/MoniTool/MoniTool_AttrList.cdl
+++ b/src/MoniTool/MoniTool_AttrList.cdl
@@ -44,7 +44,7 @@ is
     --           Returns True when done, False if this attribute did not exist
 
     GetAttribute (me; name : CString; type : Type from Standard;
-    	    	  val : out mutable Transient)  returns Boolean;
+    	    	  val : out Transient)  returns Boolean;
     ---Purpose : Returns an attribute from its name, filtered by a type
     --           If no attribute has this name, or if it is not kind of this
     --           type, <val> is Null and returned value is False
diff --git a/src/MoniTool/MoniTool_IntVal.cdl b/src/MoniTool/MoniTool_IntVal.cdl
index 3b9908a1ee..9e5cca6296 100644
--- a/src/MoniTool/MoniTool_IntVal.cdl
+++ b/src/MoniTool/MoniTool_IntVal.cdl
@@ -22,7 +22,7 @@ uses Integer
 
 is
 
-    Create (val : Integer = 0) returns mutable IntVal;
+    Create (val : Integer = 0) returns IntVal;
 
     Value (me) returns Integer;
 
diff --git a/src/MoniTool/MoniTool_Option.cdl b/src/MoniTool/MoniTool_Option.cdl
index 3668f40075..63aafe6cfd 100644
--- a/src/MoniTool/MoniTool_Option.cdl
+++ b/src/MoniTool/MoniTool_Option.cdl
@@ -42,16 +42,16 @@ uses CString, Transient, Type from Standard,
 
 is
 
-    Create (atype : Type; aname : CString) returns mutable Option;
+    Create (atype : Type; aname : CString) returns Option;
     ---Purpose : Creates an Option from scratch, with a Type and a Name
 
-    Create (aval : TypedValue; aname : CString = "") returns mutable Option;
+    Create (aval : TypedValue; aname : CString = "") returns Option;
     ---Purpose : Creates an Option for a TypedValue (for basic, non-cdl-typed,
     --           value : integer, real, string ...)
     --           If <name> is not given, the name of the TypedValue is taken
     --           Remark that Type is then enforced to TCollection_HAsciiString
 
-    Create (other : Option; aname : CString = "") returns mutable Option;
+    Create (other : Option; aname : CString = "") returns Option;
     ---Purpose : Creates an Option from another one, the name can be redefined
     --           The Type remains the same. The list of Items, too, it can also
     --           be later duplicated by call to Duplicate
diff --git a/src/MoniTool/MoniTool_RealVal.cdl b/src/MoniTool/MoniTool_RealVal.cdl
index 0c7bd1854d..ea3e48ef5a 100644
--- a/src/MoniTool/MoniTool_RealVal.cdl
+++ b/src/MoniTool/MoniTool_RealVal.cdl
@@ -22,7 +22,7 @@ uses Real
 
 is
 
-    Create (val : Real = 0.0) returns mutable RealVal;
+    Create (val : Real = 0.0) returns RealVal;
 
     Value (me) returns Real;
 
diff --git a/src/MoniTool/MoniTool_SignShape.cdl b/src/MoniTool/MoniTool_SignShape.cdl
index bc8eae4377..cba889b34a 100644
--- a/src/MoniTool/MoniTool_SignShape.cdl
+++ b/src/MoniTool/MoniTool_SignShape.cdl
@@ -23,7 +23,7 @@ uses CString, Transient, AsciiString
 
 is
 
-    Create returns mutable SignShape;
+    Create returns SignShape;
 
     Name (me) returns CString;
     ---Purpose : Returns "SHAPE"
diff --git a/src/MoniTool/MoniTool_TransientElem.cdl b/src/MoniTool/MoniTool_TransientElem.cdl
index c520d20d7c..d03f91979a 100644
--- a/src/MoniTool/MoniTool_TransientElem.cdl
+++ b/src/MoniTool/MoniTool_TransientElem.cdl
@@ -32,7 +32,7 @@ uses CString,
 
 is
 
-    Create (akey : any Transient from Standard) returns mutable TransientElem;
+    Create (akey : any Transient from Standard) returns TransientElem;
     ---Purpose : Creates a TransientElem with a Value. This Value can then not be
     --           changed. It is used by the Hasher to compute the HashCode,
     --           which will then be stored for an immediate reading.
diff --git a/src/MoniTool/MoniTool_TypedValue.cdl b/src/MoniTool/MoniTool_TypedValue.cdl
index 91beec9f86..d1072433bf 100644
--- a/src/MoniTool/MoniTool_TypedValue.cdl
+++ b/src/MoniTool/MoniTool_TypedValue.cdl
@@ -43,7 +43,7 @@ is
 
     Create (name : CString;
     	    type : ValueType from MoniTool = MoniTool_ValueText;
-	    init : CString = "")  returns mutable TypedValue;
+	    init : CString = "")  returns TypedValue;
     ---Purpose : Creates a TypedValue, with a name
     --           
     --           type gives the type of the parameter, default is free text
@@ -54,7 +54,7 @@ is
     --           init gives an initial value. If it is not given, the
     --           TypedValue begins as "not set", its value is empty
 
-    Create (other : TypedValue) returns mutable TypedValue;
+    Create (other : TypedValue) returns TypedValue;
     ---Purpose : Creates a TypedValue from another one, by duplication
 
     Internals (me; interp :  out ValueInterpret; satisf : out ValueSatisfies;
@@ -215,7 +215,7 @@ is
     CStringValue (me) returns CString;
     ---Purpose : Returns the value, as a cstring. Empty if not set.
 
-    HStringValue (me) returns mutable HAsciiString;
+    HStringValue (me) returns HAsciiString;
     ---Purpose : Returns the value, as a Handle (can then be shared)
     --           Null if not defined
 
@@ -246,7 +246,7 @@ is
     --             does not satisfy the specification
     --           Can be redefined to be managed (in a subclass)
 
-    SetHStringValue (me : mutable; hval : mutable HAsciiString)
+    SetHStringValue (me : mutable; hval : HAsciiString)
     ---Purpose : Forces a new Handle for the Value
     --           It can be empty, else (if Type is not free Text), it must
     --           satisfy the specification.
diff --git a/src/NLPlate/NLPlate_HPG0Constraint.cdl b/src/NLPlate/NLPlate_HPG0Constraint.cdl
index 13042ed6d9..2a74edb6f2 100644
--- a/src/NLPlate/NLPlate_HPG0Constraint.cdl
+++ b/src/NLPlate/NLPlate_HPG0Constraint.cdl
@@ -22,7 +22,7 @@ uses
      XYZ from gp
      
 is
-    Create(UV : XY; Value : XYZ) returns mutable HPG0Constraint;
+    Create(UV : XY; Value : XYZ) returns HPG0Constraint;
     -- create a G0 Constraint
     -- 
 
diff --git a/src/NLPlate/NLPlate_HPG0G1Constraint.cdl b/src/NLPlate/NLPlate_HPG0G1Constraint.cdl
index ab16b5c311..4b13725640 100644
--- a/src/NLPlate/NLPlate_HPG0G1Constraint.cdl
+++ b/src/NLPlate/NLPlate_HPG0G1Constraint.cdl
@@ -23,7 +23,7 @@ uses
      D1  from  Plate
      
 is
-    Create(UV : XY; Value : XYZ; D1T : D1 from Plate) returns mutable HPG0G1Constraint;
+    Create(UV : XY; Value : XYZ; D1T : D1 from Plate) returns HPG0G1Constraint;
     -- create a G0+G1 Constraint
     -- 
 
diff --git a/src/NLPlate/NLPlate_HPG0G2Constraint.cdl b/src/NLPlate/NLPlate_HPG0G2Constraint.cdl
index a433560703..6307cf51d0 100644
--- a/src/NLPlate/NLPlate_HPG0G2Constraint.cdl
+++ b/src/NLPlate/NLPlate_HPG0G2Constraint.cdl
@@ -24,7 +24,7 @@ uses
      D2  from  Plate
      
 is
-    Create(UV : XY; Value : XYZ; D1T : D1 from Plate; D2T : D2 from Plate) returns mutable HPG0G2Constraint;
+    Create(UV : XY; Value : XYZ; D1T : D1 from Plate; D2T : D2 from Plate) returns HPG0G2Constraint;
     -- create a G0+G2 Constraint
     -- 
 
diff --git a/src/NLPlate/NLPlate_HPG0G3Constraint.cdl b/src/NLPlate/NLPlate_HPG0G3Constraint.cdl
index 7d5652960d..4c3605b7e9 100644
--- a/src/NLPlate/NLPlate_HPG0G3Constraint.cdl
+++ b/src/NLPlate/NLPlate_HPG0G3Constraint.cdl
@@ -26,7 +26,7 @@ uses
      
 is
     Create(UV : XY; Value : XYZ; D1T : D1 from Plate; 
-     D2T : D2 from Plate;  D3T : D3 from Plate) returns mutable HPG0G3Constraint;
+     D2T : D2 from Plate;  D3T : D3 from Plate) returns HPG0G3Constraint;
     -- create a G0+G3 Constraint
     -- 
 
diff --git a/src/NLPlate/NLPlate_HPG1Constraint.cdl b/src/NLPlate/NLPlate_HPG1Constraint.cdl
index 5765c76f0a..2c358c251a 100644
--- a/src/NLPlate/NLPlate_HPG1Constraint.cdl
+++ b/src/NLPlate/NLPlate_HPG1Constraint.cdl
@@ -22,7 +22,7 @@ uses
      D1  from  Plate
      
 is
-    Create(UV : XY; D1T : D1 from Plate) returns mutable HPG1Constraint;
+    Create(UV : XY; D1T : D1 from Plate) returns HPG1Constraint;
     -- create a G1 Constraint
     -- 
 
diff --git a/src/NLPlate/NLPlate_HPG2Constraint.cdl b/src/NLPlate/NLPlate_HPG2Constraint.cdl
index 3abeb86dbb..55295e5889 100644
--- a/src/NLPlate/NLPlate_HPG2Constraint.cdl
+++ b/src/NLPlate/NLPlate_HPG2Constraint.cdl
@@ -23,7 +23,7 @@ uses
      D2  from  Plate
      
 is
-    Create(UV : XY; D1T : D1 from Plate; D2T : D2 from Plate) returns mutable HPG2Constraint;
+    Create(UV : XY; D1T : D1 from Plate; D2T : D2 from Plate) returns HPG2Constraint;
     -- create a G2 Constraint
     -- 
 
diff --git a/src/NLPlate/NLPlate_HPG3Constraint.cdl b/src/NLPlate/NLPlate_HPG3Constraint.cdl
index f9e1ab5668..30e60173c4 100644
--- a/src/NLPlate/NLPlate_HPG3Constraint.cdl
+++ b/src/NLPlate/NLPlate_HPG3Constraint.cdl
@@ -25,7 +25,7 @@ uses
      
 is
     Create(UV : XY; D1T : D1 from Plate; 
-     D2T : D2 from Plate; D3T : D3 from Plate) returns mutable HPG3Constraint;
+     D2T : D2 from Plate; D3T : D3 from Plate) returns HPG3Constraint;
     -- create a G3 Constraint
     -- 
 
diff --git a/src/PBRep/PBRep_Curve3D.cdl b/src/PBRep/PBRep_Curve3D.cdl
index 3b1b8d3bb7..ca0df2f134 100644
--- a/src/PBRep/PBRep_Curve3D.cdl
+++ b/src/PBRep/PBRep_Curve3D.cdl
@@ -29,7 +29,7 @@ is
     	   CF : Real     from Standard;
 	   CL : Real     from Standard;
     	   L  : Location from PTopLoc) 
-    returns mutable Curve3D from PBRep;
+    returns Curve3D from PBRep;
     	---Purpose : CF is curve first param
     	--           CL is curve last param
     	--           As far as they can't be computed from a Persistent Curve
diff --git a/src/PBRep/PBRep_CurveOn2Surfaces.cdl b/src/PBRep/PBRep_CurveOn2Surfaces.cdl
index b3996022cf..f049a641ce 100644
--- a/src/PBRep/PBRep_CurveOn2Surfaces.cdl
+++ b/src/PBRep/PBRep_CurveOn2Surfaces.cdl
@@ -31,7 +31,7 @@ is
     Create(S1 , S2  : Surface  from PGeom;
 	   L1 , L2  : Location from PTopLoc;
 	   C        : Shape    from GeomAbs)
-    returns mutable CurveOn2Surfaces from PBRep;
+    returns CurveOn2Surfaces from PBRep;
 
     Surface(me) returns any Surface from PGeom
     is static;
diff --git a/src/PBRep/PBRep_CurveOnClosedSurface.cdl b/src/PBRep/PBRep_CurveOnClosedSurface.cdl
index e8255a410f..5979700e4a 100644
--- a/src/PBRep/PBRep_CurveOnClosedSurface.cdl
+++ b/src/PBRep/PBRep_CurveOnClosedSurface.cdl
@@ -37,7 +37,7 @@ is
     	   S        : Surface  from PGeom;
 	   L        : Location from PTopLoc;
 	   C        : Shape    from GeomAbs)
-    returns mutable CurveOnClosedSurface from PBRep;
+    returns CurveOnClosedSurface from PBRep;
     	---Purpose: CF is curve first parameter
     	--          CL is curve last parameter
     	--          The two curves are SameParameter.
diff --git a/src/PBRep/PBRep_CurveOnSurface.cdl b/src/PBRep/PBRep_CurveOnSurface.cdl
index 738b9dff3f..9a80553d71 100644
--- a/src/PBRep/PBRep_CurveOnSurface.cdl
+++ b/src/PBRep/PBRep_CurveOnSurface.cdl
@@ -32,7 +32,7 @@ is
 	   CL : Real     from Standard;
     	   S  : Surface  from PGeom; 
     	   L  : Location from PTopLoc)
-    returns mutable CurveOnSurface from PBRep;
+    returns CurveOnSurface from PBRep;
     	---Purpose: CF is curve first parameter
     	--          CL is curve last parameter
     	--          As far as they can't be computed from a Persistent Curve
diff --git a/src/PBRep/PBRep_PointOnCurve.cdl b/src/PBRep/PBRep_PointOnCurve.cdl
index ac35b962d3..23b171e0f6 100644
--- a/src/PBRep/PBRep_PointOnCurve.cdl
+++ b/src/PBRep/PBRep_PointOnCurve.cdl
@@ -24,7 +24,7 @@ is
     Create(P : Real;
     	   C : Curve    from PGeom;
 	   L : Location from PTopLoc)
-    returns mutable PointOnCurve from PBRep;
+    returns PointOnCurve from PBRep;
     	---Level: Internal 
     
 
diff --git a/src/PBRep/PBRep_PointOnCurveOnSurface.cdl b/src/PBRep/PBRep_PointOnCurveOnSurface.cdl
index b56baf5b58..88b554dc61 100644
--- a/src/PBRep/PBRep_PointOnCurveOnSurface.cdl
+++ b/src/PBRep/PBRep_PointOnCurveOnSurface.cdl
@@ -28,7 +28,7 @@ is
     	   C : Curve from PGeom2d;
 	   S : Surface from PGeom;
 	   L : Location from PTopLoc)
-    returns mutable PointOnCurveOnSurface from PBRep;
+    returns PointOnCurveOnSurface from PBRep;
     	---Level: Internal 
     
     PCurve(me) returns Curve from PGeom2d
diff --git a/src/PBRep/PBRep_PointOnSurface.cdl b/src/PBRep/PBRep_PointOnSurface.cdl
index 080cff0a27..faa699c71d 100644
--- a/src/PBRep/PBRep_PointOnSurface.cdl
+++ b/src/PBRep/PBRep_PointOnSurface.cdl
@@ -25,7 +25,7 @@ is
     Create(P1,P2 : Real;
     	   S : Surface from PGeom;
 	   L : Location from PTopLoc)
-    returns mutable PointOnSurface from PBRep;
+    returns PointOnSurface from PBRep;
     	---Level: Internal 
     
     Parameter2(me) returns Real
diff --git a/src/PBRep/PBRep_Polygon3D.cdl b/src/PBRep/PBRep_Polygon3D.cdl
index e29b8638ca..7583e3e813 100644
--- a/src/PBRep/PBRep_Polygon3D.cdl
+++ b/src/PBRep/PBRep_Polygon3D.cdl
@@ -28,7 +28,7 @@ is
     Create(P: Polygon3D from PPoly;
     	   L: Location  from PTopLoc) 
     	---Purpose:
-    returns mutable Polygon3D from PBRep;
+    returns Polygon3D from PBRep;
         
     IsPolygon3D(me) returns Boolean
     	---Purpose: Returns True.
diff --git a/src/PBRep/PBRep_PolygonOnClosedSurface.cdl b/src/PBRep/PBRep_PolygonOnClosedSurface.cdl
index 5cd365c492..3325697c88 100644
--- a/src/PBRep/PBRep_PolygonOnClosedSurface.cdl
+++ b/src/PBRep/PBRep_PolygonOnClosedSurface.cdl
@@ -32,7 +32,7 @@ is
     	   P2: Polygon2D from PPoly;
     	   S:  Surface   from PGeom;
 	   L:  Location  from PTopLoc)
-    returns mutable PolygonOnClosedSurface from PBRep;
+    returns PolygonOnClosedSurface from PBRep;
     
     IsPolygonOnClosedSurface(me) returns Boolean
     	---Purpose: returns True.
diff --git a/src/PBRep/PBRep_PolygonOnClosedTriangulation.cdl b/src/PBRep/PBRep_PolygonOnClosedTriangulation.cdl
index 2ca8580e5f..a0e384ff2d 100644
--- a/src/PBRep/PBRep_PolygonOnClosedTriangulation.cdl
+++ b/src/PBRep/PBRep_PolygonOnClosedTriangulation.cdl
@@ -33,7 +33,7 @@ is
     Create(P1, P2   : PolygonOnTriangulation from PPoly;
     	   S        : Triangulation    from PPoly;
 	   L        : Location         from PTopLoc)
-    returns mutable PolygonOnClosedTriangulation from PBRep;
+    returns PolygonOnClosedTriangulation from PBRep;
 
 
     IsPolygonOnClosedTriangulation(me)    returns Boolean
diff --git a/src/PBRep/PBRep_PolygonOnSurface.cdl b/src/PBRep/PBRep_PolygonOnSurface.cdl
index dc822b8ea1..95a7e8a898 100644
--- a/src/PBRep/PBRep_PolygonOnSurface.cdl
+++ b/src/PBRep/PBRep_PolygonOnSurface.cdl
@@ -30,7 +30,7 @@ is
     Create(P: Polygon2D from PPoly;
     	   S: Surface   from PGeom;
 	   L: Location  from PTopLoc)
-    returns mutable PolygonOnSurface from PBRep;
+    returns PolygonOnSurface from PBRep;
 
 
     IsPolygonOnSurface(me)  returns Boolean
diff --git a/src/PBRep/PBRep_PolygonOnTriangulation.cdl b/src/PBRep/PBRep_PolygonOnTriangulation.cdl
index 8a6e44fc45..7a4ee02108 100644
--- a/src/PBRep/PBRep_PolygonOnTriangulation.cdl
+++ b/src/PBRep/PBRep_PolygonOnTriangulation.cdl
@@ -30,7 +30,7 @@ is
     Create(P: PolygonOnTriangulation from PPoly;
     	   T: Triangulation          from PPoly;
 	   L: Location               from PTopLoc)
-    returns mutable PolygonOnTriangulation from PBRep;
+    returns PolygonOnTriangulation from PBRep;
     
     
     IsPolygonOnTriangulation(me) returns Boolean
diff --git a/src/PBRep/PBRep_TEdge.cdl b/src/PBRep/PBRep_TEdge.cdl
index 0df36bba0f..e1b29a4805 100644
--- a/src/PBRep/PBRep_TEdge.cdl
+++ b/src/PBRep/PBRep_TEdge.cdl
@@ -32,7 +32,7 @@ uses
     CurveRepresentation       from PBRep
 
 is
-    Create returns mutable TEdge from PBRep;
+    Create returns TEdge from PBRep;
 	---Purpose: Creates an empty TEdge.
     	---Level: Internal 
 
diff --git a/src/PBRep/PBRep_TEdge1.cdl b/src/PBRep/PBRep_TEdge1.cdl
index 4766f07695..3f2f4e9bb3 100644
--- a/src/PBRep/PBRep_TEdge1.cdl
+++ b/src/PBRep/PBRep_TEdge1.cdl
@@ -32,7 +32,7 @@ uses
     CurveRepresentation       from PBRep
 
 is
-    Create returns mutable TEdge1 from PBRep;
+    Create returns TEdge1 from PBRep;
 	---Purpose: Creates an empty TEdge1.
     	---Level: Internal 
 
diff --git a/src/PBRep/PBRep_TFace.cdl b/src/PBRep/PBRep_TFace.cdl
index 2779407ebb..cbf7566839 100644
--- a/src/PBRep/PBRep_TFace.cdl
+++ b/src/PBRep/PBRep_TFace.cdl
@@ -32,7 +32,7 @@ uses
     
 is
 
-    Create returns mutable TFace from PBRep;
+    Create returns TFace from PBRep;
 	---Purpose: Creates an empty TFace.
     	---Level: Internal 
 	
diff --git a/src/PBRep/PBRep_TFace1.cdl b/src/PBRep/PBRep_TFace1.cdl
index 6bb722fff3..53772b0c26 100644
--- a/src/PBRep/PBRep_TFace1.cdl
+++ b/src/PBRep/PBRep_TFace1.cdl
@@ -32,7 +32,7 @@ uses
     
 is
 
-    Create returns mutable TFace1 from PBRep;
+    Create returns TFace1 from PBRep;
 	---Purpose: Creates an empty TFace1.
     	---Level: Internal 
 	
diff --git a/src/PBRep/PBRep_TVertex.cdl b/src/PBRep/PBRep_TVertex.cdl
index c16dcfa0f1..d6e09320b2 100644
--- a/src/PBRep/PBRep_TVertex.cdl
+++ b/src/PBRep/PBRep_TVertex.cdl
@@ -26,7 +26,7 @@ uses
     PointRepresentation from PBRep
 
 is
-    Create returns mutable TVertex from PBRep;
+    Create returns TVertex from PBRep;
     	---Level: Internal 
 
     
diff --git a/src/PBRep/PBRep_TVertex1.cdl b/src/PBRep/PBRep_TVertex1.cdl
index 4fbd069dfa..76a103e9a7 100644
--- a/src/PBRep/PBRep_TVertex1.cdl
+++ b/src/PBRep/PBRep_TVertex1.cdl
@@ -26,7 +26,7 @@ uses
     PointRepresentation from PBRep
 
 is
-    Create returns mutable TVertex1 from PBRep;
+    Create returns TVertex1 from PBRep;
     	---Level: Internal 
 
     
diff --git a/src/PCDM/PCDM_ReadWriter.cdl b/src/PCDM/PCDM_ReadWriter.cdl
index c3d2e3671f..70eb68bbde 100644
--- a/src/PCDM/PCDM_ReadWriter.cdl
+++ b/src/PCDM/PCDM_ReadWriter.cdl
@@ -34,18 +34,18 @@ is
     is deferred;
     ---Purpose: returns PCDM_ReadWriter_1.
     
-    WriteReferenceCounter(me; aData: mutable Data from Storage; aDocument: Document from CDM)
+    WriteReferenceCounter(me; aData: Data from Storage; aDocument: Document from CDM)
     is deferred;
     
-    WriteReferences(me; aData: mutable Data from Storage; aDocument: Document from CDM; theReferencerFileName: ExtendedString from TCollection)
+    WriteReferences(me; aData: Data from Storage; aDocument: Document from CDM; theReferencerFileName: ExtendedString from TCollection)
     is deferred;
 
     
-    WriteExtensions(me; aData: mutable Data from Storage; aDocument: Document from CDM)
+    WriteExtensions(me; aData: Data from Storage; aDocument: Document from CDM)
     is deferred;
 
     
-    WriteVersion(me; aData: mutable Data from Storage; aDocument: Document from CDM)
+    WriteVersion(me; aData: Data from Storage; aDocument: Document from CDM)
     is deferred;
 
     
@@ -78,7 +78,7 @@ is
     returns ReadWriter from PCDM;
     
 
-    WriteFileFormat(myclass; aData: mutable Data from Storage; aDocument: Document from CDM);
+    WriteFileFormat(myclass; aData: Data from Storage; aDocument: Document from CDM);
     
     FileFormat(myclass; aFileName: ExtendedString from TCollection)
     returns ExtendedString from TCollection;
diff --git a/src/PCDM/PCDM_ReadWriter_1.cdl b/src/PCDM/PCDM_ReadWriter_1.cdl
index 4a11f55099..7e2a766f14 100644
--- a/src/PCDM/PCDM_ReadWriter_1.cdl
+++ b/src/PCDM/PCDM_ReadWriter_1.cdl
@@ -27,20 +27,20 @@ uses
 
 is
 
-    Create returns mutable ReadWriter_1 from PCDM;
+    Create returns ReadWriter_1 from PCDM;
    
     Version(me) returns AsciiString from TCollection;
     ---Purpose: returns PCDM_ReadWriter_1.
    
-    WriteReferenceCounter(me; aData: mutable Data from Storage; aDocument: Document from CDM);
+    WriteReferenceCounter(me; aData: Data from Storage; aDocument: Document from CDM);
 
-    WriteReferences(me; aData: mutable Data from Storage; aDocument: Document from CDM; theReferencerFileName: ExtendedString from TCollection);
+    WriteReferences(me; aData: Data from Storage; aDocument: Document from CDM; theReferencerFileName: ExtendedString from TCollection);
 
     
-    WriteExtensions(me; aData: mutable Data from Storage; aDocument: Document from CDM);
+    WriteExtensions(me; aData: Data from Storage; aDocument: Document from CDM);
 
     
-    WriteVersion(me; aData: mutable Data from Storage; aDocument: Document from CDM);
+    WriteVersion(me; aData: Data from Storage; aDocument: Document from CDM);
 
     
     ReadReferenceCounter(me; aFileName: ExtendedString from TCollection; theMsgDriver: MessageDriver from CDM)
diff --git a/src/PCDM/PCDM_Reader.cdl b/src/PCDM/PCDM_Reader.cdl
index 2de82313ae..9bab9f37cf 100644
--- a/src/PCDM/PCDM_Reader.cdl
+++ b/src/PCDM/PCDM_Reader.cdl
@@ -33,7 +33,7 @@ is
     ---Purpose: this method is called by the framework before the read method.
     
     Read(me: mutable; aFileName: ExtendedString from TCollection; 
-                      aNewDocument: mutable Document from CDM;
+                      aNewDocument: Document from CDM;
 		      anApplication: Application from CDM)
     raises DriverError from PCDM
     is deferred;
diff --git a/src/PCDM/PCDM_ReferenceIterator.cdl b/src/PCDM/PCDM_ReferenceIterator.cdl
index ae30473e17..2a0a6bb213 100644
--- a/src/PCDM/PCDM_ReferenceIterator.cdl
+++ b/src/PCDM/PCDM_ReferenceIterator.cdl
@@ -22,7 +22,7 @@ uses MetaData from CDM,
     MessageDriver from  CDM
 is
     Create (theMessageDriver : MessageDriver from  CDM)
-    returns mutable ReferenceIterator from PCDM;
+    returns ReferenceIterator from PCDM;
     ---Purpose:  Warning! The constructor does not initialization.
 
 
diff --git a/src/PCDM/PCDM_RetrievalDriver.cdl b/src/PCDM/PCDM_RetrievalDriver.cdl
index c788b56b6a..70dd291421 100644
--- a/src/PCDM/PCDM_RetrievalDriver.cdl
+++ b/src/PCDM/PCDM_RetrievalDriver.cdl
@@ -35,7 +35,7 @@ raises NoSuchObject from Standard,  DriverError from PCDM
 is
 
     Read(me: mutable; aFileName: ExtendedString from TCollection; 
-                      aNewDocument: mutable Document from CDM;
+                      aNewDocument: Document from CDM;
 		      anApplication: Application from CDM)
     raises DriverError from PCDM
     ---Purpose:  Warning -  raises DriverError if an error occurs during inside the
@@ -48,7 +48,7 @@ is
     --          transient document.
     --          
 
-    Make(me : mutable; aPCDM: Document from PCDM; aNewDocument: mutable Document from CDM)
+    Make(me : mutable; aPCDM: Document from PCDM; aNewDocument: Document from CDM)
     raises DriverError from PCDM
     is deferred;
 
diff --git a/src/PCDMShape/PCDMShape_Document.cdl b/src/PCDMShape/PCDMShape_Document.cdl
index 73922058f7..a2b2c49c33 100644
--- a/src/PCDMShape/PCDMShape_Document.cdl
+++ b/src/PCDMShape/PCDMShape_Document.cdl
@@ -26,10 +26,10 @@ uses
     Location      from PTopLoc
     
 is
-    Create returns mutable Document from PCDMShape;
+    Create returns Document from PCDMShape;
     ---Level: Internal 
 
-    Create(T : Shape1 from PTopoDS) returns mutable Document from PCDMShape;
+    Create(T : Shape1 from PTopoDS) returns Document from PCDMShape;
     ---Level: Internal 
 
     Shape(me) returns Shape1 from PTopoDS
diff --git a/src/PCollection/PCollection_HArray1.cdl b/src/PCollection/PCollection_HArray1.cdl
index 511b1437cb..5758287370 100644
--- a/src/PCollection/PCollection_HArray1.cdl
+++ b/src/PCollection/PCollection_HArray1.cdl
@@ -37,14 +37,14 @@ raises
 is
 
 
-	Create (Low, Up: Integer from Standard) returns mutable HArray1
+	Create (Low, Up: Integer from Standard) returns HArray1
 		raises RangeError from Standard;
 		---Purpose: Creates an array of lower bound <Low> and 
                 -- upper bound <Up>. Range error is raised 
                 -- when <Up> is less than <Low>.
 
 	Create (Low, Up: Integer from Standard ; V : Item) 
-                returns mutable HArray1
+                returns HArray1
 		raises RangeError from Standard;
 		---Purpose: Creates an array of lower bound <Low> and 
                 -- upper bound <Up>. Range error is raised 
diff --git a/src/PCollection/PCollection_HArray2.cdl b/src/PCollection/PCollection_HArray2.cdl
index c33a4bfbcc..6708e98301 100644
--- a/src/PCollection/PCollection_HArray2.cdl
+++ b/src/PCollection/PCollection_HArray2.cdl
@@ -34,14 +34,14 @@ raises
 is
 
 	Create (R1, R2, C1, C2: Integer from Standard) 
-               returns mutable HArray2 from PCollection
+               returns HArray2 from PCollection
 		raises RangeError from Standard;
 		---Purpose: Creates an array of lower bound <R1><C1> and 
                 -- upper bound <R2><C2>. Range Error is raised 
                 -- when <R2> is less than <R1> or <C2> is less than <C1>.
 
 	Create (R1, R2, C1, C2: Integer from Standard ; V : Item) 
-                returns mutable HArray2 from PCollection
+                returns HArray2 from PCollection
 		  raises RangeError from Standard;
 		---Purpose: Creates an array of lower bound <R1><C1> and 
                 -- upper bound <R2><C2>. RangeError is raised 
diff --git a/src/PCollection/PCollection_HAsciiString.cdl b/src/PCollection/PCollection_HAsciiString.cdl
index c34c2b89b9..cb1476b159 100644
--- a/src/PCollection/PCollection_HAsciiString.cdl
+++ b/src/PCollection/PCollection_HAsciiString.cdl
@@ -31,20 +31,20 @@ is
 
 
 	Create(S : CString) 
-            returns mutable HAsciiString from PCollection;
+            returns HAsciiString from PCollection;
 	---Purpose: Creation and initialization with the string S.
 
 	Create(S : AsciiString from TCollection) 
-            returns mutable HAsciiString from PCollection;
+            returns HAsciiString from PCollection;
 	---Purpose: Creation and initialization with the string S from TCollection.
 
 	Create(C : Character from Standard)
-            returns mutable HAsciiString from PCollection;
+            returns HAsciiString from PCollection;
 	---Purpose: Creation and initialization with the character C.
 
 	Create(S : HAsciiString from PCollection;
     	       FromIndex, ToIndex : Integer from Standard) 
-	    returns mutable HAsciiString from PCollection
+	    returns HAsciiString from PCollection
 	    raises NegativeValue from Standard;
         ---Purpose: Creation of a sub-string of the string S.
         -- The sub-string starts at the index FromIndex and ends
@@ -58,19 +58,19 @@ is
         -- "cdef"
 
         Create(S : HExtendedString from PCollection)
-            returns mutable HAsciiString from PCollection
+            returns HAsciiString from PCollection
 	    raises OutOfRange from Standard;
 	---Purpose: Creation by converting an extended string to a normal
 	-- string. Raises OutOfRange if the String is not in the "Ascii range".
 	  
 	Create(R : Real from Standard ; F : CString = "%f") 
-            returns mutable HAsciiString from PCollection;
+            returns HAsciiString from PCollection;
 	---Purpose: Creation and initialization by converting the real 
 	-- value into a string. 
 	-- F describes a format using "C" conventions.
 
 	Create(I : Integer from Standard ; F : CString = "%d")
-            returns mutable HAsciiString from PCollection;
+            returns HAsciiString from PCollection;
 	---Purpose: Creation and initialization by converting the Integer
 	-- value into a string.
 	-- F describes a format using "C" conventions.
@@ -394,7 +394,7 @@ is
 	Split(me : mutable; Index  : Integer) 
         ---Level: Public
         ---Purpose: Splits a string of characters into two sub-strings.
-	returns mutable HAsciiString from PCollection
+	returns HAsciiString from PCollection
 	raises OutOfRange from Standard;
 
 	SubString(me; FromIndex, ToIndex : Integer) 
@@ -409,11 +409,11 @@ is
         --   me = "abcdefg"
         -- returns
         --   "cdef"
-	returns mutable HAsciiString from PCollection
+	returns HAsciiString from PCollection
 	raises OutOfRange from Standard;
 
         Token (me ; separators : CString=" \t" ; whichone : Integer=1) 
-                 returns mutable HAsciiString from PCollection;
+                 returns HAsciiString from PCollection;
         ---Level: Public
         ---Purpose: Extracts <aString> token from <me>.
         -- The token extracted is the indice number <num>.
diff --git a/src/PCollection/PCollection_HExtendedString.cdl b/src/PCollection/PCollection_HExtendedString.cdl
index 6e42e65415..e6403dedb8 100644
--- a/src/PCollection/PCollection_HExtendedString.cdl
+++ b/src/PCollection/PCollection_HExtendedString.cdl
@@ -33,17 +33,17 @@ is
 		
 
 	Create(S : ExtendedString from TCollection) 
-            returns mutable HExtendedString from PCollection;
+            returns HExtendedString from PCollection;
 		---Purpose: Creation and initialization with the string S from
 		-- TCollection.
 
 	Create(C : ExtCharacter from Standard)
-            returns mutable HExtendedString from PCollection;
+            returns HExtendedString from PCollection;
 		---Purpose: Creation and initialisation with the character C
 
 	Create(S : HExtendedString from PCollection;
     	       FromIndex, ToIndex : Integer from Standard) 
-	    returns mutable HExtendedString from PCollection
+	    returns HExtendedString from PCollection
 	    raises NegativeValue from Standard;
                 ---Purpose: Creation of a sub-string of the string S
                 -- the sub-string starts at the index Fromindex and ends
@@ -51,11 +51,11 @@ is
                 -- Raises an exception if ToIndex is less than FromIndex 
 
         Create( astring : CString)
-            returns mutable HExtendedString from PCollection;
+            returns HExtendedString from PCollection;
         ---Purpose: Creation by converting a CString to an extended string. 
 	
         Create(S : HAsciiString from PCollection)
-            returns mutable HExtendedString from PCollection;
+            returns HExtendedString from PCollection;
 	---Purpose: Creation by converting a normal Ascii string to an extended string. 
 	
 	Append(me : mutable; S : HExtendedString from PCollection);
@@ -255,7 +255,7 @@ is
 	Split(me : mutable; Index  : Integer) 
 	---Level: Public
         ---Purpose: Splits a string of characters into two sub-strings.
-	returns mutable HExtendedString from PCollection
+	returns HExtendedString from PCollection
 	raises OutOfRange from Standard;
 
 	SubString(me; FromIndex, ToIndex : Integer) 
@@ -264,7 +264,7 @@ is
         -- The sub-string starts to the index FromIndex and ends
         -- to the index ToIndex.
         -- Raises an exception if ToIndex or FromIndex is out of bounds.
-	returns mutable HExtendedString from PCollection
+	returns HExtendedString from PCollection
 	raises OutOfRange from Standard;
 
 	UsefullLength(me) returns Integer
diff --git a/src/PCollection/PCollection_HSequence.cdl b/src/PCollection/PCollection_HSequence.cdl
index d77b265a8a..1be4071731 100644
--- a/src/PCollection/PCollection_HSequence.cdl
+++ b/src/PCollection/PCollection_HSequence.cdl
@@ -30,23 +30,23 @@ raises
     	---Purpose: This class provides tools to manipulate a Sequence node.
     
     	Create( TheLast: SeqNode ; TheItem: Item)
-	    returns mutable SeqNode from PCollection;
+	    returns SeqNode from PCollection;
 
     	Create( TheItem: Item ; TheFirst: SeqNode )
-	    returns mutable SeqNode from PCollection;
+	    returns SeqNode from PCollection;
 
     	Create( ThePrevious: SeqNode ; TheNext: SeqNode ; TheItem: Item )
-	    returns mutable SeqNode from PCollection;
+	    returns SeqNode from PCollection;
 
     	Value(me) returns any Item;
         ---Level: Internal
 	    ---Purpose: Returns MyItem.
 	
-    	Next(me) returns mutable SeqNode;
+    	Next(me) returns SeqNode;
         ---Level: Internal
 	    ---Purpose: Returns MyNext.
 
-    	Previous(me) returns mutable SeqNode;
+    	Previous(me) returns SeqNode;
         ---Level: Internal
 	    ---Purpose: Returns MyPrevious.
 
@@ -129,7 +129,7 @@ raises
 is 
 
 
-	Create returns mutable HSequence;
+	Create returns HSequence;
 		---Purpose: Creation of an empty sequence.
 
 
@@ -280,7 +280,7 @@ is
 		--   me = (C B A)           
 
 	SubSequence(me; FromIndex, ToIndex : Integer) 
-		         		returns mutable HSequence
+		         		returns HSequence
 					raises OutOfRange from Standard;
                 ---Level: Public
 		---Purpose: Creation a sub-sequence with the elements from the 
@@ -296,7 +296,7 @@ is
 		--  (B C D)
               
 	Split(me : mutable; Index : Integer) 
-    	    returns mutable HSequence 
+    	    returns HSequence 
             raises OutOfRange from Standard;
                 ---Level: Public
 		---Purpose: Split a sequence into two sub-sequences.
diff --git a/src/PDF/PDF_Data.cdl b/src/PDF/PDF_Data.cdl
index 57a5b08dcb..17f066c6f7 100644
--- a/src/PDF/PDF_Data.cdl
+++ b/src/PDF/PDF_Data.cdl
@@ -35,10 +35,10 @@ uses
 is
 
     Create
-    	returns mutable Data from PDF;
+    	returns Data from PDF;
 
     Create(aVersionNumber : Integer from Standard)
-    	returns mutable Data from PDF;
+    	returns Data from PDF;
 
     VersionNumber(me)
     	returns Integer from Standard;
diff --git a/src/PDF/PDF_Reference.cdl b/src/PDF/PDF_Reference.cdl
index 6f52bec434..0e4f64b0d2 100644
--- a/src/PDF/PDF_Reference.cdl
+++ b/src/PDF/PDF_Reference.cdl
@@ -19,11 +19,11 @@ uses HAsciiString from PCollection
 
 is
 
-    Create returns mutable Reference from  PDF;
+    Create returns Reference from  PDF;
     
     
     Create (V : HAsciiString from PCollection) 
-    returns mutable Reference from PDF;
+    returns Reference from PDF;
     
     
     ReferencedLabel (me) returns HAsciiString from PCollection;
diff --git a/src/PDF/PDF_TagSource.cdl b/src/PDF/PDF_TagSource.cdl
index 0714a6d868..2f0a54e678 100644
--- a/src/PDF/PDF_TagSource.cdl
+++ b/src/PDF/PDF_TagSource.cdl
@@ -23,11 +23,11 @@ uses Integer from Standard
 is
 
     
-    Create returns mutable TagSource from  PDF;
+    Create returns TagSource from  PDF;
     
     
     Create (V : Integer from Standard) 
-    returns mutable TagSource from PDF;
+    returns TagSource from PDF;
     
     
     Get (me) returns Integer from Standard;
diff --git a/src/PDataStd/PDataStd_AsciiString.cdl b/src/PDataStd/PDataStd_AsciiString.cdl
index cb9ba99b6e..0e51ee6438 100644
--- a/src/PDataStd/PDataStd_AsciiString.cdl
+++ b/src/PDataStd/PDataStd_AsciiString.cdl
@@ -20,11 +20,11 @@ class AsciiString from PDataStd inherits Attribute from PDF
 uses  HAsciiString from PCollection
 
 is
-    Create returns mutable  AsciiString from  PDataStd;
+    Create returns  AsciiString from  PDataStd;
     
     
     Create (V : HAsciiString from PCollection) 
-    returns mutable  AsciiString from PDataStd;
+    returns  AsciiString from PDataStd;
     
     
     Get (me) returns HAsciiString from PCollection;
diff --git a/src/PDataStd/PDataStd_BooleanArray.cdl b/src/PDataStd/PDataStd_BooleanArray.cdl
index 6783227070..5147268f4a 100644
--- a/src/PDataStd/PDataStd_BooleanArray.cdl
+++ b/src/PDataStd/PDataStd_BooleanArray.cdl
@@ -22,7 +22,7 @@ uses
 is
 
     Create 
-    returns mutable BooleanArray from PDataStd;
+    returns BooleanArray from PDataStd;
 
     SetLower (me : mutable;
     	      lower : Integer from Standard);
diff --git a/src/PDataStd/PDataStd_BooleanList.cdl b/src/PDataStd/PDataStd_BooleanList.cdl
index 3f6f205358..6f66d958fa 100644
--- a/src/PDataStd/PDataStd_BooleanList.cdl
+++ b/src/PDataStd/PDataStd_BooleanList.cdl
@@ -22,7 +22,7 @@ uses
 is
 
     Create 
-    returns mutable BooleanList from PDataStd;
+    returns BooleanList from PDataStd;
 
     Init (me : mutable; 
     	  lower, upper : Integer from Standard);
diff --git a/src/PDataStd/PDataStd_ByteArray.cdl b/src/PDataStd/PDataStd_ByteArray.cdl
index 4b4421ed57..944e02fc2f 100644
--- a/src/PDataStd/PDataStd_ByteArray.cdl
+++ b/src/PDataStd/PDataStd_ByteArray.cdl
@@ -22,7 +22,7 @@ uses
 is
 
     Create 
-    returns mutable ByteArray from PDataStd;
+    returns ByteArray from PDataStd;
 
     Set (me : mutable;
     	 values : HArray1OfInteger from PColStd);
diff --git a/src/PDataStd/PDataStd_ByteArray_1.cdl b/src/PDataStd/PDataStd_ByteArray_1.cdl
index 86b783d648..80aec344c9 100644
--- a/src/PDataStd/PDataStd_ByteArray_1.cdl
+++ b/src/PDataStd/PDataStd_ByteArray_1.cdl
@@ -23,7 +23,7 @@ uses
 is
 
     Create 
-    returns mutable ByteArray_1 from PDataStd;
+    returns ByteArray_1 from PDataStd;
 
     Set (me : mutable;
     	 values : HArray1OfInteger from PColStd);
diff --git a/src/PDataStd/PDataStd_Comment.cdl b/src/PDataStd/PDataStd_Comment.cdl
index 97fc318c10..922280dfa8 100644
--- a/src/PDataStd/PDataStd_Comment.cdl
+++ b/src/PDataStd/PDataStd_Comment.cdl
@@ -20,11 +20,11 @@ uses HExtendedString from PCollection
 
 is
 
-    Create returns mutable Comment from  PDataStd;
+    Create returns Comment from  PDataStd;
     
     
     Create (V : HExtendedString from PCollection) 
-    returns mutable Comment from PDataStd;
+    returns Comment from PDataStd;
     
     
     Get (me) returns HExtendedString from PCollection;
diff --git a/src/PDataStd/PDataStd_Directory.cdl b/src/PDataStd/PDataStd_Directory.cdl
index 193b43121c..0c516cd72a 100644
--- a/src/PDataStd/PDataStd_Directory.cdl
+++ b/src/PDataStd/PDataStd_Directory.cdl
@@ -19,6 +19,6 @@ class Directory from PDataStd inherits Attribute from PDF
 	---Purpose: 
 is
 
-    Create returns mutable Directory from  PDataStd;
+    Create returns Directory from  PDataStd;
 
 end Directory;
diff --git a/src/PDataStd/PDataStd_Expression.cdl b/src/PDataStd/PDataStd_Expression.cdl
index 72319a08c6..5c569790ea 100644
--- a/src/PDataStd/PDataStd_Expression.cdl
+++ b/src/PDataStd/PDataStd_Expression.cdl
@@ -21,10 +21,10 @@ uses HExtendedString  from PCollection,
 
 is
 
-    Create returns mutable Expression from  PDataStd;
+    Create returns Expression from  PDataStd;
     
     Create (name : HExtendedString from PCollection) 
-    returns mutable Expression from PDataStd;
+    returns Expression from PDataStd;
     
     GetName (me) returns HExtendedString from PCollection;
     
diff --git a/src/PDataStd/PDataStd_ExtStringArray.cdl b/src/PDataStd/PDataStd_ExtStringArray.cdl
index e2651a62e7..7215c86091 100644
--- a/src/PDataStd/PDataStd_ExtStringArray.cdl
+++ b/src/PDataStd/PDataStd_ExtStringArray.cdl
@@ -23,7 +23,7 @@ uses HExtendedString          from PCollection,
      
 is
 
-    Create returns mutable ExtStringArray from PDataStd;
+    Create returns ExtStringArray from PDataStd;
 
     Init(me : mutable; lower, upper : Integer from Standard);
 
diff --git a/src/PDataStd/PDataStd_ExtStringArray_1.cdl b/src/PDataStd/PDataStd_ExtStringArray_1.cdl
index 773d587e9d..68d30b5daa 100644
--- a/src/PDataStd/PDataStd_ExtStringArray_1.cdl
+++ b/src/PDataStd/PDataStd_ExtStringArray_1.cdl
@@ -23,7 +23,7 @@ uses  HExtendedString          from PCollection,
      
 is
 
-    Create returns mutable ExtStringArray_1 from PDataStd;
+    Create returns ExtStringArray_1 from PDataStd;
 
     Init(me : mutable; lower, upper : Integer from Standard);
 
diff --git a/src/PDataStd/PDataStd_ExtStringList.cdl b/src/PDataStd/PDataStd_ExtStringList.cdl
index 42d9b6e0a1..8f813b84f8 100644
--- a/src/PDataStd/PDataStd_ExtStringList.cdl
+++ b/src/PDataStd/PDataStd_ExtStringList.cdl
@@ -23,7 +23,7 @@ uses
 is
 
     Create 
-    returns mutable ExtStringList from PDataStd;
+    returns ExtStringList from PDataStd;
 
     Init (me : mutable; 
     	  lower, upper : Integer from Standard);
diff --git a/src/PDataStd/PDataStd_IntPackedMap.cdl b/src/PDataStd/PDataStd_IntPackedMap.cdl
index 24a47264ed..9856566fbe 100644
--- a/src/PDataStd/PDataStd_IntPackedMap.cdl
+++ b/src/PDataStd/PDataStd_IntPackedMap.cdl
@@ -22,7 +22,7 @@ uses
 
 
 is
-    Create returns mutable  IntPackedMap from  PDataStd;
+    Create returns  IntPackedMap from  PDataStd;
 
     Init (me : mutable; theLow,  theUp:  Integer  from Standard);
     ---Purpose: Inits the internal container
diff --git a/src/PDataStd/PDataStd_IntPackedMap_1.cdl b/src/PDataStd/PDataStd_IntPackedMap_1.cdl
index 1ba7d7d4f5..793bc85f59 100644
--- a/src/PDataStd/PDataStd_IntPackedMap_1.cdl
+++ b/src/PDataStd/PDataStd_IntPackedMap_1.cdl
@@ -22,7 +22,7 @@ uses
 
 
 is
-    Create returns mutable  IntPackedMap_1 from  PDataStd;
+    Create returns  IntPackedMap_1 from  PDataStd;
 
     Init (me : mutable; theLow,  theUp:  Integer  from Standard);
     ---Purpose: Inits the internal container
diff --git a/src/PDataStd/PDataStd_Integer.cdl b/src/PDataStd/PDataStd_Integer.cdl
index 06679a32da..5ae62508ef 100644
--- a/src/PDataStd/PDataStd_Integer.cdl
+++ b/src/PDataStd/PDataStd_Integer.cdl
@@ -23,11 +23,11 @@ uses Integer from Standard
 is
 
 
-    Create returns mutable Integer from PDataStd;
+    Create returns Integer from PDataStd;
 
 
     Create (V : Integer from Standard)
-    returns mutable Integer from PDataStd;
+    returns Integer from PDataStd;
     
     
     Get (me) returns Integer from Standard;
diff --git a/src/PDataStd/PDataStd_IntegerArray.cdl b/src/PDataStd/PDataStd_IntegerArray.cdl
index 5a782e8bb0..5ebc905318 100644
--- a/src/PDataStd/PDataStd_IntegerArray.cdl
+++ b/src/PDataStd/PDataStd_IntegerArray.cdl
@@ -23,7 +23,7 @@ uses HArray1OfInteger from PColStd
      
 is
 
-    Create returns mutable IntegerArray from PDataStd;
+    Create returns IntegerArray from PDataStd;
 
     Init(me : mutable; lower, upper : Integer from Standard);
 
diff --git a/src/PDataStd/PDataStd_IntegerArray_1.cdl b/src/PDataStd/PDataStd_IntegerArray_1.cdl
index 10b519aebf..13c657dad8 100644
--- a/src/PDataStd/PDataStd_IntegerArray_1.cdl
+++ b/src/PDataStd/PDataStd_IntegerArray_1.cdl
@@ -21,7 +21,7 @@ uses HArray1OfInteger from PColStd
      
 is
 
-    Create returns mutable IntegerArray_1 from PDataStd;
+    Create returns IntegerArray_1 from PDataStd;
 
     Init(me : mutable; lower, upper : Integer from Standard);
 
diff --git a/src/PDataStd/PDataStd_IntegerList.cdl b/src/PDataStd/PDataStd_IntegerList.cdl
index 682e28d972..534c24ba8d 100644
--- a/src/PDataStd/PDataStd_IntegerList.cdl
+++ b/src/PDataStd/PDataStd_IntegerList.cdl
@@ -22,7 +22,7 @@ uses
 is
 
     Create 
-    returns mutable IntegerList from PDataStd;
+    returns IntegerList from PDataStd;
 
     Init (me : mutable; 
     	  lower, upper : Integer from Standard);
diff --git a/src/PDataStd/PDataStd_Name.cdl b/src/PDataStd/PDataStd_Name.cdl
index 43d5c045b9..965cd01b00 100644
--- a/src/PDataStd/PDataStd_Name.cdl
+++ b/src/PDataStd/PDataStd_Name.cdl
@@ -20,11 +20,11 @@ uses HExtendedString from PCollection
 
 is
 
-    Create returns mutable Name from  PDataStd;
+    Create returns Name from  PDataStd;
     
     
     Create (V : HExtendedString from PCollection) 
-    returns mutable Name from PDataStd;
+    returns Name from PDataStd;
     
     
     Get (me) returns HExtendedString from PCollection;
diff --git a/src/PDataStd/PDataStd_NamedData.cdl b/src/PDataStd/PDataStd_NamedData.cdl
index 585c023419..a7e69f0c19 100644
--- a/src/PDataStd/PDataStd_NamedData.cdl
+++ b/src/PDataStd/PDataStd_NamedData.cdl
@@ -30,7 +30,7 @@ uses
 is
 
     Create 
-    returns mutable NamedData from PDataStd;
+    returns NamedData from PDataStd;
 
     Init (me : mutable; theDimension:  HArray2OfInteger  from TColStd);
     ---Purpose: 6 pairs of (lower, upper) <theDimension> should be  initialized
diff --git a/src/PDataStd/PDataStd_NoteBook.cdl b/src/PDataStd/PDataStd_NoteBook.cdl
index 0eef9b078d..8300f3528b 100644
--- a/src/PDataStd/PDataStd_NoteBook.cdl
+++ b/src/PDataStd/PDataStd_NoteBook.cdl
@@ -19,6 +19,6 @@ class NoteBook from PDataStd inherits Attribute from PDF
 	---Purpose: 
 is
 
-    Create returns mutable NoteBook from  PDataStd;
+    Create returns NoteBook from  PDataStd;
 
 end NoteBook;
diff --git a/src/PDataStd/PDataStd_Real.cdl b/src/PDataStd/PDataStd_Real.cdl
index 4e3ecd60b9..7afa5bce74 100644
--- a/src/PDataStd/PDataStd_Real.cdl
+++ b/src/PDataStd/PDataStd_Real.cdl
@@ -22,12 +22,12 @@ uses Real from Standard
 
 is
 
-    Create returns mutable Real from PDataStd;
+    Create returns Real from PDataStd;
 
     
     Create (Value     : Real from Standard;
             Dimension : Integer from Standard)
-    returns mutable Real from PDataStd;
+    returns Real from PDataStd;
     
     Get (me) returns Real from Standard;
 
diff --git a/src/PDataStd/PDataStd_RealArray.cdl b/src/PDataStd/PDataStd_RealArray.cdl
index e45f5b7184..88a7173ab8 100644
--- a/src/PDataStd/PDataStd_RealArray.cdl
+++ b/src/PDataStd/PDataStd_RealArray.cdl
@@ -23,7 +23,7 @@ uses HArray1OfReal from PColStd
      
 is
 
-    Create returns mutable RealArray from PDataStd;
+    Create returns RealArray from PDataStd;
 
     Init(me : mutable; lower, upper : Integer from Standard);
 
diff --git a/src/PDataStd/PDataStd_RealArray_1.cdl b/src/PDataStd/PDataStd_RealArray_1.cdl
index c5d4b71967..143e7a380f 100644
--- a/src/PDataStd/PDataStd_RealArray_1.cdl
+++ b/src/PDataStd/PDataStd_RealArray_1.cdl
@@ -22,7 +22,7 @@ uses HArray1OfReal from PColStd
      
 is
 
-    Create returns mutable RealArray_1 from PDataStd;
+    Create returns RealArray_1 from PDataStd;
 
     Init(me : mutable; lower, upper : Integer from Standard);
 
diff --git a/src/PDataStd/PDataStd_RealList.cdl b/src/PDataStd/PDataStd_RealList.cdl
index dc71a12856..8451c934b7 100644
--- a/src/PDataStd/PDataStd_RealList.cdl
+++ b/src/PDataStd/PDataStd_RealList.cdl
@@ -22,7 +22,7 @@ uses
 is
 
     Create 
-    returns mutable RealList from PDataStd;
+    returns RealList from PDataStd;
 
     Init (me : mutable; 
     	  lower, upper : Integer from Standard);
diff --git a/src/PDataStd/PDataStd_ReferenceArray.cdl b/src/PDataStd/PDataStd_ReferenceArray.cdl
index eaaa38bc77..aa2ea33490 100644
--- a/src/PDataStd/PDataStd_ReferenceArray.cdl
+++ b/src/PDataStd/PDataStd_ReferenceArray.cdl
@@ -23,7 +23,7 @@ uses
 is
 
     Create 
-    returns mutable ReferenceArray from PDataStd;
+    returns ReferenceArray from PDataStd;
 
     Init (me : mutable; 
     	  lower, upper : Integer from Standard);
diff --git a/src/PDataStd/PDataStd_ReferenceList.cdl b/src/PDataStd/PDataStd_ReferenceList.cdl
index 7e1feb7079..f6c3964e5f 100644
--- a/src/PDataStd/PDataStd_ReferenceList.cdl
+++ b/src/PDataStd/PDataStd_ReferenceList.cdl
@@ -23,7 +23,7 @@ uses
 is
 
     Create 
-    returns mutable ReferenceList from PDataStd;
+    returns ReferenceList from PDataStd;
 
     Init (me : mutable; 
     	  lower, upper : Integer from Standard);
diff --git a/src/PDataStd/PDataStd_Relation.cdl b/src/PDataStd/PDataStd_Relation.cdl
index d0f1a1e34d..7d54f31ea2 100644
--- a/src/PDataStd/PDataStd_Relation.cdl
+++ b/src/PDataStd/PDataStd_Relation.cdl
@@ -21,10 +21,10 @@ uses HExtendedString  from PCollection,
 
 is
 
-    Create returns mutable Relation from  PDataStd;
+    Create returns Relation from  PDataStd;
     
     Create (name : HExtendedString from PCollection) 
-    returns mutable Relation from PDataStd;
+    returns Relation from PDataStd;
     
     GetName (me) returns HExtendedString from PCollection;
     
diff --git a/src/PDataStd/PDataStd_Tick.cdl b/src/PDataStd/PDataStd_Tick.cdl
index 1810b7ca69..beeeb55847 100644
--- a/src/PDataStd/PDataStd_Tick.cdl
+++ b/src/PDataStd/PDataStd_Tick.cdl
@@ -18,6 +18,6 @@ class Tick from PDataStd inherits Attribute from PDF
 is
 
     Create 
-    returns mutable Tick from  PDataStd;
+    returns Tick from  PDataStd;
 
 end Tick;
diff --git a/src/PDataStd/PDataStd_TreeNode.cdl b/src/PDataStd/PDataStd_TreeNode.cdl
index bca9e8480f..34233b015e 100644
--- a/src/PDataStd/PDataStd_TreeNode.cdl
+++ b/src/PDataStd/PDataStd_TreeNode.cdl
@@ -23,7 +23,7 @@ uses
 
 is
 
-    Create returns mutable TreeNode from PDataStd;
+    Create returns TreeNode from PDataStd;
         
     First(me) returns TreeNode from PDataStd;
 	 
diff --git a/src/PDataStd/PDataStd_UAttribute.cdl b/src/PDataStd/PDataStd_UAttribute.cdl
index 90d5ee5749..bcd28a23a8 100644
--- a/src/PDataStd/PDataStd_UAttribute.cdl
+++ b/src/PDataStd/PDataStd_UAttribute.cdl
@@ -22,7 +22,7 @@ uses HExtendedString from PCollection
      
 is
 
-    Create returns mutable UAttribute from PDataStd;
+    Create returns UAttribute from PDataStd;
 
     SetID(me: mutable; guid: HExtendedString from PCollection );
     
diff --git a/src/PDataStd/PDataStd_Variable.cdl b/src/PDataStd/PDataStd_Variable.cdl
index 5712fd1b34..d62e6f5ac8 100644
--- a/src/PDataStd/PDataStd_Variable.cdl
+++ b/src/PDataStd/PDataStd_Variable.cdl
@@ -22,11 +22,11 @@ class Variable from PDataStd inherits Attribute from PDF
 uses HAsciiString from PCollection
 is
 
-    Create returns mutable Variable from PDataStd;
+    Create returns Variable from PDataStd;
 
     
     Create (constant : Boolean from Standard)
-    returns mutable Variable from PDataStd;
+    returns Variable from PDataStd;
     
     Constant (me : mutable; status : Boolean from Standard);    
     Constant (me)
diff --git a/src/PDataXtd/PDataXtd_Axis.cdl b/src/PDataXtd/PDataXtd_Axis.cdl
index 5d5d351524..2a8774112c 100644
--- a/src/PDataXtd/PDataXtd_Axis.cdl
+++ b/src/PDataXtd/PDataXtd_Axis.cdl
@@ -23,6 +23,6 @@ class Axis from PDataXtd inherits Attribute from PDF
 
 is
 
-    Create returns mutable Axis from  PDataXtd;
+    Create returns Axis from  PDataXtd;
     
 end Axis;
diff --git a/src/PDataXtd/PDataXtd_Constraint.cdl b/src/PDataXtd/PDataXtd_Constraint.cdl
index de68d51dd4..b1d2cfa926 100644
--- a/src/PDataXtd/PDataXtd_Constraint.cdl
+++ b/src/PDataXtd/PDataXtd_Constraint.cdl
@@ -28,14 +28,14 @@ uses Integer          from Standard,
     
 is
 
-    Create returns mutable Constraint from  PDataXtd;
+    Create returns Constraint from  PDataXtd;
     
     
     Create (Type        : Integer          from Standard;
     	    Geometries  : HAttributeArray1 from PDF;
     	    Value       : Real             from PDataStd;
     	    Plane       : NamedShape       from PNaming) 
-    returns mutable Constraint from PDataXtd;
+    returns Constraint from PDataXtd;
     
     
     GetValue (me) returns Real from PDataStd;
diff --git a/src/PDataXtd/PDataXtd_Geometry.cdl b/src/PDataXtd/PDataXtd_Geometry.cdl
index e220284bbf..ed47751a85 100644
--- a/src/PDataXtd/PDataXtd_Geometry.cdl
+++ b/src/PDataXtd/PDataXtd_Geometry.cdl
@@ -28,10 +28,10 @@ uses Integer          from Standard,
     
 is
 
-    Create returns mutable Geometry from  PDataXtd;
+    Create returns Geometry from  PDataXtd;
     
     Create (Type : Integer from Standard)
-    returns mutable Geometry from PDataXtd;
+    returns Geometry from PDataXtd;
     
     GetType (me) returns Integer from Standard;
     
diff --git a/src/PDataXtd/PDataXtd_PatternStd.cdl b/src/PDataXtd/PDataXtd_PatternStd.cdl
index 41d818997a..ca1023a228 100644
--- a/src/PDataXtd/PDataXtd_PatternStd.cdl
+++ b/src/PDataXtd/PDataXtd_PatternStd.cdl
@@ -32,7 +32,7 @@ uses
 is
 
     Create
-    returns mutable PatternStd from PDataXtd;
+    returns PatternStd from PDataXtd;
     
     --- Category: Set and Get methods
 
diff --git a/src/PDataXtd/PDataXtd_Placement.cdl b/src/PDataXtd/PDataXtd_Placement.cdl
index 880fd313ad..2a51629d52 100644
--- a/src/PDataXtd/PDataXtd_Placement.cdl
+++ b/src/PDataXtd/PDataXtd_Placement.cdl
@@ -24,7 +24,7 @@ class Placement from PDataXtd inherits Attribute from PDF
     
 is
 
-    Create returns mutable Placement from  PDataXtd;
+    Create returns Placement from  PDataXtd;
     
 
 end Placement;
diff --git a/src/PDataXtd/PDataXtd_Plane.cdl b/src/PDataXtd/PDataXtd_Plane.cdl
index a4d41c75ff..ab765ec26c 100644
--- a/src/PDataXtd/PDataXtd_Plane.cdl
+++ b/src/PDataXtd/PDataXtd_Plane.cdl
@@ -23,6 +23,6 @@ class Plane from PDataXtd inherits Attribute from PDF
 
 is
 
-    Create returns mutable Plane from PDataXtd;
+    Create returns Plane from PDataXtd;
 
 end Plane;
diff --git a/src/PDataXtd/PDataXtd_Point.cdl b/src/PDataXtd/PDataXtd_Point.cdl
index ec61760e48..6d397d90e6 100644
--- a/src/PDataXtd/PDataXtd_Point.cdl
+++ b/src/PDataXtd/PDataXtd_Point.cdl
@@ -23,6 +23,6 @@ class Point from PDataXtd inherits Attribute from PDF
 
 is
 
-    Create returns mutable Point from PDataXtd;
+    Create returns Point from PDataXtd;
 
 end Point;
diff --git a/src/PDataXtd/PDataXtd_Shape.cdl b/src/PDataXtd/PDataXtd_Shape.cdl
index 9b310c931f..333b2e72fd 100644
--- a/src/PDataXtd/PDataXtd_Shape.cdl
+++ b/src/PDataXtd/PDataXtd_Shape.cdl
@@ -23,6 +23,6 @@ class Shape from PDataXtd inherits Attribute from PDF
 	---Purpose: 
 is
 
-    Create returns mutable Shape from  PDataXtd;
+    Create returns Shape from  PDataXtd;
 
 end Shape;
diff --git a/src/PFunction/PFunction_Function.cdl b/src/PFunction/PFunction_Function.cdl
index 19760a5f90..0ed64a17c8 100644
--- a/src/PFunction/PFunction_Function.cdl
+++ b/src/PFunction/PFunction_Function.cdl
@@ -23,7 +23,7 @@ uses
 
 is
 
-    Create returns mutable Function from PFunction;
+    Create returns Function from PFunction;
         
     SetDriverGUID(me : mutable; driverGUID : GUID from Standard);
 
diff --git a/src/PGeom/PGeom_Axis1Placement.cdl b/src/PGeom/PGeom_Axis1Placement.cdl
index 989853a6a0..415240f4e9 100644
--- a/src/PGeom/PGeom_Axis1Placement.cdl
+++ b/src/PGeom/PGeom_Axis1Placement.cdl
@@ -25,11 +25,11 @@ uses Ax1 from gp
 is
 
 
-  Create returns mutable Axis1Placement from PGeom;
+  Create returns Axis1Placement from PGeom;
         --- Purpose : Creates an Axis1Placement with Ax1 default value.
     	---Level: Internal 
 
-  Create (aAxis : Ax1 from gp) returns mutable Axis1Placement from PGeom;
+  Create (aAxis : Ax1 from gp) returns Axis1Placement from PGeom;
         --- Purpose : Creates an Axis1Placement with <aAxis>.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_Axis2Placement.cdl b/src/PGeom/PGeom_Axis2Placement.cdl
index 917aa4bb6e..77527ce7d2 100644
--- a/src/PGeom/PGeom_Axis2Placement.cdl
+++ b/src/PGeom/PGeom_Axis2Placement.cdl
@@ -27,13 +27,13 @@ uses Ax1      from gp,
 is
 
 
-  Create returns mutable Axis2Placement from PGeom;
+  Create returns Axis2Placement from PGeom;
         ---Purpose : Returns an Axis2Placement with default values.
     	---Level: Internal 
 
 
   Create (aAxis : Ax1 from gp; aXDirection: Dir from gp)
-    returns mutable Axis2Placement from PGeom;
+    returns Axis2Placement from PGeom;
         ---Purpose : Creates an Axis2Placement with <A2>.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_BSplineCurve.cdl b/src/PGeom/PGeom_BSplineCurve.cdl
index 1c7d824588..15d5f6be5b 100644
--- a/src/PGeom/PGeom_BSplineCurve.cdl
+++ b/src/PGeom/PGeom_BSplineCurve.cdl
@@ -28,7 +28,7 @@ uses  HArray1OfInteger from PColStd,
 is
 
 
-  Create returns mutable BSplineCurve from PGeom;
+  Create returns BSplineCurve from PGeom;
 	---Purpose: Creates a BSplineCurve with default values.
     	---Level: Internal 
 
@@ -41,7 +41,7 @@ is
     	    aWeights        : HArray1OfReal from PColStd;
     	    aKnots          : HArray1OfReal from PColStd;
     	    aMultiplicities : HArray1OfInteger from PColStd)
-     returns mutable BSplineCurve from PGeom;
+     returns BSplineCurve from PGeom;
 	---Purpose: Creates a BSplineCurve with these field values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_BSplineSurface.cdl b/src/PGeom/PGeom_BSplineSurface.cdl
index 103ca7fe39..6922df469c 100644
--- a/src/PGeom/PGeom_BSplineSurface.cdl
+++ b/src/PGeom/PGeom_BSplineSurface.cdl
@@ -31,7 +31,7 @@ uses  HArray1OfInteger from PColStd,
 
 is
   
-  Create returns mutable BSplineSurface from PGeom;
+  Create returns BSplineSurface from PGeom;
 	---Purpose: Creates a BSplineSurface with default values.
     	---Level: Internal 
 
@@ -49,7 +49,7 @@ is
     	    aVKnots    : HArray1OfReal from PColStd;
     	    aUMultiplicities    : HArray1OfInteger from PColStd;
     	    aVMultiplicities    : HArray1OfInteger from PColStd)
-    returns mutable BSplineSurface from PGeom;
+    returns BSplineSurface from PGeom;
 	---Purpose: Creates a BSplineSurface with these values.
 
 
diff --git a/src/PGeom/PGeom_BezierCurve.cdl b/src/PGeom/PGeom_BezierCurve.cdl
index 32c436ce25..21ebab627a 100644
--- a/src/PGeom/PGeom_BezierCurve.cdl
+++ b/src/PGeom/PGeom_BezierCurve.cdl
@@ -26,7 +26,7 @@ uses  HArray1OfReal from PColStd,
 is 
 
 
-  Create returns mutable BezierCurve from PGeom;
+  Create returns BezierCurve from PGeom;
         ---Purpose : Creates a non rational  Bezier curve with default
         --         values.
     	---Level: Internal 
@@ -34,7 +34,7 @@ is
   Create(aPoles    : HArray1OfPnt;
          aWeights  : HArray1OfReal;
 	 aRational : Boolean from Standard)
-     returns mutable BezierCurve from PGeom;
+     returns BezierCurve from PGeom;
         ---Purpose : Creates a non rational Bezier curve with a set of
         --         poles aCurvePoles and a set of weights aPoleWeight.
     	---Level: Internal 
diff --git a/src/PGeom/PGeom_BezierSurface.cdl b/src/PGeom/PGeom_BezierSurface.cdl
index 9978d16bcc..614c9cbbb8 100644
--- a/src/PGeom/PGeom_BezierSurface.cdl
+++ b/src/PGeom/PGeom_BezierSurface.cdl
@@ -29,7 +29,7 @@ uses HArray2OfReal from PColStd,
 is
 
 
-  Create returns mutable BezierSurface from PGeom;
+  Create returns BezierSurface from PGeom;
 	---Purpose: Creates a BezierSurface with default values.
     	---Level: Internal 
 
@@ -38,7 +38,7 @@ is
     	  aVRational : Boolean from Standard;
     	  aPoles     : HArray2OfPnt from PColgp;
     	  aWeights   : HArray2OfReal from PColStd)
-     returns mutable BezierSurface from PGeom;
+     returns BezierSurface from PGeom;
 	---Purpose: Creates a BezierSurface with these values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_CartesianPoint.cdl b/src/PGeom/PGeom_CartesianPoint.cdl
index 94088ce52e..2e89a35bf8 100644
--- a/src/PGeom/PGeom_CartesianPoint.cdl
+++ b/src/PGeom/PGeom_CartesianPoint.cdl
@@ -26,12 +26,12 @@ uses Pnt from gp
 is
 
 
-  Create returns mutable CartesianPoint from PGeom;
+  Create returns CartesianPoint from PGeom;
         ---Purpose : Returns a CartesianPoint with default values..
     	---Level: Internal 
 
 
-  Create (aPnt : Pnt from gp) returns mutable CartesianPoint from PGeom;
+  Create (aPnt : Pnt from gp) returns CartesianPoint from PGeom;
         ---Purpose : Returns a CartesianPoint built with <aPnt>.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_Circle.cdl b/src/PGeom/PGeom_Circle.cdl
index e172f35728..159e9e5e73 100644
--- a/src/PGeom/PGeom_Circle.cdl
+++ b/src/PGeom/PGeom_Circle.cdl
@@ -25,13 +25,13 @@ uses Ax2 from gp
 is
 
 
-  Create returns mutable Circle from PGeom;
+  Create returns Circle from PGeom;
 	---Purpose : Creates a circle with default values.
     	---Level: Internal 
 
 
   Create (aPosition : Ax2 from gp; aRadius : Real from Standard)
-    returns mutable Circle from PGeom;
+    returns Circle from PGeom;
         ---Purpose : Creates a Circle with <aPosition> and <aRadius> as field
         --         values.
     	---Level: Internal 
diff --git a/src/PGeom/PGeom_ConicalSurface.cdl b/src/PGeom/PGeom_ConicalSurface.cdl
index 10c29985e4..e32702ed89 100644
--- a/src/PGeom/PGeom_ConicalSurface.cdl
+++ b/src/PGeom/PGeom_ConicalSurface.cdl
@@ -25,7 +25,7 @@ uses Ax3      from gp
 is
 
 
-  Create returns mutable ConicalSurface from PGeom;
+  Create returns ConicalSurface from PGeom;
 	---Purpose: Creates a ConicalSurface with default values.
     	---Level: Internal 
 
@@ -33,7 +33,7 @@ is
   Create (aPosition  : Ax3 from gp;
     	  aRadius    : Real from Standard;
     	  aSemiAngle : Real from Standard)
-     returns mutable ConicalSurface from PGeom;
+     returns ConicalSurface from PGeom;
 	---Purpose: Creates a ConicalSurface with these values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_CylindricalSurface.cdl b/src/PGeom/PGeom_CylindricalSurface.cdl
index 6a1bbdf227..4f75023a66 100644
--- a/src/PGeom/PGeom_CylindricalSurface.cdl
+++ b/src/PGeom/PGeom_CylindricalSurface.cdl
@@ -25,14 +25,14 @@ uses Ax3      from gp
 is
 
 
-  Create returns mutable CylindricalSurface from PGeom;
+  Create returns CylindricalSurface from PGeom;
 	---Purpose: Creates a CylindricalSurface with default values.
     	---Level: Internal 
 
 
   Create (aPosition : Ax3 from gp;
     	  aRadius    : Real from Standard)
-     returns mutable CylindricalSurface from PGeom;
+     returns CylindricalSurface from PGeom;
 	---Purpose: Creates a CylindricalSurface with these values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_Direction.cdl b/src/PGeom/PGeom_Direction.cdl
index 82837f500a..a9d7baa1ed 100644
--- a/src/PGeom/PGeom_Direction.cdl
+++ b/src/PGeom/PGeom_Direction.cdl
@@ -26,12 +26,12 @@ uses  Vec from gp
 is
 
 
-  Create returns mutable Direction from PGeom;
+  Create returns Direction from PGeom;
         --- Purpose : Creates a unit vector with default values.
     	---Level: Internal 
 
 
-  Create (aVec: Vec from gp) returns mutable Direction from PGeom;
+  Create (aVec: Vec from gp) returns Direction from PGeom;
         ---Purpose : Create a unit vector with <aVec>.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_Ellipse.cdl b/src/PGeom/PGeom_Ellipse.cdl
index 955fa02778..e66f4c9d27 100644
--- a/src/PGeom/PGeom_Ellipse.cdl
+++ b/src/PGeom/PGeom_Ellipse.cdl
@@ -25,14 +25,14 @@ uses Ax2 from gp
 is
 
 
-  Create returns mutable Ellipse from PGeom;
+  Create returns Ellipse from PGeom;
         ---Purpose : Creates an ellipse with default values.
     	---Level: Internal 
 
 
   Create (aPosition : Ax2 from gp;
     	    aMajorRadius, aMinorRadius : Real from Standard)
-     returns mutable Ellipse from PGeom;
+     returns Ellipse from PGeom;
 	---Purpose :      Creates   an Ellipse      with  <aPosition>,
 	--         <aMajorRadius> and <aMinorRadius> as  field values.
 	--         The major radius of  the ellipse is  on the "XAxis"
diff --git a/src/PGeom/PGeom_Hyperbola.cdl b/src/PGeom/PGeom_Hyperbola.cdl
index 874fbeb31f..937f863791 100644
--- a/src/PGeom/PGeom_Hyperbola.cdl
+++ b/src/PGeom/PGeom_Hyperbola.cdl
@@ -25,14 +25,14 @@ uses Ax2 from gp
 is
 
 
-  Create returns mutable Hyperbola from PGeom;
+  Create returns Hyperbola from PGeom;
         ---Purpose :Creates an Hyperbola with default values.
     	---Level: Internal 
 
 
   Create (aPosition : Ax2 from gp;
     	  aMajorRadius, aMinorRadius : Real from Standard)
-     returns mutable Hyperbola from PGeom;
+     returns Hyperbola from PGeom;
 	---Purpose :  Creates an   Hyperbola    with      <aPosition>,
 	--         <aMajorRadius> and  <aMinorRadius> as field values.
 	--         The major  radius of the hyperbola is  on the XAxis
diff --git a/src/PGeom/PGeom_Line.cdl b/src/PGeom/PGeom_Line.cdl
index 74b4faa4bb..4f194a726a 100644
--- a/src/PGeom/PGeom_Line.cdl
+++ b/src/PGeom/PGeom_Line.cdl
@@ -26,12 +26,12 @@ uses Ax1 from gp
 is
 
 
-  Create returns mutable Line;
+  Create returns Line;
         ---Purpose : Creates a line with default values.
     	---Level: Internal 
 
 
-  Create (aPosition : Ax1 from gp)   returns mutable Line;
+  Create (aPosition : Ax1 from gp)   returns Line;
         ---Purpose : Creates   a  line  located    in  3D space   with
         --         <aPosition>.  The Location   of <aPosition> is  the
         --         origin of the line.
diff --git a/src/PGeom/PGeom_OffsetCurve.cdl b/src/PGeom/PGeom_OffsetCurve.cdl
index d019eeb611..52ff9ba1b7 100644
--- a/src/PGeom/PGeom_OffsetCurve.cdl
+++ b/src/PGeom/PGeom_OffsetCurve.cdl
@@ -29,7 +29,7 @@ uses Dir      from gp,
 is
     
 
-  Create returns mutable OffsetCurve from PGeom;
+  Create returns OffsetCurve from PGeom;
     ---Purpose: Creates an OffsetCurve with default values.
     	---Level: Internal 
 
@@ -38,7 +38,7 @@ is
     	    aBasisCurve : Curve from PGeom;
     	    aOffsetValue : Real from Standard;
     	    aOffsetDirection : Dir from gp)
-     returns mutable OffsetCurve from PGeom;
+     returns OffsetCurve from PGeom;
         ---Purpose : <aBasisCurve> is  the basis curve, <aOffsetValue>
         --         is the distance between <me> and the basis curve at
         --         any point.    <aOffsetDirection>  defines the fixed
diff --git a/src/PGeom/PGeom_OffsetSurface.cdl b/src/PGeom/PGeom_OffsetSurface.cdl
index 71f2d834d2..79f51520d5 100644
--- a/src/PGeom/PGeom_OffsetSurface.cdl
+++ b/src/PGeom/PGeom_OffsetSurface.cdl
@@ -25,7 +25,7 @@ uses Surface from PGeom
 is
 
 
-  Create returns mutable OffsetSurface from PGeom;
+  Create returns OffsetSurface from PGeom;
     ---Purpose: Creates an OffsetSurface with default values.
     	---Level: Internal 
 
@@ -33,7 +33,7 @@ is
   Create (
     	    aBasisSurface : Surface from PGeom;
     	    aOffsetValue : Real from Standard)
-     returns mutable OffsetSurface from PGeom;
+     returns OffsetSurface from PGeom;
         ---Purpose :  <aBasisSurface>    is  the   basis      surface,
         --         <aOffsetValue> is the distance between <me> and the
         --         basis  surface at any  point.    <aOffsetDirection>
diff --git a/src/PGeom/PGeom_Parabola.cdl b/src/PGeom/PGeom_Parabola.cdl
index 6f06d095c1..3a1d5a39e5 100644
--- a/src/PGeom/PGeom_Parabola.cdl
+++ b/src/PGeom/PGeom_Parabola.cdl
@@ -28,13 +28,13 @@ uses  Ax2 from gp
 is
 
 
-  Create returns mutable Parabola from PGeom;
+  Create returns Parabola from PGeom;
         ---Purpose : Creates a parabola with default values.
     	---Level: Internal 
 
 
   Create (aPosition : Ax2 from gp; aFocalLength : Real)
-    returns mutable Parabola from PGeom;
+    returns Parabola from PGeom;
 	---Purpose : Creates a Parabola with <aPosition> and <aFocalLength>
 	--         as field values.
     	---Level: Internal 
diff --git a/src/PGeom/PGeom_Plane.cdl b/src/PGeom/PGeom_Plane.cdl
index 7f4fce4b37..cfbc1394c4 100644
--- a/src/PGeom/PGeom_Plane.cdl
+++ b/src/PGeom/PGeom_Plane.cdl
@@ -26,13 +26,13 @@ uses Ax3      from gp
 is
 
 
-  Create returns mutable Plane from PGeom;
+  Create returns Plane from PGeom;
 	---Purpose: Create a plane with default values.
     	---Level: Internal 
 
 
   Create (aPosition : Ax3 from gp)
-    	returns mutable Plane from PGeom;
+    	returns Plane from PGeom;
 	---Purpose: Creates a Plane with these field values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_RectangularTrimmedSurface.cdl b/src/PGeom/PGeom_RectangularTrimmedSurface.cdl
index 5979fb2bd6..7058ad6629 100644
--- a/src/PGeom/PGeom_RectangularTrimmedSurface.cdl
+++ b/src/PGeom/PGeom_RectangularTrimmedSurface.cdl
@@ -27,7 +27,7 @@ uses Surface  from PGeom
 is
 
 
-   Create returns mutable RectangularTrimmedSurface from PGeom;
+   Create returns RectangularTrimmedSurface from PGeom;
 	---Purpose: Creates a RectangularTrimmedSurface with default values.
     	---Level: Internal 
 
@@ -38,7 +38,7 @@ is
     	    aLastU      : Real from Standard;
     	    aFirstV     : Real from Standard;
     	    aLastV      : Real from Standard)
-	    returns mutable RectangularTrimmedSurface from PGeom;
+	    returns RectangularTrimmedSurface from PGeom;
 	---Purpose: Creates a RectangularTrimmedSurface with these values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_SphericalSurface.cdl b/src/PGeom/PGeom_SphericalSurface.cdl
index b49a7a9240..31095764e9 100644
--- a/src/PGeom/PGeom_SphericalSurface.cdl
+++ b/src/PGeom/PGeom_SphericalSurface.cdl
@@ -26,14 +26,14 @@ uses Ax3      from gp
 is
 
 
-  Create returns mutable SphericalSurface from PGeom;
+  Create returns SphericalSurface from PGeom;
 	---Purpose: Creates a SphericalSurface with default values.
     	---Level: Internal 
 
 
   Create (aPosition : Ax3 from gp;
     	  aRadius    : Real from Standard)
-     returns mutable SphericalSurface from PGeom;
+     returns SphericalSurface from PGeom;
 	---Purpose: Creates a SphericalSurface with these values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_SurfaceOfLinearExtrusion.cdl b/src/PGeom/PGeom_SurfaceOfLinearExtrusion.cdl
index 9cb60dc2e6..20cc29a8ee 100644
--- a/src/PGeom/PGeom_SurfaceOfLinearExtrusion.cdl
+++ b/src/PGeom/PGeom_SurfaceOfLinearExtrusion.cdl
@@ -29,7 +29,7 @@ uses Dir         from gp,
 is
 
 
-  Create returns mutable SurfaceOfLinearExtrusion from PGeom;
+  Create returns SurfaceOfLinearExtrusion from PGeom;
 	---Purpose: Creates a SurfaceOfLinearExtrusion with default values.
     	---Level: Internal 
 
@@ -37,7 +37,7 @@ is
   Create (
     	    aBasisCurve : Curve from PGeom;
     	    aDirection  : Dir from gp)
-     returns mutable SurfaceOfLinearExtrusion from PGeom;
+     returns SurfaceOfLinearExtrusion from PGeom;
 	---Purpose: Creates a SurfaceOfLinearExtrusion with these values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_SurfaceOfRevolution.cdl b/src/PGeom/PGeom_SurfaceOfRevolution.cdl
index 10609a119a..f61257d544 100644
--- a/src/PGeom/PGeom_SurfaceOfRevolution.cdl
+++ b/src/PGeom/PGeom_SurfaceOfRevolution.cdl
@@ -32,7 +32,7 @@ uses Dir         from gp,
 is
 
 
-  Create returns mutable SurfaceOfRevolution from PGeom;
+  Create returns SurfaceOfRevolution from PGeom;
 	---Purpose: Creates a SurfaceOfRevolution with default values.
     	---Level: Internal 
 
@@ -41,7 +41,7 @@ is
     	    aBasisCurve : Curve from PGeom;
     	    aDirection  : Dir from gp;
 	    aLocation   : Pnt from gp)
-     returns mutable SurfaceOfRevolution from PGeom;
+     returns SurfaceOfRevolution from PGeom;
 	---Purpose: Creates a SurfaceOfRevolution with these values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_ToroidalSurface.cdl b/src/PGeom/PGeom_ToroidalSurface.cdl
index 750cc1e9bd..c92950915e 100644
--- a/src/PGeom/PGeom_ToroidalSurface.cdl
+++ b/src/PGeom/PGeom_ToroidalSurface.cdl
@@ -27,7 +27,7 @@ is
 
 
 
-  Create returns mutable ToroidalSurface from PGeom;
+  Create returns ToroidalSurface from PGeom;
 	---Purpose: Creates a ToroidalSurface with default values.
     	---Level: Internal 
 
@@ -35,7 +35,7 @@ is
   Create (aPosition : Ax3 from gp;
     	  aMajorRadius: Real from Standard;
     	  aMinorRadius: Real from Standard)
-     returns mutable ToroidalSurface from PGeom;
+     returns ToroidalSurface from PGeom;
 	---Purpose: Creates a ToroidalSurface with these values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_Transformation.cdl b/src/PGeom/PGeom_Transformation.cdl
index 70c7e5d5ce..809d9a4190 100644
--- a/src/PGeom/PGeom_Transformation.cdl
+++ b/src/PGeom/PGeom_Transformation.cdl
@@ -32,12 +32,12 @@ uses Trsf from gp
 is
 
 
-  Create returns mutable Transformation from PGeom;
+  Create returns Transformation from PGeom;
         ---Purpose : Creates a transformation with default values.
     	---Level: Internal 
 
 
-  Create (aTrsf : Trsf from gp) returns mutable Transformation from PGeom;
+  Create (aTrsf : Trsf from gp) returns Transformation from PGeom;
         ---Purpose :  Creates a transformation with <aTrsf>.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_TrimmedCurve.cdl b/src/PGeom/PGeom_TrimmedCurve.cdl
index 184d9d604b..91a44f6ce4 100644
--- a/src/PGeom/PGeom_TrimmedCurve.cdl
+++ b/src/PGeom/PGeom_TrimmedCurve.cdl
@@ -28,7 +28,7 @@ uses Curve from PGeom
 is
 
 
-  Create returns mutable TrimmedCurve from PGeom;
+  Create returns TrimmedCurve from PGeom;
 	---Purpose: Creates a TrimmedCurve with default values.
     	---Level: Internal 
 
@@ -36,7 +36,7 @@ is
   Create (
     	aBasisCurve: Curve from PGeom;
     	aFirstU, aLastU: Real from Standard)
-     returns mutable TrimmedCurve from PGeom;
+     returns TrimmedCurve from PGeom;
         ---Purpose : Creates a TrimmedCurve with these field values.
     	---Level: Internal 
 
diff --git a/src/PGeom/PGeom_VectorWithMagnitude.cdl b/src/PGeom/PGeom_VectorWithMagnitude.cdl
index 38929e87b1..e238bc877d 100644
--- a/src/PGeom/PGeom_VectorWithMagnitude.cdl
+++ b/src/PGeom/PGeom_VectorWithMagnitude.cdl
@@ -26,12 +26,12 @@ uses Vec from gp
 is
 
 
-  Create returns mutable VectorWithMagnitude;
+  Create returns VectorWithMagnitude;
         ---Purpose : Creates a VectorWithMagnitude with default values.
     	---Level: Internal 
 
 
-  Create (aVec : Vec) returns mutable VectorWithMagnitude;
+  Create (aVec : Vec) returns VectorWithMagnitude;
         ---Purpose : Creates a VectorWithMagnitude with <aVec>.
     	---Level: Internal 
 
diff --git a/src/PGeom2d/PGeom2d_AxisPlacement.cdl b/src/PGeom2d/PGeom2d_AxisPlacement.cdl
index 8c3f923794..a88aec7da9 100644
--- a/src/PGeom2d/PGeom2d_AxisPlacement.cdl
+++ b/src/PGeom2d/PGeom2d_AxisPlacement.cdl
@@ -26,12 +26,12 @@ uses Ax2d from gp
 is
 
 
-    Create returns mutable AxisPlacement from PGeom2d;
+    Create returns AxisPlacement from PGeom2d;
 	---Purpose: Initializes the field(s) with default value(s).
 	---Level: Internal 
 
 
-    Create(aAxis: Ax2d from gp) returns mutable AxisPlacement from PGeom2d;
+    Create(aAxis: Ax2d from gp) returns AxisPlacement from PGeom2d;
 	---Purpose: Initializes the field axis with <aAxis>.
 	---Level: Internal 
 
diff --git a/src/PGeom2d/PGeom2d_BSplineCurve.cdl b/src/PGeom2d/PGeom2d_BSplineCurve.cdl
index 8a0116bb23..3eb97a1d33 100644
--- a/src/PGeom2d/PGeom2d_BSplineCurve.cdl
+++ b/src/PGeom2d/PGeom2d_BSplineCurve.cdl
@@ -28,7 +28,7 @@ uses  HArray1OfInteger from PColStd,
 is
 
 
-  Create returns mutable BSplineCurve from PGeom2d;
+  Create returns BSplineCurve from PGeom2d;
 	---Purpose: Creates a BSplineCurve with default values.
 	---Level: Internal 
 
@@ -41,7 +41,7 @@ is
     	    aWeights        : HArray1OfReal from PColStd;
     	    aKnots          : HArray1OfReal from PColStd;
     	    aMultiplicities : HArray1OfInteger from PColStd)
-     returns mutable BSplineCurve from PGeom2d;
+     returns BSplineCurve from PGeom2d;
 	---Purpose: Creates a BSplineCurve with these field values.
 	---Level: Internal 
 
diff --git a/src/PGeom2d/PGeom2d_BezierCurve.cdl b/src/PGeom2d/PGeom2d_BezierCurve.cdl
index 994ea94e4d..24ee161ecb 100644
--- a/src/PGeom2d/PGeom2d_BezierCurve.cdl
+++ b/src/PGeom2d/PGeom2d_BezierCurve.cdl
@@ -26,7 +26,7 @@ uses  HArray1OfReal from PColStd,
 is 
 
 
-  Create returns mutable BezierCurve from PGeom2d;
+  Create returns BezierCurve from PGeom2d;
         ---Purpose : Creates a non rational  Bezier curve with default
         --         values.
 	---Level: Internal 
@@ -35,7 +35,7 @@ is
   Create(aPoles    : HArray1OfPnt2d;
          aWeights  : HArray1OfReal;
 	 aRational : Boolean from Standard)
-     returns mutable BezierCurve from PGeom2d;
+     returns BezierCurve from PGeom2d;
         ---Purpose : Creates a non rational Bezier curve with a set of
         --         poles aCurvePoles and a set of weights aPoleWeight.
 	---Level: Internal 
diff --git a/src/PGeom2d/PGeom2d_CartesianPoint.cdl b/src/PGeom2d/PGeom2d_CartesianPoint.cdl
index 275caa1c7c..caa72fb417 100644
--- a/src/PGeom2d/PGeom2d_CartesianPoint.cdl
+++ b/src/PGeom2d/PGeom2d_CartesianPoint.cdl
@@ -26,12 +26,12 @@ uses Pnt2d from gp
 is
 
 
-  Create returns mutable CartesianPoint from PGeom2d;
+  Create returns CartesianPoint from PGeom2d;
         ---Purpose : Returns a CartesianPoint with default values..
 	---Level: Internal 
 
 
-  Create (aPnt2d : Pnt2d from gp) returns mutable CartesianPoint from PGeom2d;
+  Create (aPnt2d : Pnt2d from gp) returns CartesianPoint from PGeom2d;
         ---Purpose : Returns a CartesianPoint built with <aPnt2d>.
 	---Level: Internal 
 
diff --git a/src/PGeom2d/PGeom2d_Circle.cdl b/src/PGeom2d/PGeom2d_Circle.cdl
index 0b87cacab3..cbe3486fa7 100644
--- a/src/PGeom2d/PGeom2d_Circle.cdl
+++ b/src/PGeom2d/PGeom2d_Circle.cdl
@@ -25,13 +25,13 @@ uses Ax22d from gp
 is
 
 
-  Create returns mutable Circle from PGeom2d;
+  Create returns Circle from PGeom2d;
 	---Purpose : Creates a circle with default values.
 	---Level: Internal 
 
 
   Create (aPosition : Ax22d from gp; aRadius : Real from Standard)
-    returns mutable Circle from PGeom2d;
+    returns Circle from PGeom2d;
         ---Purpose : Creates a Circle with <aPosition> and <aRadius> as field
         --         values.
 	---Level: Internal 
diff --git a/src/PGeom2d/PGeom2d_Direction.cdl b/src/PGeom2d/PGeom2d_Direction.cdl
index ed04ac2857..3b91bb6062 100644
--- a/src/PGeom2d/PGeom2d_Direction.cdl
+++ b/src/PGeom2d/PGeom2d_Direction.cdl
@@ -26,12 +26,12 @@ uses  Vec2d from gp
 is
 
 
-  Create returns mutable Direction from PGeom2d;
+  Create returns Direction from PGeom2d;
         --- Purpose : Creates a unit vector with default values.
 	---Level: Internal 
 
 
-  Create (aVec: Vec2d from gp) returns mutable Direction from PGeom2d;
+  Create (aVec: Vec2d from gp) returns Direction from PGeom2d;
         ---Purpose : Create a unit vector with <aVec>.
 	---Level: Internal 
 
diff --git a/src/PGeom2d/PGeom2d_Ellipse.cdl b/src/PGeom2d/PGeom2d_Ellipse.cdl
index 9451a5c3c1..900bdb5b31 100644
--- a/src/PGeom2d/PGeom2d_Ellipse.cdl
+++ b/src/PGeom2d/PGeom2d_Ellipse.cdl
@@ -25,14 +25,14 @@ uses Ax22d from gp
 is
 
 
-  Create returns mutable Ellipse from PGeom2d;
+  Create returns Ellipse from PGeom2d;
         ---Purpose : Creates an ellipse with default values.
 	---Level: Internal 
 
 
   Create (aPosition : Ax22d from gp;
     	    aMajorRadius, aMinorRadius : Real from Standard)
-     returns mutable Ellipse from PGeom2d;
+     returns Ellipse from PGeom2d;
 	---Purpose :      Creates   an Ellipse      with  <aPosition>,
 	--         <aMajorRadius> and <aMinorRadius> as  field values.
 	--         The major radius of  the ellipse is  on the "XAxis"
diff --git a/src/PGeom2d/PGeom2d_Hyperbola.cdl b/src/PGeom2d/PGeom2d_Hyperbola.cdl
index b2822a52ae..1968e4262f 100644
--- a/src/PGeom2d/PGeom2d_Hyperbola.cdl
+++ b/src/PGeom2d/PGeom2d_Hyperbola.cdl
@@ -25,14 +25,14 @@ uses Ax22d from gp
 is
 
 
-  Create returns mutable Hyperbola from PGeom2d;
+  Create returns Hyperbola from PGeom2d;
         ---Purpose :Creates an Hyperbola with default values.
 	---Level: Internal 
 
 
   Create (aPosition : Ax22d from gp;
     	  aMajorRadius, aMinorRadius : Real from Standard)
-     returns mutable Hyperbola from PGeom2d;
+     returns Hyperbola from PGeom2d;
 	---Purpose :  Creates an   Hyperbola    with      <aPosition>,
 	--         <aMajorRadius> and  <aMinorRadius> as field values.
 	--         The major  radius of the hyperbola is  on the XAxis
diff --git a/src/PGeom2d/PGeom2d_Line.cdl b/src/PGeom2d/PGeom2d_Line.cdl
index 82846b2e74..e7cb8d8886 100644
--- a/src/PGeom2d/PGeom2d_Line.cdl
+++ b/src/PGeom2d/PGeom2d_Line.cdl
@@ -26,12 +26,12 @@ uses Ax2d from gp
 is
 
 
-  Create returns mutable Line;
+  Create returns Line;
         ---Purpose : Creates a line with default values.
 	---Level: Internal 
 
 
-  Create (aPosition : Ax2d from gp)   returns mutable Line;
+  Create (aPosition : Ax2d from gp)   returns Line;
         ---Purpose : Creates   a  line  located    in  3D space   with
         --         <aPosition>.  The Location   of <aPosition> is  the
         --         origin of the line.
diff --git a/src/PGeom2d/PGeom2d_OffsetCurve.cdl b/src/PGeom2d/PGeom2d_OffsetCurve.cdl
index 2a2be81170..6bfa33e129 100644
--- a/src/PGeom2d/PGeom2d_OffsetCurve.cdl
+++ b/src/PGeom2d/PGeom2d_OffsetCurve.cdl
@@ -28,7 +28,7 @@ uses Curve from PGeom2d
 is
     
 
-  Create returns mutable OffsetCurve from PGeom2d;
+  Create returns OffsetCurve from PGeom2d;
     ---Purpose: Creates an OffsetCurve with default values.
 	---Level: Internal 
 
@@ -36,7 +36,7 @@ is
   Create (
     	    aBasisCurve : Curve from PGeom2d;
     	    aOffsetValue : Real from Standard)
-     returns mutable OffsetCurve from PGeom2d;
+     returns OffsetCurve from PGeom2d;
         ---Purpose : <aBasisCurve> is  the basis curve, <aOffsetValue>
         --         is the distance between <me> and the basis curve at
         --         any point.    <aOffsetDirection>  defines the fixed
diff --git a/src/PGeom2d/PGeom2d_Parabola.cdl b/src/PGeom2d/PGeom2d_Parabola.cdl
index b82f7b18a2..cf0c3419b6 100644
--- a/src/PGeom2d/PGeom2d_Parabola.cdl
+++ b/src/PGeom2d/PGeom2d_Parabola.cdl
@@ -27,13 +27,13 @@ uses  Ax22d from gp
 is
 
 
-  Create returns mutable Parabola from PGeom2d;
+  Create returns Parabola from PGeom2d;
         ---Purpose : Creates a parabola with default values.
 	---Level: Internal 
 
 
   Create (aPosition : Ax22d from gp; aFocalLength : Real)
-    returns mutable Parabola from PGeom2d;
+    returns Parabola from PGeom2d;
 	---Purpose : Creates a Parabola with <aPosition> and <aFocalLength>
 	--         as field values.
 	---Level: Internal 
diff --git a/src/PGeom2d/PGeom2d_Transformation.cdl b/src/PGeom2d/PGeom2d_Transformation.cdl
index 21c5281736..6c1102836d 100644
--- a/src/PGeom2d/PGeom2d_Transformation.cdl
+++ b/src/PGeom2d/PGeom2d_Transformation.cdl
@@ -32,12 +32,12 @@ uses Trsf2d from gp
 is
 
 
-  Create returns mutable Transformation from PGeom2d;
+  Create returns Transformation from PGeom2d;
         ---Purpose : Creates a transformation with default values.
 	---Level: Internal 
 
 
-  Create (aTrsf : Trsf2d from gp) returns mutable Transformation from PGeom2d;
+  Create (aTrsf : Trsf2d from gp) returns Transformation from PGeom2d;
         ---Purpose :  Creates a transformation with <aTrsf>.
 	---Level: Internal 
 
diff --git a/src/PGeom2d/PGeom2d_TrimmedCurve.cdl b/src/PGeom2d/PGeom2d_TrimmedCurve.cdl
index 77c052d810..f600b0c1e5 100644
--- a/src/PGeom2d/PGeom2d_TrimmedCurve.cdl
+++ b/src/PGeom2d/PGeom2d_TrimmedCurve.cdl
@@ -28,7 +28,7 @@ uses Curve from PGeom2d
 is
 
 
-  Create returns mutable TrimmedCurve from PGeom2d;
+  Create returns TrimmedCurve from PGeom2d;
 	---Purpose: Creates a TrimmedCurve with default values.
 	---Level: Advanced 
 
@@ -36,7 +36,7 @@ is
   Create (
     	aBasisCurve: Curve from PGeom2d;
     	aFirstU, aLastU: Real from Standard)
-     returns mutable TrimmedCurve from PGeom2d;
+     returns TrimmedCurve from PGeom2d;
         ---Purpose : Creates a TrimmedCurve with these field values.
 	---Level: Advanced 
 
diff --git a/src/PGeom2d/PGeom2d_VectorWithMagnitude.cdl b/src/PGeom2d/PGeom2d_VectorWithMagnitude.cdl
index 6781111f10..85f56dd6a8 100644
--- a/src/PGeom2d/PGeom2d_VectorWithMagnitude.cdl
+++ b/src/PGeom2d/PGeom2d_VectorWithMagnitude.cdl
@@ -26,12 +26,12 @@ uses Vec2d from gp
 is
 
 
-  Create returns mutable VectorWithMagnitude;
+  Create returns VectorWithMagnitude;
         ---Purpose : Creates a VectorWithMagnitude with default values.
 	---Level: Advanced 
 
 
-  Create (aVec : Vec2d from gp) returns mutable VectorWithMagnitude;
+  Create (aVec : Vec2d from gp) returns VectorWithMagnitude;
         ---Purpose : Creates a VectorWithMagnitude with <aVec>.
 	---Level: Advanced 
 
diff --git a/src/PNaming/PNaming_Name.cdl b/src/PNaming/PNaming_Name.cdl
index af95820777..4cbda2ba28 100644
--- a/src/PNaming/PNaming_Name.cdl
+++ b/src/PNaming/PNaming_Name.cdl
@@ -23,7 +23,7 @@ uses
    HArray1OfNamedShape from PNaming
 
 is
-    Create returns mutable Name from PNaming;
+    Create returns Name from PNaming;
     
     Type      (me : mutable; T : Integer from Standard);
     ---C++: inline
diff --git a/src/PNaming/PNaming_Name_1.cdl b/src/PNaming/PNaming_Name_1.cdl
index 1315154d01..b1a3b8361c 100644
--- a/src/PNaming/PNaming_Name_1.cdl
+++ b/src/PNaming/PNaming_Name_1.cdl
@@ -22,7 +22,7 @@ uses
    HAsciiString        from PCollection
 
 is
-    Create returns mutable Name_1 from PNaming;
+    Create returns Name_1 from PNaming;
     
     Type      (me : mutable; T : Integer from Standard);
     ---C++: inline
diff --git a/src/PNaming/PNaming_Name_2.cdl b/src/PNaming/PNaming_Name_2.cdl
index c2a1f81a2d..03b1a8503b 100644
--- a/src/PNaming/PNaming_Name_2.cdl
+++ b/src/PNaming/PNaming_Name_2.cdl
@@ -22,7 +22,7 @@ uses
    HAsciiString        from PCollection
 
 is
-    Create returns mutable Name_2 from PNaming;
+    Create returns Name_2 from PNaming;
     
     Type      (me : mutable; T : Integer from Standard);
     ---C++: inline
diff --git a/src/PNaming/PNaming_NamedShape.cdl b/src/PNaming/PNaming_NamedShape.cdl
index e2f1ac5e31..66508994e8 100644
--- a/src/PNaming/PNaming_NamedShape.cdl
+++ b/src/PNaming/PNaming_NamedShape.cdl
@@ -28,7 +28,7 @@ uses
 is
 
 
-    Create returns mutable NamedShape from PNaming;
+    Create returns NamedShape from PNaming;
 	---Purpose: Creates a mutable NamedShape from PNaming.
 
     
diff --git a/src/PNaming/PNaming_Naming.cdl b/src/PNaming/PNaming_Naming.cdl
index 8014b948e0..88623f683d 100644
--- a/src/PNaming/PNaming_Naming.cdl
+++ b/src/PNaming/PNaming_Naming.cdl
@@ -23,7 +23,7 @@ uses
 			    
 is
     Create
-    returns mutable Naming from PNaming;
+    returns Naming from PNaming;
     
     SetName(me : mutable ; aName : Name from PNaming);
 
diff --git a/src/PNaming/PNaming_Naming_1.cdl b/src/PNaming/PNaming_Naming_1.cdl
index 264ae389c3..1f87b03fe3 100644
--- a/src/PNaming/PNaming_Naming_1.cdl
+++ b/src/PNaming/PNaming_Naming_1.cdl
@@ -21,7 +21,7 @@ uses
 			    
 is
     Create
-    returns mutable Naming_1 from PNaming;
+    returns Naming_1 from PNaming;
     
     SetName(me : mutable ; aName : Name_1 from PNaming);
 
diff --git a/src/PNaming/PNaming_Naming_2.cdl b/src/PNaming/PNaming_Naming_2.cdl
index fdf3d02ae3..24bab6bc8d 100644
--- a/src/PNaming/PNaming_Naming_2.cdl
+++ b/src/PNaming/PNaming_Naming_2.cdl
@@ -21,7 +21,7 @@ uses
 			    
 is
     Create
-    returns mutable Naming_2 from PNaming;
+    returns Naming_2 from PNaming;
     
     SetName(me : mutable ; aName : Name_2 from PNaming);
 
diff --git a/src/PPoly/PPoly_Polygon2D.cdl b/src/PPoly/PPoly_Polygon2D.cdl
index 7cbca10539..e2f9dc638c 100644
--- a/src/PPoly/PPoly_Polygon2D.cdl
+++ b/src/PPoly/PPoly_Polygon2D.cdl
@@ -29,7 +29,7 @@ is
 
     Create(Nodes: HArray1OfPnt2d from PColgp;
     	   Defl : Real from Standard) 
-    returns mutable Polygon2D from PPoly;
+    returns Polygon2D from PPoly;
     	---Purpose: Defaults with allocation of nodes.
     
     Deflection(me) returns Real;
diff --git a/src/PPoly/PPoly_Polygon3D.cdl b/src/PPoly/PPoly_Polygon3D.cdl
index 068a2e03af..9c400ce594 100644
--- a/src/PPoly/PPoly_Polygon3D.cdl
+++ b/src/PPoly/PPoly_Polygon3D.cdl
@@ -30,13 +30,13 @@ is
 
     Create(Nodes: HArray1OfPnt from PColgp;
     	   Defl : Real from Standard) 
-    returns mutable Polygon3D from PPoly;
+    returns Polygon3D from PPoly;
     	---Purpose: Defaults with allocation of nodes.
 
     Create(Nodes      : HArray1OfPnt  from PColgp;
            Parameters : HArray1OfReal from PColStd;
     	   Defl       : Real          from Standard) 
-    returns mutable Polygon3D from PPoly;
+    returns Polygon3D from PPoly;
     	---Purpose: Defaults with allocation of nodes + Parameters
     
 
diff --git a/src/PPoly/PPoly_PolygonOnTriangulation.cdl b/src/PPoly/PPoly_PolygonOnTriangulation.cdl
index b2631f4dc3..45f1898c14 100644
--- a/src/PPoly/PPoly_PolygonOnTriangulation.cdl
+++ b/src/PPoly/PPoly_PolygonOnTriangulation.cdl
@@ -30,17 +30,17 @@ raises NullObject from Standard
 
 is
 
-    Create returns mutable PolygonOnTriangulation from PPoly;
+    Create returns PolygonOnTriangulation from PPoly;
     
     Create(Nodes : HArray1OfInteger from PColStd;
     	   Defl  : Real             from Standard)
-    returns mutable PolygonOnTriangulation from PPoly;
+    returns PolygonOnTriangulation from PPoly;
     	---Purpose: Defaults with allocation of nodes.
     
     Create(Nodes      : HArray1OfInteger from PColStd;
        	   Defl       : Real             from Standard;
            Parameters : HArray1OfReal    from PColStd) 
-    returns mutable PolygonOnTriangulation from PPoly;
+    returns PolygonOnTriangulation from PPoly;
     	---Purpose: Defaults with allocation of nodes.
     
     Deflection(me) returns Real;
diff --git a/src/PPoly/PPoly_Triangulation.cdl b/src/PPoly/PPoly_Triangulation.cdl
index 0fe1b5eef2..7933e0fe86 100644
--- a/src/PPoly/PPoly_Triangulation.cdl
+++ b/src/PPoly/PPoly_Triangulation.cdl
@@ -47,14 +47,14 @@ is
     Create(Defl:       Real              from Standard;
     	   Nodes:      HArray1OfPnt      from PColgp;
     	   Triangles:  HArray1OfTriangle from PPoly)
-    returns mutable Triangulation from PPoly;
+    returns Triangulation from PPoly;
     	---Purpose: Defaults with allocation of Nodes and Triangles.
 
     Create(Defl:       Real              from Standard;
     	   Nodes:      HArray1OfPnt      from PColgp;
     	   UVNodes:    HArray1OfPnt2d    from PColgp;
     	   Triangles:  HArray1OfTriangle from PPoly)
-    returns mutable Triangulation from PPoly;
+    returns Triangulation from PPoly;
     	---Purpose: Defaults with allocation of Nodes and Triangles.
 
     Deflection(me) returns Real;
diff --git a/src/PPrsStd/PPrsStd_AISPresentation.cdl b/src/PPrsStd/PPrsStd_AISPresentation.cdl
index 8d2aac1cf6..2398d29367 100644
--- a/src/PPrsStd/PPrsStd_AISPresentation.cdl
+++ b/src/PPrsStd/PPrsStd_AISPresentation.cdl
@@ -22,7 +22,7 @@ class AISPresentation from PPrsStd
 uses    HExtendedString from PCollection
 is
 
-    Create returns mutable AISPresentation from PPrsStd;
+    Create returns AISPresentation from PPrsStd;
 	
     IsDisplayed(me) returns Boolean from Standard;
     SetDisplayed(me : mutable; B : Boolean from Standard);
diff --git a/src/PPrsStd/PPrsStd_AISPresentation_1.cdl b/src/PPrsStd/PPrsStd_AISPresentation_1.cdl
index c8cfbc89b2..329552b7f0 100644
--- a/src/PPrsStd/PPrsStd_AISPresentation_1.cdl
+++ b/src/PPrsStd/PPrsStd_AISPresentation_1.cdl
@@ -22,7 +22,7 @@ class AISPresentation_1 from PPrsStd
 uses    HExtendedString from PCollection
 is
 
-    Create returns mutable AISPresentation_1 from PPrsStd;
+    Create returns AISPresentation_1 from PPrsStd;
 	
     IsDisplayed(me) returns Boolean from Standard;
     SetDisplayed(me : mutable; B : Boolean from Standard);
diff --git a/src/PStandard/PStandard_ArrayNode.cdl b/src/PStandard/PStandard_ArrayNode.cdl
index 457cd9bcf4..b5513709f3 100644
--- a/src/PStandard/PStandard_ArrayNode.cdl
+++ b/src/PStandard/PStandard_ArrayNode.cdl
@@ -19,7 +19,7 @@ class ArrayNode from PStandard
 inherits Persistent from Standard
 
 is
-    Create returns mutable ArrayNode from PStandard;
+    Create returns ArrayNode from PStandard;
     ---Purpose: Creates an empty ArrayNode.
 
 end ArrayNode;
diff --git a/src/PTopLoc/PTopLoc_Datum3D.cdl b/src/PTopLoc/PTopLoc_Datum3D.cdl
index 1403cd836f..fc3fb03a14 100644
--- a/src/PTopLoc/PTopLoc_Datum3D.cdl
+++ b/src/PTopLoc/PTopLoc_Datum3D.cdl
@@ -29,7 +29,7 @@ raises
     ConstructionError from Standard
 
 is
-    Create(T : Trsf from gp) returns mutable Datum3D from PTopLoc
+    Create(T : Trsf from gp) returns Datum3D from PTopLoc
 	---Purpose: Creates a   local coordinate  system    with   the
 	--          transformation.  An   error   is raised  if    the
 	--          transformation is not rigid.
diff --git a/src/PTopLoc/PTopLoc_ItemLocation.cdl b/src/PTopLoc/PTopLoc_ItemLocation.cdl
index 7bc70c6324..32f96091ea 100644
--- a/src/PTopLoc/PTopLoc_ItemLocation.cdl
+++ b/src/PTopLoc/PTopLoc_ItemLocation.cdl
@@ -27,7 +27,7 @@ is
     Create(D : Datum3D from PTopLoc; 
     	   P : Integer from Standard;
 	   N : Location from PTopLoc) 
-    returns mutable ItemLocation from  PTopLoc;
+    returns ItemLocation from  PTopLoc;
 	---Level: Internal 
     
     Datum3D(me) returns Datum3D from PTopLoc
diff --git a/src/PTopoDS/PTopoDS_CompSolid.cdl b/src/PTopoDS/PTopoDS_CompSolid.cdl
index 7d1877aebe..3ebb82f8a1 100644
--- a/src/PTopoDS/PTopoDS_CompSolid.cdl
+++ b/src/PTopoDS/PTopoDS_CompSolid.cdl
@@ -17,7 +17,7 @@
 class CompSolid from PTopoDS inherits HShape from PTopoDS
 
 is
-    Create returns mutable CompSolid from PTopoDS;
+    Create returns CompSolid from PTopoDS;
 	---Level: Internal 
 
 end CompSolid;
diff --git a/src/PTopoDS/PTopoDS_Compound.cdl b/src/PTopoDS/PTopoDS_Compound.cdl
index 59b8b373c1..aba8d0105d 100644
--- a/src/PTopoDS/PTopoDS_Compound.cdl
+++ b/src/PTopoDS/PTopoDS_Compound.cdl
@@ -17,7 +17,7 @@
 class Compound from PTopoDS inherits HShape from PTopoDS
 
 is
-    Create returns mutable Compound from PTopoDS;
+    Create returns Compound from PTopoDS;
 	---Level: Internal 
 
 end Compound;
diff --git a/src/PTopoDS/PTopoDS_Edge.cdl b/src/PTopoDS/PTopoDS_Edge.cdl
index c52c3abf72..8c013d83f6 100644
--- a/src/PTopoDS/PTopoDS_Edge.cdl
+++ b/src/PTopoDS/PTopoDS_Edge.cdl
@@ -17,7 +17,7 @@
 class Edge from PTopoDS inherits HShape from PTopoDS
 
 is
-    Create returns mutable Edge from PTopoDS;
+    Create returns Edge from PTopoDS;
 	---Level: Internal 
 
 end Edge;
diff --git a/src/PTopoDS/PTopoDS_Face.cdl b/src/PTopoDS/PTopoDS_Face.cdl
index 3435f0b2a0..e871cf794c 100644
--- a/src/PTopoDS/PTopoDS_Face.cdl
+++ b/src/PTopoDS/PTopoDS_Face.cdl
@@ -17,7 +17,7 @@
 class Face from PTopoDS inherits HShape from PTopoDS
 
 is
-    Create returns mutable Face from PTopoDS;
+    Create returns Face from PTopoDS;
 	---Level: Internal 
 
 end Face;
diff --git a/src/PTopoDS/PTopoDS_HShape.cdl b/src/PTopoDS/PTopoDS_HShape.cdl
index fee7728d69..d989366d1e 100644
--- a/src/PTopoDS/PTopoDS_HShape.cdl
+++ b/src/PTopoDS/PTopoDS_HShape.cdl
@@ -41,7 +41,7 @@ uses
     Location      from PTopLoc
     
 is
-    Create returns mutable HShape from PTopoDS;
+    Create returns HShape from PTopoDS;
     ---Level: Internal 
 
     TShape(me) returns any TShape from PTopoDS
diff --git a/src/PTopoDS/PTopoDS_Shell.cdl b/src/PTopoDS/PTopoDS_Shell.cdl
index 4dc3236523..c1f8979d56 100644
--- a/src/PTopoDS/PTopoDS_Shell.cdl
+++ b/src/PTopoDS/PTopoDS_Shell.cdl
@@ -17,7 +17,7 @@
 class Shell from PTopoDS inherits HShape from PTopoDS
 
 is
-    Create returns mutable Shell from PTopoDS;
+    Create returns Shell from PTopoDS;
     ---Level: Internal 
 
 end Shell;
diff --git a/src/PTopoDS/PTopoDS_Solid.cdl b/src/PTopoDS/PTopoDS_Solid.cdl
index 17f85f65ee..20d2f35b5c 100644
--- a/src/PTopoDS/PTopoDS_Solid.cdl
+++ b/src/PTopoDS/PTopoDS_Solid.cdl
@@ -17,7 +17,7 @@
 class Solid from PTopoDS inherits HShape from PTopoDS
 
 is
-    Create returns mutable Solid from PTopoDS;
+    Create returns Solid from PTopoDS;
     ---Level: Internal 
 
 end Solid;
diff --git a/src/PTopoDS/PTopoDS_TCompSolid.cdl b/src/PTopoDS/PTopoDS_TCompSolid.cdl
index f64a4403fb..86b6fbb634 100644
--- a/src/PTopoDS/PTopoDS_TCompSolid.cdl
+++ b/src/PTopoDS/PTopoDS_TCompSolid.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TCompSolid from PTopoDS;
+    Create returns TCompSolid from PTopoDS;
 	---Purpose: The new  TCompSolid is empty.
     ---Level: Internal 
     	
diff --git a/src/PTopoDS/PTopoDS_TCompSolid1.cdl b/src/PTopoDS/PTopoDS_TCompSolid1.cdl
index edb489ae14..1f037c8cd0 100644
--- a/src/PTopoDS/PTopoDS_TCompSolid1.cdl
+++ b/src/PTopoDS/PTopoDS_TCompSolid1.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TCompSolid1 from PTopoDS;
+    Create returns TCompSolid1 from PTopoDS;
 	---Purpose: The new  TCompSolid11 is empty.
     ---Level: Internal 
     	
diff --git a/src/PTopoDS/PTopoDS_TCompound.cdl b/src/PTopoDS/PTopoDS_TCompound.cdl
index 0d9f623ad9..152f5c254f 100644
--- a/src/PTopoDS/PTopoDS_TCompound.cdl
+++ b/src/PTopoDS/PTopoDS_TCompound.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TCompound from PTopoDS;
+    Create returns TCompound from PTopoDS;
 	---Purpose: the new TCompound is empty.
     ---Level: Internal 
     	
diff --git a/src/PTopoDS/PTopoDS_TCompound1.cdl b/src/PTopoDS/PTopoDS_TCompound1.cdl
index b4c731bb8a..998ab72c8e 100644
--- a/src/PTopoDS/PTopoDS_TCompound1.cdl
+++ b/src/PTopoDS/PTopoDS_TCompound1.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TCompound1 from PTopoDS;
+    Create returns TCompound1 from PTopoDS;
 	---Purpose: the new TCompound1 is empty.
     ---Level: Internal 
     	
diff --git a/src/PTopoDS/PTopoDS_TFace.cdl b/src/PTopoDS/PTopoDS_TFace.cdl
index eee60b58e5..1039509ad0 100644
--- a/src/PTopoDS/PTopoDS_TFace.cdl
+++ b/src/PTopoDS/PTopoDS_TFace.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TFace from PTopoDS;
+    Create returns TFace from PTopoDS;
 	---Purpose: the new TFace covers the whole 2D space.
     ---Level: Internal 
     	
diff --git a/src/PTopoDS/PTopoDS_TFace1.cdl b/src/PTopoDS/PTopoDS_TFace1.cdl
index 0f26e0e40b..61f7eabfbe 100644
--- a/src/PTopoDS/PTopoDS_TFace1.cdl
+++ b/src/PTopoDS/PTopoDS_TFace1.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TFace1 from PTopoDS;
+    Create returns TFace1 from PTopoDS;
 	---Purpose: the new TFace1 covers the whole 2D space.
     ---Level: Internal 
     	
diff --git a/src/PTopoDS/PTopoDS_TShell.cdl b/src/PTopoDS/PTopoDS_TShell.cdl
index abc26a527a..f9dd6ec52b 100644
--- a/src/PTopoDS/PTopoDS_TShell.cdl
+++ b/src/PTopoDS/PTopoDS_TShell.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TShell from PTopoDS;
+    Create returns TShell from PTopoDS;
     	---Level: Internal 
     	
     ShapeType(me) returns ShapeEnum from TopAbs;
diff --git a/src/PTopoDS/PTopoDS_TShell1.cdl b/src/PTopoDS/PTopoDS_TShell1.cdl
index 68736e6168..2f0af72a9d 100644
--- a/src/PTopoDS/PTopoDS_TShell1.cdl
+++ b/src/PTopoDS/PTopoDS_TShell1.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TShell1 from PTopoDS;
+    Create returns TShell1 from PTopoDS;
     	---Level: Internal 
     	
     ShapeType(me) returns ShapeEnum from TopAbs;
diff --git a/src/PTopoDS/PTopoDS_TSolid.cdl b/src/PTopoDS/PTopoDS_TSolid.cdl
index accc4c1bfc..d195a2e73e 100644
--- a/src/PTopoDS/PTopoDS_TSolid.cdl
+++ b/src/PTopoDS/PTopoDS_TSolid.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TSolid from PTopoDS;
+    Create returns TSolid from PTopoDS;
 	---Purpose: The new  TSolid  has no  boundary  and covers  the
 	--          whole 3D space.
     	---Level: Internal 
diff --git a/src/PTopoDS/PTopoDS_TSolid1.cdl b/src/PTopoDS/PTopoDS_TSolid1.cdl
index 8162b79cd4..8924fd9543 100644
--- a/src/PTopoDS/PTopoDS_TSolid1.cdl
+++ b/src/PTopoDS/PTopoDS_TSolid1.cdl
@@ -22,7 +22,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TSolid1 from PTopoDS;
+    Create returns TSolid1 from PTopoDS;
 	---Purpose: The new  TSolid1  has no  boundary  and covers  the
 	--          whole 3D space.
     	---Level: Internal 
diff --git a/src/PTopoDS/PTopoDS_TWire.cdl b/src/PTopoDS/PTopoDS_TWire.cdl
index 3cb60dec62..abf35f57df 100644
--- a/src/PTopoDS/PTopoDS_TWire.cdl
+++ b/src/PTopoDS/PTopoDS_TWire.cdl
@@ -24,7 +24,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TWire;
+    Create returns TWire;
     	---Level: Internal 
 
     ShapeType(me) returns ShapeEnum from TopAbs;
diff --git a/src/PTopoDS/PTopoDS_TWire1.cdl b/src/PTopoDS/PTopoDS_TWire1.cdl
index 3a8f4862da..b158580d73 100644
--- a/src/PTopoDS/PTopoDS_TWire1.cdl
+++ b/src/PTopoDS/PTopoDS_TWire1.cdl
@@ -24,7 +24,7 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TWire1;
+    Create returns TWire1;
     	---Level: Internal 
 
     ShapeType(me) returns ShapeEnum from TopAbs;
diff --git a/src/PTopoDS/PTopoDS_Vertex.cdl b/src/PTopoDS/PTopoDS_Vertex.cdl
index 2213141c83..660fe3b87b 100644
--- a/src/PTopoDS/PTopoDS_Vertex.cdl
+++ b/src/PTopoDS/PTopoDS_Vertex.cdl
@@ -17,7 +17,7 @@
 class Vertex from PTopoDS inherits HShape from PTopoDS
 
 is
-    Create returns mutable Vertex from PTopoDS;
+    Create returns Vertex from PTopoDS;
     	---Level: Internal 
 
 end Vertex;
diff --git a/src/PTopoDS/PTopoDS_Wire.cdl b/src/PTopoDS/PTopoDS_Wire.cdl
index 5935d39996..1ff1555c21 100644
--- a/src/PTopoDS/PTopoDS_Wire.cdl
+++ b/src/PTopoDS/PTopoDS_Wire.cdl
@@ -17,7 +17,7 @@
 class Wire from PTopoDS inherits HShape from PTopoDS
 
 is
-    Create returns mutable Wire from PTopoDS;
+    Create returns Wire from PTopoDS;
     	---Level: Internal 
 
 end Wire;
diff --git a/src/PXCAFDoc/PXCAFDoc_Area.cdl b/src/PXCAFDoc/PXCAFDoc_Area.cdl
index c1019c9eb8..47fdfb476f 100644
--- a/src/PXCAFDoc/PXCAFDoc_Area.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_Area.cdl
@@ -20,10 +20,10 @@ uses
     Real from Standard
 
 is
-    Create returns mutable Area from PXCAFDoc;
+    Create returns Area from PXCAFDoc;
 
     Create (Value     : Real from Standard)
-    returns mutable Area from PXCAFDoc;
+    returns Area from PXCAFDoc;
     
     Get (me) returns Real from Standard;
 
diff --git a/src/PXCAFDoc/PXCAFDoc_Centroid.cdl b/src/PXCAFDoc/PXCAFDoc_Centroid.cdl
index 8ec1243c35..7fddc23c3f 100644
--- a/src/PXCAFDoc/PXCAFDoc_Centroid.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_Centroid.cdl
@@ -21,9 +21,9 @@ uses
     
    Pnt from gp
 is
-    Create returns mutable Centroid from PXCAFDoc;
+    Create returns Centroid from PXCAFDoc;
     
-    Create (pnt: Pnt from gp) returns mutable Centroid from PXCAFDoc;
+    Create (pnt: Pnt from gp) returns Centroid from PXCAFDoc;
     
     Set (me: mutable; pnt: Pnt from gp);
     
diff --git a/src/PXCAFDoc/PXCAFDoc_Color.cdl b/src/PXCAFDoc/PXCAFDoc_Color.cdl
index 6b7a5c1be6..3a6c28fa6f 100644
--- a/src/PXCAFDoc/PXCAFDoc_Color.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_Color.cdl
@@ -21,9 +21,9 @@ uses
     Color from Quantity
 
 is
-    Create returns mutable Color from PXCAFDoc;
+    Create returns Color from PXCAFDoc;
     
-    Create (Loc: Color from Quantity) returns mutable Color from PXCAFDoc;
+    Create (Loc: Color from Quantity) returns Color from PXCAFDoc;
     
     Set (me: mutable; Loc: Color from Quantity);
     
diff --git a/src/PXCAFDoc/PXCAFDoc_Datum.cdl b/src/PXCAFDoc/PXCAFDoc_Datum.cdl
index 9808314e9d..4c0d192b3d 100644
--- a/src/PXCAFDoc/PXCAFDoc_Datum.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_Datum.cdl
@@ -19,12 +19,12 @@ class Datum from PXCAFDoc inherits  Attribute from PDF
 uses
     HAsciiString  from PCollection
 is
-    Create returns mutable Datum from PXCAFDoc;
+    Create returns Datum from PXCAFDoc;
 
     Create (theName : HAsciiString from PCollection;
     	    theDescr: HAsciiString from PCollection;
             theId   : HAsciiString from PCollection)
-    returns mutable Datum from PXCAFDoc;
+    returns Datum from PXCAFDoc;
     
     GetName (me) returns HAsciiString from PCollection;
 
diff --git a/src/PXCAFDoc/PXCAFDoc_DimTol.cdl b/src/PXCAFDoc/PXCAFDoc_DimTol.cdl
index 11f66a9000..85d97b35c3 100644
--- a/src/PXCAFDoc/PXCAFDoc_DimTol.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_DimTol.cdl
@@ -21,13 +21,13 @@ uses
     HAsciiString  from PCollection,
     HArray1OfReal from PColStd
 is
-    Create returns mutable DimTol from PXCAFDoc;
+    Create returns DimTol from PXCAFDoc;
 
     Create (theKind : Integer from Standard;
     	    theVal  : HArray1OfReal from PColStd;
     	    theName : HAsciiString from PCollection;
     	    theDescr: HAsciiString from PCollection)
-    returns mutable DimTol from PXCAFDoc;
+    returns DimTol from PXCAFDoc;
     
     GetKind (me) returns Integer from Standard;
 
diff --git a/src/PXCAFDoc/PXCAFDoc_GraphNode.cdl b/src/PXCAFDoc/PXCAFDoc_GraphNode.cdl
index d5d0225c73..2d3de9dd72 100644
--- a/src/PXCAFDoc/PXCAFDoc_GraphNode.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_GraphNode.cdl
@@ -23,7 +23,7 @@ uses
     GraphNodeSequence from PXCAFDoc
 
 is
-    Create returns mutable GraphNode from PXCAFDoc;
+    Create returns GraphNode from PXCAFDoc;
     
     SetFather (me : mutable;F : GraphNode from PXCAFDoc)
     returns Integer from Standard;
diff --git a/src/PXCAFDoc/PXCAFDoc_Location.cdl b/src/PXCAFDoc/PXCAFDoc_Location.cdl
index 25918ff902..00c2e6af07 100644
--- a/src/PXCAFDoc/PXCAFDoc_Location.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_Location.cdl
@@ -21,9 +21,9 @@ uses
 --    Location from TopLoc,
     Location from PTopLoc
 is
-    Create returns mutable Location from PXCAFDoc;
+    Create returns Location from PXCAFDoc;
     
-    Create (Loc: Location from PTopLoc) returns mutable Location from PXCAFDoc;
+    Create (Loc: Location from PTopLoc) returns Location from PXCAFDoc;
     
     Set (me: mutable; Loc: Location from PTopLoc);
     
diff --git a/src/PXCAFDoc/PXCAFDoc_Material.cdl b/src/PXCAFDoc/PXCAFDoc_Material.cdl
index 2cf95a3cfb..f9c71c6c62 100644
--- a/src/PXCAFDoc/PXCAFDoc_Material.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_Material.cdl
@@ -20,14 +20,14 @@ uses
     Real          from Standard,
     HAsciiString  from PCollection
 is
-    Create returns mutable Material from PXCAFDoc;
+    Create returns Material from PXCAFDoc;
 
     Create (theName       : HAsciiString from PCollection;
     	    theDescr      : HAsciiString from PCollection;
 	    theDensity    : Real         from Standard;
     	    theDensName   : HAsciiString from PCollection;
     	    theDensValType: HAsciiString from PCollection)
-    returns mutable Material from PXCAFDoc;
+    returns Material from PXCAFDoc;
     
     GetName (me) returns HAsciiString from PCollection;
 
diff --git a/src/PXCAFDoc/PXCAFDoc_Volume.cdl b/src/PXCAFDoc/PXCAFDoc_Volume.cdl
index 965d57e2f7..53e9321f13 100644
--- a/src/PXCAFDoc/PXCAFDoc_Volume.cdl
+++ b/src/PXCAFDoc/PXCAFDoc_Volume.cdl
@@ -19,10 +19,10 @@ class Volume from PXCAFDoc inherits Attribute from PDF
 uses 
     Real from Standard
 is
-    Create returns mutable Volume from PXCAFDoc;
+    Create returns Volume from PXCAFDoc;
 
     Create (Value     : Real from Standard)
-    returns mutable Volume from PXCAFDoc;
+    returns Volume from PXCAFDoc;
     
     Get (me) returns Real from Standard;
 
diff --git a/src/Poly/Poly_Polygon2D.cdl b/src/Poly/Poly_Polygon2D.cdl
index 7dcc693d2a..078c69036c 100644
--- a/src/Poly/Poly_Polygon2D.cdl
+++ b/src/Poly/Poly_Polygon2D.cdl
@@ -31,7 +31,7 @@ raises NullObject from Standard
 is
 
     Create(Nodes: Array1OfPnt2d from TColgp) 
-    returns mutable Polygon2D from Poly;
+    returns Polygon2D from Poly;
     	---Purpose: Constructs a 2D polygon defined by the table of points, <Nodes>.
     
     Deflection(me) returns Real;
diff --git a/src/Poly/Poly_Polygon3D.cdl b/src/Poly/Poly_Polygon3D.cdl
index ac6509ae90..a941f58f1d 100644
--- a/src/Poly/Poly_Polygon3D.cdl
+++ b/src/Poly/Poly_Polygon3D.cdl
@@ -33,12 +33,12 @@ raises NullObject from Standard
 is
 
     Create(Nodes: Array1OfPnt from TColgp) 
-    returns mutable Polygon3D from Poly;
+    returns Polygon3D from Poly;
     	---Purpose: onstructs a 3D polygon defined by the table of points, Nodes.
     
     Create(Nodes:      Array1OfPnt  from TColgp;
            Parameters: Array1OfReal from TColStd) 
-    returns mutable Polygon3D from Poly;
+    returns Polygon3D from Poly;
     	---Purpose: Constructs a 3D polygon defined by
     	-- the table of points, Nodes, and the parallel table of
     	--  parameters, Parameters, where each value of the table
diff --git a/src/Poly/Poly_PolygonOnTriangulation.cdl b/src/Poly/Poly_PolygonOnTriangulation.cdl
index d84716a86f..0d3f06d519 100644
--- a/src/Poly/Poly_PolygonOnTriangulation.cdl
+++ b/src/Poly/Poly_PolygonOnTriangulation.cdl
@@ -40,13 +40,13 @@ raises NullObject from Standard
 is
 
     Create(Nodes: Array1OfInteger from TColStd)
-    returns mutable PolygonOnTriangulation from Poly;
+    returns PolygonOnTriangulation from Poly;
     	---Purpose: Constructs a 3D polygon on the triangulation of a shape,
     	-- defined by the table of nodes, <Nodes>.
     
     Create(Nodes     : Array1OfInteger from TColStd;
            Parameters: Array1OfReal    from TColStd) 
-    returns mutable PolygonOnTriangulation from Poly;
+    returns PolygonOnTriangulation from Poly;
     	---Purpose:
     	-- Constructs a 3D polygon on the triangulation of a shape, defined by:
     	--  -   the table of nodes, Nodes, and the table of parameters, <Parameters>.  
diff --git a/src/Poly/Poly_Triangulation.cdl b/src/Poly/Poly_Triangulation.cdl
index 80c2baf046..b39b560f23 100644
--- a/src/Poly/Poly_Triangulation.cdl
+++ b/src/Poly/Poly_Triangulation.cdl
@@ -56,7 +56,7 @@ raises
 is
 
     Create(nbNodes, nbTriangles: Integer; UVNodes: Boolean)
-    returns mutable Triangulation from Poly;
+    returns Triangulation from Poly;
         ---Purpose: Constructs a triangulation from a set of triangles. The
         -- triangulation is initialized without a triangle or a node, but capable of
         --   containing nbNodes nodes, and nbTriangles
@@ -66,7 +66,7 @@ is
 
     Create(Nodes:      Array1OfPnt      from TColgp;
            Triangles:  Array1OfTriangle from Poly)
-    returns mutable Triangulation from Poly;
+    returns Triangulation from Poly;
         ---Purpose: Constructs a triangulation from a set of triangles. The
         -- triangulation is initialized with 3D points from Nodes and triangles
         --  from Triangles.
@@ -74,7 +74,7 @@ is
     Create(Nodes:      Array1OfPnt      from TColgp;
            UVNodes:    Array1OfPnt2d    from TColgp;
            Triangles:  Array1OfTriangle from Poly)
-    returns mutable Triangulation from Poly;
+    returns Triangulation from Poly;
         ---Purpose:  Constructs a triangulation from a set of triangles. The
         -- triangulation is initialized with 3D points from Nodes, 2D points from
         --   UVNodes and triangles from Triangles, where
diff --git a/src/Prs3d/Prs3d_ArrowAspect.cdl b/src/Prs3d/Prs3d_ArrowAspect.cdl
index 64783b86d7..d6faf9ee73 100644
--- a/src/Prs3d/Prs3d_ArrowAspect.cdl
+++ b/src/Prs3d/Prs3d_ArrowAspect.cdl
@@ -31,13 +31,13 @@ raises
     InvalidAngle from Prs3d
     
 is
-    Create returns mutable ArrowAspect from Prs3d;
+    Create returns ArrowAspect from Prs3d;
     	---Purpose: Constructs an empty framework for displaying arrows
     	-- in representations of lengths. The lengths displayed
     	-- are either on their own or in chamfers, fillets,
     	-- diameters and radii.    
     Create (anAngle: PlaneAngle from Quantity; aLength: Length from Quantity)
-    returns mutable ArrowAspect from Prs3d;
+    returns ArrowAspect from Prs3d;
     	--- Purpose: Constructs a framework to display an arrow with a
     	-- shaft of the length aLength and having a head with
     	-- sides at the angle anAngle from each other.   
diff --git a/src/Prs3d/Prs3d_DatumAspect.cdl b/src/Prs3d/Prs3d_DatumAspect.cdl
index df7a4170de..e72da13961 100644
--- a/src/Prs3d/Prs3d_DatumAspect.cdl
+++ b/src/Prs3d/Prs3d_DatumAspect.cdl
@@ -22,14 +22,14 @@ uses
     Length from Quantity    
 is
 
-    Create returns mutable DatumAspect from Prs3d;
+    Create returns DatumAspect from Prs3d;
     	---Purpose: An empty framework to define the display of datums.
       
-    FirstAxisAspect(me) returns mutable LineAspect from Prs3d;
+    FirstAxisAspect(me) returns LineAspect from Prs3d;
     	---Purpose: Returns the attributes for display of the first axis.    
-    SecondAxisAspect(me) returns mutable LineAspect from Prs3d;
+    SecondAxisAspect(me) returns LineAspect from Prs3d;
     	---Purpose: Returns the attributes for display of the second axis.    
-    ThirdAxisAspect(me) returns mutable LineAspect from Prs3d;
+    ThirdAxisAspect(me) returns LineAspect from Prs3d;
     	---Purpose: Returns the attributes for display of the third axis.    
     SetDrawFirstAndSecondAxis(me:mutable ; draw: Boolean from Standard);
     	---Purpose: Sets the DrawFirstAndSecondAxis attributes to active.    
diff --git a/src/Prs3d/Prs3d_DimensionAspect.cdl b/src/Prs3d/Prs3d_DimensionAspect.cdl
index 1046b71847..06b0000a41 100644
--- a/src/Prs3d/Prs3d_DimensionAspect.cdl
+++ b/src/Prs3d/Prs3d_DimensionAspect.cdl
@@ -32,16 +32,16 @@ uses
     AsciiString from TCollection
 is
 
-    Create returns mutable DimensionAspect from Prs3d;
+    Create returns DimensionAspect from Prs3d;
       --- Purpose: Constructs an empty framework to define the display of dimensions.  
 
-    LineAspect(me) returns mutable LineAspect from Prs3d;
+    LineAspect(me) returns LineAspect from Prs3d;
       ---Purpose: Returns the settings for the display of lines used in presentation of dimensions.    
 
     SetLineAspect(me: mutable; theAspect: LineAspect from Prs3d);
       ---Purpose: Sets the display attributes of lines used in presentation of dimensions.
 
-    TextAspect(me) returns mutable TextAspect from Prs3d is static;
+    TextAspect(me) returns TextAspect from Prs3d is static;
       --- Purpose: Returns the settings for the display of text used in presentation of dimensions.   
 
     SetTextAspect(me:mutable; theAspect: TextAspect from Prs3d) is static; 
@@ -91,7 +91,7 @@ is
     TextHorizontalPosition (me) returns DimensionTextHorizontalPosition from Prs3d;
       --- Purpose: Gets horizontal text alignment for text label.
 
-    ArrowAspect(me) returns mutable ArrowAspect from Prs3d is static;
+    ArrowAspect(me) returns ArrowAspect from Prs3d is static;
      --- Purpose: Returns the settings for displaying arrows.   
 
     SetArrowAspect(me: mutable; theAspect: ArrowAspect from Prs3d) is static;
diff --git a/src/Prs3d/Prs3d_Drawer.cdl b/src/Prs3d/Prs3d_Drawer.cdl
index 4f9ed7241d..26d5ab17a9 100644
--- a/src/Prs3d/Prs3d_Drawer.cdl
+++ b/src/Prs3d/Prs3d_Drawer.cdl
@@ -46,7 +46,7 @@ uses
     Ax2 from gp
 
 is
-    Create returns mutable Drawer from Prs3d;
+    Create returns Drawer from Prs3d;
 
 ---Category: deviation definition.
 -- 
@@ -170,7 +170,7 @@ is
 -- 
 -- Attributes for the U Isoparametric lines of patches.
 --    
-    UIsoAspect (me:mutable) returns mutable IsoAspect from Prs3d
+    UIsoAspect (me:mutable) returns IsoAspect from Prs3d
     	---Purpose: Defines the attributes which are used when drawing an 
     	--          U isoparametric curve of a face. Defines the number
     	--          of U isoparametric curves to be drawn for a single face.
@@ -195,7 +195,7 @@ is
 -- Attributes for the V Isoparametric line of patches.
 
 
-    VIsoAspect (me:mutable) returns mutable IsoAspect from Prs3d
+    VIsoAspect (me:mutable) returns IsoAspect from Prs3d
     	---Purpose: Defines the attributes which are used when drawing an 
     	--          V isoparametric curve of a face. Defines the number
     	--          of V isoparametric curves to be drawn for a single face.
@@ -216,7 +216,7 @@ is
     is virtual;
     	---Purpose: Sets the appearance of V isoparameters - anAspect.
 
-    FreeBoundaryAspect (me:mutable) returns mutable LineAspect from Prs3d
+    FreeBoundaryAspect (me:mutable) returns LineAspect from Prs3d
     	---Purpose:  Stores the values for presentation of free boundaries,
     	-- in other words, boundaries which are not shared.
 	--          The LineAspect for the  free boundaries can be edited.
@@ -245,7 +245,7 @@ is
 
 -- Attributes for the wires
 
-    WireAspect (me:mutable) returns mutable LineAspect from Prs3d
+    WireAspect (me:mutable) returns LineAspect from Prs3d
     	---Purpose: Returns wire aspect settings.
     	--          The LineAspect for the wire can be edited.
     	--          The default values are:
@@ -273,7 +273,7 @@ is
 
 -- Attributes for the unfree boundaries
 
-    UnFreeBoundaryAspect (me:mutable) returns mutable LineAspect from Prs3d
+    UnFreeBoundaryAspect (me:mutable) returns LineAspect from Prs3d
     	---Purpose: Returns settings for shared boundary line aspects.
     	--          The LineAspect for the unfree boundaries can be edited.
     	--          The default values are:
@@ -303,7 +303,7 @@ is
 --  Attributes for the lines.
 -- 
 
-    LineAspect(me:mutable) returns mutable LineAspect from Prs3d
+    LineAspect(me:mutable) returns LineAspect from Prs3d
     	---Purpose:   Returns settings for line aspects.
     	-- These settings can be edited. The default values are:       
     	--          Color: Quantity_NOC_YELLOW
@@ -320,7 +320,7 @@ is
     is virtual;
     	--- Purpose: Sets the parameter anAspect for display attributes of lines.
 
-    TextAspect(me:mutable) returns mutable TextAspect from Prs3d
+    TextAspect(me:mutable) returns TextAspect from Prs3d
     	--- Purpose: Returns settings for text aspect.
     	-- These settings can be edited. The default value is:
     	-- -   Color: Quantity_NOC_YELLOW
@@ -342,7 +342,7 @@ is
     	-- parameter OnOff to true or false.
     is virtual;
     
-    ArrowAspect(me:mutable) returns mutable ArrowAspect from Prs3d 
+    ArrowAspect(me:mutable) returns ArrowAspect from Prs3d 
     is virtual;
     	---Purpose: Returns the attributes for display of arrows.    
     
@@ -350,7 +350,7 @@ is
     is virtual ;
     	---Purpose: Sets the parameter anAspect for display attributes of arrows.
         
-    PointAspect(me:mutable) returns mutable PointAspect from Prs3d
+    PointAspect(me:mutable) returns PointAspect from Prs3d
     	---Purpose: Returns the point aspect setting. The default values are
     	--        Color: Quantity_NOC_YELLOW
     	--          Type of marker: Aspect_TOM_PLUS
@@ -362,7 +362,7 @@ is
     is virtual;
     	--- Purpose: Sets the parameter anAspect for display attributes of points
         
-    ShadingAspect (me:mutable) returns mutable ShadingAspect from Prs3d
+    ShadingAspect (me:mutable) returns ShadingAspect from Prs3d
    is virtual;
     	---Purpose: Returns settings for shading aspects.
     	-- These settings can be edited. The default values are:
@@ -406,7 +406,7 @@ is
     	---Purpose:  Disables the DrawHiddenLine function.
     is virtual;
 
-    HiddenLineAspect(me:mutable) returns mutable LineAspect from Prs3d
+    HiddenLineAspect(me:mutable) returns LineAspect from Prs3d
     	---Purpose: Returns settings for hidden line aspects.
     	-- These settings can be edited. The default values are:
     	--          Color: Quantity_NOC_YELLOW
@@ -419,7 +419,7 @@ is
     	---Purpose: Sets the parameter anAspect for the display of
     	-- hidden lines in hidden line removal mode.   
     
-    SeenLineAspect(me:mutable) returns mutable LineAspect from Prs3d
+    SeenLineAspect(me:mutable) returns LineAspect from Prs3d
 	---Purpose: Returns settings for seen line aspects.
     	-- These settings can be edited. The default values are:
 	--          Color: Quantity_NOC_YELLOW
@@ -432,7 +432,7 @@ is
     	--- Purpose: Sets the parameter anAspect for the display of seen
     	-- lines in hidden line removal mode.
 
-    PlaneAspect(me:mutable) returns mutable PlaneAspect from Prs3d
+    PlaneAspect(me:mutable) returns PlaneAspect from Prs3d
     is virtual;
     	---Purpose: Returns settings for the appearance of planes.
     
@@ -440,7 +440,7 @@ is
     is virtual;
     	---Purpose: Sets the parameter anAspect for the display of planes.
 
-    VectorAspect(me:mutable) returns mutable LineAspect from Prs3d
+    VectorAspect(me:mutable) returns LineAspect from Prs3d
     	---Purpose: Returns settings for the appearance of vectors.
     	-- These settings can be edited. The default values are:
     	--          Color: Quantity_NOC_SKYBLUE
@@ -456,7 +456,7 @@ is
 --  Attributes for the presentation of a Datum.
 --  
 
-    DatumAspect(me:mutable) returns mutable DatumAspect from Prs3d
+    DatumAspect(me:mutable) returns DatumAspect from Prs3d
     	---Purpose: Returns settings for the appearance of datums.
     	-- These settings can be edited. The default values for
     	-- the three axes are:
@@ -469,7 +469,7 @@ is
     is virtual;
     	---Purpose: Sets the modality anAspect for the display of datums.
 
-    DimensionAspect(me:mutable) returns mutable DimensionAspect from Prs3d is virtual;
+    DimensionAspect(me:mutable) returns DimensionAspect from Prs3d is virtual;
     ---Purpose: Returns settings for the appearance of dimensions.
 
     SetDimensionAspect(me:mutable; theAspect: DimensionAspect from Prs3d) is virtual;
@@ -503,7 +503,7 @@ is
     ---Purpose: Returns angle units in which dimension presentation is displayed.
     ---C++: return const &
 
-    SectionAspect (me : mutable) returns mutable LineAspect from Prs3d is virtual;
+    SectionAspect (me : mutable) returns LineAspect from Prs3d is virtual;
     ---Purpose: The LineAspect for the wire can be edited.
     --          The default values are:
     --          Color: Quantity_NOC_ORANGE
@@ -531,7 +531,7 @@ is
         ---Purpose: Sets line aspect for face boundaries.
         -- theAspect is the line aspect that determines the look of the face boundaries.
 
-    FaceBoundaryAspect (me : mutable) returns mutable LineAspect from Prs3d
+    FaceBoundaryAspect (me : mutable) returns LineAspect from Prs3d
     is virtual;
         ---Purpose: Returns line aspect of face boundaries.
 
diff --git a/src/Prs3d/Prs3d_IsoAspect.cdl b/src/Prs3d/Prs3d_IsoAspect.cdl
index 284470436d..3833c36a6c 100644
--- a/src/Prs3d/Prs3d_IsoAspect.cdl
+++ b/src/Prs3d/Prs3d_IsoAspect.cdl
@@ -34,7 +34,7 @@ is
 	    aType: TypeOfLine from Aspect;
     	    aWidth: Real from Standard;
           aNumber: Integer from Standard)    
-	    returns mutable IsoAspect from Prs3d;
+	    returns IsoAspect from Prs3d;
     	---Purpose: Constructs a framework to define display attributes of isoparameters.
     	-- These include:
     	-- -   the color attribute aColor
@@ -46,7 +46,7 @@ is
 	    aType: TypeOfLine from Aspect;
     	    aWidth: Real from Standard;
           aNumber: Integer from Standard)	    
-	    returns mutable IsoAspect from Prs3d;
+	    returns IsoAspect from Prs3d;
 	    
 
     SetNumber (me: mutable; aNumber: Integer from Standard) 
diff --git a/src/Prs3d/Prs3d_LineAspect.cdl b/src/Prs3d/Prs3d_LineAspect.cdl
index 36c304e0ab..f32e9bde85 100644
--- a/src/Prs3d/Prs3d_LineAspect.cdl
+++ b/src/Prs3d/Prs3d_LineAspect.cdl
@@ -42,7 +42,7 @@ is
     Create (aColor: NameOfColor from Quantity;
 	    aType: TypeOfLine from Aspect;
     	    aWidth: Real from Standard)
-	    returns mutable LineAspect from Prs3d;
+	    returns LineAspect from Prs3d;
     	---Purpose: Constructs a framework for line aspect defined by
     	-- -   the color aColor
     	-- -   the type of line aType and
@@ -52,7 +52,7 @@ is
     Create (aColor: Color from Quantity;
 	    aType: TypeOfLine from Aspect;
     	    aWidth: Real from Standard)
-	    returns mutable LineAspect from Prs3d;
+	    returns LineAspect from Prs3d;
 	    
     SetColor (me: mutable; aColor: Color from Quantity) is static;
 
diff --git a/src/Prs3d/Prs3d_PlaneAspect.cdl b/src/Prs3d/Prs3d_PlaneAspect.cdl
index 69cf965d53..c54cfce6cd 100644
--- a/src/Prs3d/Prs3d_PlaneAspect.cdl
+++ b/src/Prs3d/Prs3d_PlaneAspect.cdl
@@ -24,16 +24,16 @@ uses
     
 is
 
-    Create returns mutable PlaneAspect from Prs3d;
+    Create returns PlaneAspect from Prs3d;
     	---Purpose: Constructs an empty framework for the display of planes.    
-    EdgesAspect(me) returns mutable LineAspect from Prs3d;
+    EdgesAspect(me) returns LineAspect from Prs3d;
     
     	---Purpose: Returns the attributes of displayed edges involved in the presentation of planes.    
     
-    IsoAspect(me) returns mutable LineAspect from Prs3d;
+    IsoAspect(me) returns LineAspect from Prs3d;
     	---Purpose: Returns the attributes of displayed isoparameters involved in the presentation of planes.
         
-    ArrowAspect(me) returns mutable LineAspect from Prs3d;
+    ArrowAspect(me) returns LineAspect from Prs3d;
     	---Purpose: Returns the settings for displaying an arrow.    
     SetArrowsLength(me:mutable; L : Length from Quantity);
     
diff --git a/src/Prs3d/Prs3d_PlaneSet.cdl b/src/Prs3d/Prs3d_PlaneSet.cdl
index 41394fe4ca..4cfb910b07 100644
--- a/src/Prs3d/Prs3d_PlaneSet.cdl
+++ b/src/Prs3d/Prs3d_PlaneSet.cdl
@@ -25,7 +25,7 @@ is
     Create( Xdir,Ydir,Zdir: Real from Standard;
             Xloc,Yloc,Zloc: Length from Quantity;
     	    anOffset: Length from Quantity)
-    returns mutable PlaneSet from Prs3d;
+    returns PlaneSet from Prs3d;
 
     SetDirection(me: mutable; X,Y,Z: Real from Standard);
     SetLocation(me: mutable; X,Y,Z: Length from Quantity);
diff --git a/src/Prs3d/Prs3d_PointAspect.cdl b/src/Prs3d/Prs3d_PointAspect.cdl
index 4a8217b060..9b1786aaa8 100644
--- a/src/Prs3d/Prs3d_PointAspect.cdl
+++ b/src/Prs3d/Prs3d_PointAspect.cdl
@@ -40,18 +40,18 @@ is
    Create ( aType: TypeOfMarker from Aspect;
            aColor: Color from Quantity;
 	     aScale: Real from Standard)
-	     returns mutable PointAspect from Prs3d;
+	     returns PointAspect from Prs3d;
 
     Create ( aType: TypeOfMarker from Aspect;  
            aColor: NameOfColor from Quantity;
 	     aScale: Real from Standard)
-	     returns mutable PointAspect from Prs3d;
+	     returns PointAspect from Prs3d;
 
     Create ( AColor	    : Color from Quantity;
 	     AWidth         : Integer from Standard;
 	     AHeight        : Integer from Standard;
 	     ATexture       : HArray1OfByte from TColStd)
-             returns mutable PointAspect from Prs3d;
+             returns PointAspect from Prs3d;
     	---Purpose: defines only the urer defined marker point.
 
 	     
diff --git a/src/Prs3d/Prs3d_Presentation.cdl b/src/Prs3d/Prs3d_Presentation.cdl
index 99e91e48cc..4e96d4877e 100644
--- a/src/Prs3d/Prs3d_Presentation.cdl
+++ b/src/Prs3d/Prs3d_Presentation.cdl
@@ -45,12 +45,12 @@ is
           theToInit        : Boolean          from Standard = Standard_True)
   ---Purpose: Constructs a presentation object
   -- if <Init> is false, no color initialization is done.
-  returns mutable Presentation from Prs3d;
+  returns Presentation from Prs3d;
 
   Create (theStructManager : StructureManager from Graphic3d;
           thePrs           : Presentation     from Prs3d)
   ---Purpose: Constructs a presentation object.
-  returns mutable Presentation from Prs3d;
+  returns Presentation from Prs3d;
 
     Compute(me : mutable; aProjector: DataStructureManager from Graphic3d)
     returns Structure from Graphic3d
@@ -112,7 +112,7 @@ is
     SetPickable(me: mutable) is static;
     SetUnPickable(me: mutable) is static;
 
-    CurrentGroup(me) returns mutable Group from Graphic3d is static private;
+    CurrentGroup(me) returns Group from Graphic3d is static private;
 
 friends
 
diff --git a/src/Prs3d/Prs3d_Projector.cdl b/src/Prs3d/Prs3d_Projector.cdl
index f99d2cffc6..0cb13cb791 100644
--- a/src/Prs3d/Prs3d_Projector.cdl
+++ b/src/Prs3d/Prs3d_Projector.cdl
@@ -27,7 +27,7 @@ uses
 is
 
     Create(Pr: Projector from HLRAlgo)
-    returns mutable Projector from Prs3d;
+    returns Projector from Prs3d;
 
 
     Create ( Pers: Boolean from Standard;
@@ -35,7 +35,7 @@ is
 	     DX, DY, DZ: Length from Quantity;       -- Projection Vector
 	     XAt, YAt , ZAt: Length from Quantity;   -- View Point
 	     XUp, YUp, ZUp: Length from Quantity)    -- High Point Direction
-    returns mutable Projector from Prs3d;
+    returns Projector from Prs3d;
     	--- Purpose: Constructs a projector framework from the following parameters
     	-- -   Pers is true if the view is a perspective view and
     	--   false if it is an axonometric one;
diff --git a/src/Prs3d/Prs3d_ShadingAspect.cdl b/src/Prs3d/Prs3d_ShadingAspect.cdl
index 24f740cfb6..da96e4928a 100644
--- a/src/Prs3d/Prs3d_ShadingAspect.cdl
+++ b/src/Prs3d/Prs3d_ShadingAspect.cdl
@@ -41,7 +41,7 @@ uses
 is
     Create
     	---Purpose: Constructs an empty framework to display shading.
-    returns mutable ShadingAspect from Prs3d;
+    returns ShadingAspect from Prs3d;
     
     SetColor (me: mutable; aColor: Color from Quantity;
 				   aModel: TypeOfFacingModel from Aspect = Aspect_TOFM_BOTH_SIDE)
diff --git a/src/Prs3d/Prs3d_TextAspect.cdl b/src/Prs3d/Prs3d_TextAspect.cdl
index 9a61799a67..2420d8093e 100644
--- a/src/Prs3d/Prs3d_TextAspect.cdl
+++ b/src/Prs3d/Prs3d_TextAspect.cdl
@@ -33,7 +33,7 @@ uses
     Length from Quantity
     
 is
-    Create returns mutable TextAspect from Prs3d;  
+    Create returns TextAspect from Prs3d;  
         --- Purpose: Constructs an empty framework for defining display attributes of text.   
 
     SetColor(me: mutable; aColor:  Color  from  Quantity);
diff --git a/src/PrsMgr/PrsMgr_PresentableObject.cdl b/src/PrsMgr/PrsMgr_PresentableObject.cdl
index e6c4019098..f4457f55b5 100644
--- a/src/PrsMgr/PrsMgr_PresentableObject.cdl
+++ b/src/PrsMgr/PrsMgr_PresentableObject.cdl
@@ -79,7 +79,7 @@ is
     
     Compute(me:mutable;
                 aPresentationManager: PresentationManager3d from PrsMgr;
-                aPresentation: mutable Presentation from Prs3d;
+                aPresentation: Presentation from Prs3d;
                 aMode: Integer from Standard = 0)
     	---Purpose: Calculates the 3D view aPresentation and its
     	-- updates. The latter are managed by aPresentationManager.
@@ -90,7 +90,7 @@ is
     
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
-            aPresentation  : mutable Presentation from Prs3d)
+            aPresentation  : Presentation from Prs3d)
     	---Purpose: Calculates the 3D view aPresentation and its
     	-- updates. The latter are managed by
     	-- aPresentationManager. Each of the views in the
@@ -107,7 +107,7 @@ is
     Compute(me            : mutable;
             aProjector    : Projector from Prs3d;
             aTrsf         : Transformation from Geom;
-            aPresentation : mutable Presentation from Prs3d)
+            aPresentation : Presentation from Prs3d)
     is virtual protected;
     	---Purpose: Calculates the 3D view aPresentation and its
     	-- updates. The latter are managed by
@@ -136,7 +136,7 @@ is
     
     Fill(me: mutable; 
                 aPresentationManager: PresentationManager from PrsMgr;
-                aPresentation: mutable Presentation from PrsMgr;
+                aPresentation: Presentation from PrsMgr;
                 aMode: Integer from Standard = 0)
     -- 22-03-04 OCC4895 SAN High-level interface for controlling polygon offsets
     is virtual protected;
@@ -230,7 +230,7 @@ is
 
    UpdateLocation(me:mutable) is virtual;
     
-   UpdateLocation(me:mutable;P : mutable Presentation from Prs3d) is virtual;
+   UpdateLocation(me:mutable;P : Presentation from Prs3d) is virtual;
     
    SetZLayer ( me         : mutable;
                thePrsMgr  : PresentationManager from PrsMgr;
diff --git a/src/PrsMgr/PrsMgr_Presentation.cdl b/src/PrsMgr/PrsMgr_Presentation.cdl
index 4e6f7bc9b8..96f2767198 100644
--- a/src/PrsMgr/PrsMgr_Presentation.cdl
+++ b/src/PrsMgr/PrsMgr_Presentation.cdl
@@ -36,7 +36,7 @@ is
 
   Create (thePresentationManager : PresentationManager from PrsMgr;
           thePresentableObject   : PresentableObject   from PrsMgr)
-  returns mutable Presentation from PrsMgr
+  returns Presentation from PrsMgr
   is private;
 
   Destroy (me : mutable) is virtual;
@@ -126,7 +126,7 @@ is
                     theShadingAspect : ShadingAspect from Prs3d)
   is static private;
 
-  Presentation (me) returns mutable Presentation from Prs3d
+  Presentation (me) returns Presentation from Prs3d
   is static;
   ---C++: inline
   ---C++: return const&
@@ -161,7 +161,7 @@ is
 
 ---Category: Inquire Methods
 
-  PresentationManager (me) returns mutable PresentationManager
+  PresentationManager (me) returns PresentationManager
   ---Purpose: returns the PresentationManager in which the presentation has been created.
   is static;
   ---C++: inline
diff --git a/src/PrsMgr/PrsMgr_PresentationManager.cdl b/src/PrsMgr/PrsMgr_PresentationManager.cdl
index f1b29d8059..8bda94e299 100644
--- a/src/PrsMgr/PrsMgr_PresentationManager.cdl
+++ b/src/PrsMgr/PrsMgr_PresentationManager.cdl
@@ -42,12 +42,12 @@ raises
 is
 
   Create (theStructureManager : StructureManager from Graphic3d)
-  returns mutable PresentationManager from PrsMgr;
+  returns PresentationManager from PrsMgr;
   ---Purpose:
   -- Creates a framework to manage displays and graphic entities with the 3D view theStructureManager.
 
   Display (me           : mutable;
-           thePrsObject : mutable PresentableObject from PrsMgr;
+           thePrsObject : PresentableObject from PrsMgr;
            theMode      : Integer from Standard = 0)
   ---Purpose: Displays the presentation of the object in the given Presentation manager with the given mode.
   --          The mode should be enumerated by the object which inherits PresentableObject.
@@ -75,7 +75,7 @@ is
   ---Purpose: Sets the visibility of presentable object.
 
   Highlight (me           : mutable;
-             thePrsObject : mutable PresentableObject from PrsMgr;
+             thePrsObject : PresentableObject from PrsMgr;
              theMode      : Integer from Standard = 0)
   ---Purpose: Highlights the presentation of the presentable object
   -- thePrsObject in this framework with the display mode theMode.
@@ -165,7 +165,7 @@ is
 ---Category: Hilighting methods.
 
   Color (me           : mutable;
-         thePrsObject : mutable PresentableObject from PrsMgr;
+         thePrsObject : PresentableObject from PrsMgr;
          theColor     : NameOfColor from Quantity = Quantity_NOC_YELLOW;
          theMode      : Integer from Standard = 0)
   ---Purpose: Highlights the graphic object thePrsObject in the color theColor.
@@ -174,7 +174,7 @@ is
   is static;
 
   BoundBox (me           : mutable;
-            thePrsObject : mutable PresentableObject from PrsMgr;
+            thePrsObject : PresentableObject from PrsMgr;
             theMode      : Integer from Standard = 0)
   ---Purpose: highlights the boundbox of the presentation
   is static;
@@ -183,7 +183,7 @@ is
 
   Connect (me             : mutable;
            thePrsObject   : PresentableObject from PrsMgr;
-           theOtherObject : mutable PresentableObject from PrsMgr;
+           theOtherObject : PresentableObject from PrsMgr;
            theMode        : Integer from Standard = 0;
            theOtherMode   : Integer from Standard = 0)
   is static;
@@ -229,7 +229,7 @@ is
   -- thePrsObject has the display mode aMode; this has the default value of 0, that is, the wireframe display mode.
   is static;
 
-  StructureManager (me) returns mutable StructureManager from Graphic3d
+  StructureManager (me) returns StructureManager from Graphic3d
   is static;
   ---C++: inline
   ---C++: return const&
@@ -263,7 +263,7 @@ is
   Presentation (me;
                 thePrsObject : PresentableObject from PrsMgr;
                 theMode      : Integer from Standard = 0)
-  returns mutable Presentation from PrsMgr
+  returns Presentation from PrsMgr
   raises NoSuchObject from Standard
   is static;
   ---Purpose: Returns the presentation Presentation of the presentable object thePrsObject in this framework. thePrsObject has the display mode theMode.
diff --git a/src/PrsMgr/PrsMgr_Prs.cdl b/src/PrsMgr/PrsMgr_Prs.cdl
index cbf729265d..f34587434d 100644
--- a/src/PrsMgr/PrsMgr_Prs.cdl
+++ b/src/PrsMgr/PrsMgr_Prs.cdl
@@ -31,7 +31,7 @@ is
     Create (theStructManager        : StructureManager from Graphic3d;
             thePresentation         : PresentationPointer from PrsMgr;
             theTypeOfPresentation3d : TypeOfPresentation3d from PrsMgr)
-    returns mutable Prs from PrsMgr;
+    returns Prs from PrsMgr;
 
     Compute (me: mutable)
     is redefined static;
diff --git a/src/QABugs/QABugs_MyText.cdl b/src/QABugs/QABugs_MyText.cdl
index 2e12519c7b..9176177f63 100644
--- a/src/QABugs/QABugs_MyText.cdl
+++ b/src/QABugs/QABugs_MyText.cdl
@@ -23,9 +23,9 @@ uses
     Selection from SelectMgr
 is 
     Create(aText  :ExtendedString  from  TCollection;aPosition  : Pnt  from  gp)
-    returns mutable MyText from QABugs;
+    returns MyText from QABugs;
     Create(aText  :ExtendedString  from  TCollection;aPosition  : Pnt  from  gp;aFont :  CString from Standard; aColor : NameOfColor  from  Quantity; aHeight :Real  from  Standard)
-    returns mutable MyText from QABugs;
+    returns MyText from QABugs;
 
     NbPossibleSelection(me)
     returns Integer from Standard
@@ -33,11 +33,11 @@ is
     
     Compute(me:mutable;
             aPresentationManager: PresentationManager3d from PrsMgr;
-            aPresentation: mutable Presentation from Prs3d;
+            aPresentation: Presentation from Prs3d;
             aMode: Integer from Standard = 0)
     is redefined virtual protected;
 
-    ComputeSelection(me:mutable; aSelection :mutable Selection from SelectMgr;
+    ComputeSelection(me:mutable; aSelection : Selection from SelectMgr;
                                  aMode      : Integer) is redefined virtual protected;
 
 fields
diff --git a/src/QABugs/QABugs_PresentableObject.cdl b/src/QABugs/QABugs_PresentableObject.cdl
index e0e08ba40a..3becc1c545 100644
--- a/src/QABugs/QABugs_PresentableObject.cdl
+++ b/src/QABugs/QABugs_PresentableObject.cdl
@@ -21,14 +21,14 @@ uses
     TypeOfPresentation3d from PrsMgr
 is
     
-    Create(aTypeOfPresentation3d: TypeOfPresentation3d from PrsMgr = PrsMgr_TOP_AllView) returns mutable PresentableObject from QABugs;
+    Create(aTypeOfPresentation3d: TypeOfPresentation3d from PrsMgr = PrsMgr_TOP_AllView) returns PresentableObject from QABugs;
     
-    ComputeSelection(me:mutable; aSelection :mutable Selection from SelectMgr;
+    ComputeSelection(me:mutable; aSelection : Selection from SelectMgr;
                                  aMode      : Integer) is redefined virtual protected;
 
     Compute(me:mutable;
     	    aPresentationManager: PresentationManager3d from PrsMgr;
-            aPresentation: mutable Presentation from Prs3d;
+            aPresentation: Presentation from Prs3d;
             aMode: Integer from Standard = 0)
     is redefined virtual protected;
 	    
diff --git a/src/QANewModTopOpe/QANewModTopOpe_ReShaper.cdl b/src/QANewModTopOpe/QANewModTopOpe_ReShaper.cdl
index 608344470b..eed815b649 100644
--- a/src/QANewModTopOpe/QANewModTopOpe_ReShaper.cdl
+++ b/src/QANewModTopOpe/QANewModTopOpe_ReShaper.cdl
@@ -26,17 +26,17 @@ is
  
     Create(TheInitialShape  :  Shape from TopoDS) 
      
-    returns  mutable  ReShaper; 
+    returns  ReShaper; 
      
     Create(TheInitialShape  :  Shape from TopoDS;   
     	   TheMap  :  MapOfShape  from  TopTools) 
      
-    returns  mutable  ReShaper; 
+    returns  ReShaper; 
      
     Create(TheInitialShape  :  Shape from TopoDS;   
            TheShapeToBeRemoved  : HSequenceOfShape  from  TopTools) 
      
-    returns  mutable  ReShaper; 
+    returns  ReShaper; 
      
     Remove(me  :  mutable;  TheS  :  Shape from TopoDS); 
      
diff --git a/src/RWHeaderSection/RWHeaderSection_GeneralModule.cdl b/src/RWHeaderSection/RWHeaderSection_GeneralModule.cdl
index 2acf7e4a84..2256946b9b 100644
--- a/src/RWHeaderSection/RWHeaderSection_GeneralModule.cdl
+++ b/src/RWHeaderSection/RWHeaderSection_GeneralModule.cdl
@@ -27,7 +27,7 @@ uses Transient,
 
 is
 
-	Create returns mutable GeneralModule from RWHeaderSection;
+	Create returns GeneralModule from RWHeaderSection;
 	---Purpose : Creates a GeneralModule
 
 	FillSharedCase (me; CN : Integer; ent : Transient;
@@ -39,12 +39,12 @@ is
 	CheckCase (me; CN : Integer; ent : Transient; shares : ShareTool; ach : in out Check);
 	---Purpose : Specific Checking of an Entity <ent>
 
-	CopyCase (me; CN : Integer; entfrom : Transient; entto : mutable Transient; TC : in out CopyTool);
+	CopyCase (me; CN : Integer; entfrom : Transient; entto : Transient; TC : in out CopyTool);
 	---Purpose : Specific Copy ("Deep") from <entfrom> to <entto> (same type)
 	--           by using a CopyTool which provides its working Map.
 	--           Use method Transferred from CopyTool to work
 
 
-	NewVoid (me; CN : Integer; ent : out mutable Transient) returns Boolean;
+	NewVoid (me; CN : Integer; ent : out Transient) returns Boolean;
 
 end GeneralModule;
diff --git a/src/RWHeaderSection/RWHeaderSection_RWFileDescription.cdl b/src/RWHeaderSection/RWHeaderSection_RWFileDescription.cdl
index 6a7689223f..76fdc42356 100644
--- a/src/RWHeaderSection/RWHeaderSection_RWFileDescription.cdl
+++ b/src/RWHeaderSection/RWHeaderSection_RWFileDescription.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWFileDescription;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FileDescription from HeaderSection);
+	              ach : in out Check; ent : FileDescription from HeaderSection);
 
 	WriteStep (me; SW : in out StepWriter; ent : FileDescription from HeaderSection);
 
diff --git a/src/RWHeaderSection/RWHeaderSection_RWFileName.cdl b/src/RWHeaderSection/RWHeaderSection_RWFileName.cdl
index 7334551a6c..4a4b39e4a4 100644
--- a/src/RWHeaderSection/RWHeaderSection_RWFileName.cdl
+++ b/src/RWHeaderSection/RWHeaderSection_RWFileName.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWFileName;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FileName from HeaderSection);
+	              ach : in out Check; ent : FileName from HeaderSection);
 
 	WriteStep (me; SW : in out StepWriter; ent : FileName from HeaderSection);
 
diff --git a/src/RWHeaderSection/RWHeaderSection_RWFileSchema.cdl b/src/RWHeaderSection/RWHeaderSection_RWFileSchema.cdl
index 285945d9cf..37b132d102 100644
--- a/src/RWHeaderSection/RWHeaderSection_RWFileSchema.cdl
+++ b/src/RWHeaderSection/RWHeaderSection_RWFileSchema.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWFileSchema;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FileSchema from HeaderSection);
+	              ach : in out Check; ent : FileSchema from HeaderSection);
 
 	WriteStep (me; SW : in out StepWriter; ent : FileSchema from HeaderSection);
 
diff --git a/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cdl b/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cdl
index b96810769d..2cf045507c 100644
--- a/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cdl
+++ b/src/RWHeaderSection/RWHeaderSection_ReadWriteModule.cdl
@@ -27,7 +27,7 @@ uses Transient,
 
 is
 
-	Create returns mutable ReadWriteModule from RWHeaderSection;
+	Create returns ReadWriteModule from RWHeaderSection;
 
 	CaseStep (me; atype : AsciiString from TCollection) returns Integer;
 	---Purpose : associates a positive Case Number to each type of HeaderSection entity,
@@ -46,7 +46,7 @@ is
 	---C++ : return const &
 
 	ReadStep (me; CN : Integer; data : StepReaderData; num : Integer;
-	            ach : in out Check; ent : mutable Transient);
+	            ach : in out Check; ent : Transient);
 
 	WriteStep (me; CN : Integer; SW : in out StepWriter; ent : Transient);
 
diff --git a/src/RWStepAP214/RWStepAP214_GeneralModule.cdl b/src/RWStepAP214/RWStepAP214_GeneralModule.cdl
index 7ec13b34c4..a34c306432 100644
--- a/src/RWStepAP214/RWStepAP214_GeneralModule.cdl
+++ b/src/RWStepAP214/RWStepAP214_GeneralModule.cdl
@@ -28,7 +28,7 @@ uses Transient,  HAsciiString from TCollection,
 
 is
 
-    Create returns mutable GeneralModule from RWStepAP214;
+    Create returns GeneralModule from RWStepAP214;
     ---Purpose : Creates a GeneralModule
 
     FillSharedCase (me; CN : Integer; ent : Transient;
@@ -40,13 +40,13 @@ is
     CheckCase (me; CN : Integer; ent : Transient; shares : ShareTool; ach : in out Check);
     ---Purpose : Specific Checking of an Entity <ent>
 
-    CopyCase (me; CN : Integer; entfrom : Transient; entto : mutable Transient; TC : in out CopyTool);
+    CopyCase (me; CN : Integer; entfrom : Transient; entto : Transient; TC : in out CopyTool);
     ---Purpose : Specific Copy ("Deep") from <entfrom> to <entto> (same type)
     --           by using a CopyTool which provides its working Map.
     --           Use method Transferred from CopyTool to work
 
 
-    NewVoid (me; CN : Integer; ent : out mutable Transient) returns Boolean;
+    NewVoid (me; CN : Integer; ent : out Transient) returns Boolean;
 
     CategoryNumber (me; CN : Integer; ent : Transient; shares : ShareTool)
     returns Integer  is redefined;
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cdl
index d501ddb7f5..24b56d5d49 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedApprovalAssignment.cdl
@@ -30,7 +30,7 @@ is
     	Create returns RWAppliedApprovalAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AppliedApprovalAssignment from StepAP214);
+	              ach : in out Check; ent : AppliedApprovalAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AppliedApprovalAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cdl
index 877787d413..444464fa02 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAndTimeAssignment.cdl
@@ -30,7 +30,7 @@ is
     	Create returns RWAppliedDateAndTimeAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AppliedDateAndTimeAssignment from StepAP214);
+	              ach : in out Check; ent : AppliedDateAndTimeAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AppliedDateAndTimeAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cdl
index 8bf1b729ff..206bd76c73 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDateAssignment.cdl
@@ -30,7 +30,7 @@ is
     	Create returns RWAppliedDateAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AppliedDateAssignment from StepAP214);
+	              ach : in out Check; ent : AppliedDateAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AppliedDateAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cdl b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cdl
index 644e3b4a2e..ad0902daa7 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedDocumentReference.cdl
@@ -30,7 +30,7 @@ is
     	Create returns RWAppliedDocumentReference;
     
     	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AppliedDocumentReference from StepAP214);
+	              ach : in out Check; ent : AppliedDocumentReference from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AppliedDocumentReference from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cdl
index 34adca453f..2059f2d7f2 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedOrganizationAssignment.cdl
@@ -29,7 +29,7 @@ is
     	Create returns RWAppliedOrganizationAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AppliedOrganizationAssignment from StepAP214);
+	              ach : in out Check; ent : AppliedOrganizationAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AppliedOrganizationAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cdl
index d6b7127c28..e346a7c937 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedPersonAndOrganizationAssignment.cdl
@@ -29,7 +29,7 @@ is
     	Create returns RWAppliedPersonAndOrganizationAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AppliedPersonAndOrganizationAssignment from StepAP214);
+	              ach : in out Check; ent : AppliedPersonAndOrganizationAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AppliedPersonAndOrganizationAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.cdl b/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.cdl
index dcdf77dd53..e5ec8065ab 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedPresentedItem.cdl
@@ -30,7 +30,7 @@ is
     	Create returns RWAppliedPresentedItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AppliedPresentedItem from StepAP214);
+	              ach : in out Check; ent : AppliedPresentedItem from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AppliedPresentedItem from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cdl
index 9c0750ede8..907e37b0ab 100644
--- a/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAppliedSecurityClassificationAssignment.cdl
@@ -30,7 +30,7 @@ is
     	Create returns RWAppliedSecurityClassificationAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AppliedSecurityClassificationAssignment from StepAP214);
+	              ach : in out Check; ent : AppliedSecurityClassificationAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AppliedSecurityClassificationAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cdl
index 6047639dcf..5b1e9c4220 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAndTimeAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignActualDateAndTimeAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignActualDateAndTimeAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignActualDateAndTimeAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignActualDateAndTimeAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cdl
index 9f140f190a..2ebed4837b 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignActualDateAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignActualDateAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignActualDateAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignActualDateAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignActualDateAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cdl
index c088c343db..eaed9d20b9 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignApprovalAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignApprovalAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignApprovalAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignApprovalAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignApprovalAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cdl
index 4cc5b32996..ff34b0f1c9 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDateAndPersonAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignDateAndPersonAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignDateAndPersonAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignDateAndPersonAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignDateAndPersonAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cdl
index 9c92e7fcdb..836c3e2603 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignDocumentReference.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignDocumentReference;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignDocumentReference from StepAP214);
+	              ach : in out Check; ent : AutoDesignDocumentReference from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignDocumentReference from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.cdl
index d5d5b084ac..ffa1b48322 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignGroupAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignGroupAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignGroupAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignGroupAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignGroupAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cdl
index adcfef4256..5e6b044322 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAndTimeAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignNominalDateAndTimeAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignNominalDateAndTimeAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignNominalDateAndTimeAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignNominalDateAndTimeAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cdl
index 9f39141968..fb6317c97d 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignNominalDateAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignNominalDateAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignNominalDateAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignNominalDateAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignNominalDateAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cdl
index ecc4c0e4ad..2175208723 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignOrganizationAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignOrganizationAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignOrganizationAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignOrganizationAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignOrganizationAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cdl
index 7550d774d4..ed3555a72a 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignPersonAndOrganizationAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignPersonAndOrganizationAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignPersonAndOrganizationAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignPersonAndOrganizationAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignPersonAndOrganizationAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.cdl
index 70e0daf068..467d1e4488 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignPresentedItem.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignPresentedItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignPresentedItem from StepAP214);
+	              ach : in out Check; ent : AutoDesignPresentedItem from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignPresentedItem from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cdl b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cdl
index 7cd33da494..3f43c134f6 100644
--- a/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cdl
+++ b/src/RWStepAP214/RWStepAP214_RWAutoDesignSecurityClassificationAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAutoDesignSecurityClassificationAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AutoDesignSecurityClassificationAssignment from StepAP214);
+	              ach : in out Check; ent : AutoDesignSecurityClassificationAssignment from StepAP214);
 
 	WriteStep (me; SW : in out StepWriter; ent : AutoDesignSecurityClassificationAssignment from StepAP214);
 
diff --git a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cdl b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cdl
index ff64f9e49f..7c35613612 100644
--- a/src/RWStepAP214/RWStepAP214_ReadWriteModule.cdl
+++ b/src/RWStepAP214/RWStepAP214_ReadWriteModule.cdl
@@ -27,7 +27,7 @@ uses Transient,
 
 is
 
-	Create returns mutable ReadWriteModule from RWStepAP214;
+	Create returns ReadWriteModule from RWStepAP214;
 
 	CaseStep (me; atype : AsciiString from TCollection) returns Integer;
 	---Purpose : associates a positive Case Number to each type of StepAP214 entity,
@@ -50,7 +50,7 @@ is
             returns Boolean  is redefined;
 
 	ReadStep (me; CN : Integer; data : StepReaderData; num : Integer;
-	            ach : in out Check; ent : mutable Transient);
+	            ach : in out Check; ent : Transient);
 
 	WriteStep (me; CN : Integer; SW : in out StepWriter; ent : Transient);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWAddress.cdl b/src/RWStepBasic/RWStepBasic_RWAddress.cdl
index 271a56f2e2..fa5eabffd6 100644
--- a/src/RWStepBasic/RWStepBasic_RWAddress.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWAddress.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWAddress;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Address from StepBasic);
+	              ach : in out Check; ent : Address from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : Address from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationContext.cdl b/src/RWStepBasic/RWStepBasic_RWApplicationContext.cdl
index fb041557e0..25a6d9978c 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationContext.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationContext.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWApplicationContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ApplicationContext from StepBasic);
+	              ach : in out Check; ent : ApplicationContext from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ApplicationContext from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cdl b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cdl
index d9c2d075d0..7bd7004ab6 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationContextElement.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWApplicationContextElement;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ApplicationContextElement from StepBasic);
+	              ach : in out Check; ent : ApplicationContextElement from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ApplicationContextElement from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.cdl b/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.cdl
index 3503859662..101f294234 100644
--- a/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApplicationProtocolDefinition.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWApplicationProtocolDefinition;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ApplicationProtocolDefinition from StepBasic);
+	              ach : in out Check; ent : ApplicationProtocolDefinition from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ApplicationProtocolDefinition from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApproval.cdl b/src/RWStepBasic/RWStepBasic_RWApproval.cdl
index 1c7b214c0f..f6b52b6cc5 100644
--- a/src/RWStepBasic/RWStepBasic_RWApproval.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApproval.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWApproval;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Approval from StepBasic);
+	              ach : in out Check; ent : Approval from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : Approval from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.cdl b/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.cdl
index d45718cfbe..011cecc1eb 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalDateTime.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWApprovalDateTime;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ApprovalDateTime from StepBasic);
+	              ach : in out Check; ent : ApprovalDateTime from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ApprovalDateTime from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.cdl b/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.cdl
index 9da50d465d..a6dee5ccce 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalPersonOrganization.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWApprovalPersonOrganization;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ApprovalPersonOrganization from StepBasic);
+	              ach : in out Check; ent : ApprovalPersonOrganization from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ApprovalPersonOrganization from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.cdl b/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.cdl
index b9b61f0234..7c76110812 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalRelationship.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWApprovalRelationship;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ApprovalRelationship from StepBasic);
+	              ach : in out Check; ent : ApprovalRelationship from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ApprovalRelationship from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalRole.cdl b/src/RWStepBasic/RWStepBasic_RWApprovalRole.cdl
index 3157116386..a6bbc409d2 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalRole.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalRole.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWApprovalRole;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ApprovalRole from StepBasic);
+	              ach : in out Check; ent : ApprovalRole from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ApprovalRole from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWApprovalStatus.cdl b/src/RWStepBasic/RWStepBasic_RWApprovalStatus.cdl
index d58b0cc489..dddf142cfe 100644
--- a/src/RWStepBasic/RWStepBasic_RWApprovalStatus.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWApprovalStatus.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWApprovalStatus;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ApprovalStatus from StepBasic);
+	              ach : in out Check; ent : ApprovalStatus from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ApprovalStatus from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWCalendarDate.cdl b/src/RWStepBasic/RWStepBasic_RWCalendarDate.cdl
index 5ec7376e0d..0ecfff045b 100644
--- a/src/RWStepBasic/RWStepBasic_RWCalendarDate.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWCalendarDate.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWCalendarDate;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CalendarDate from StepBasic);
+	              ach : in out Check; ent : CalendarDate from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : CalendarDate from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cdl
index 00f88cabe0..1126059dd1 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConversionBasedUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ConversionBasedUnit from StepBasic);
+	              ach : in out Check; ent : ConversionBasedUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cdl
index 70d877387e..d9e3f28306 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndAreaUnit.cdl
@@ -31,7 +31,7 @@ is
     Create returns RWConversionBasedUnitAndAreaUnit from RWStepBasic;
     
     ReadStep (me; data: StepReaderData; num : Integer;
-	          ach : in out Check; ent : mutable ConversionBasedUnitAndAreaUnit from StepBasic);
+	          ach : in out Check; ent : ConversionBasedUnitAndAreaUnit from StepBasic);
 
     WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnitAndAreaUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cdl
index 7ae5c2e0c3..4ecbb2906c 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndLengthUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConversionBasedUnitAndLengthUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ConversionBasedUnitAndLengthUnit from StepBasic);
+	              ach : in out Check; ent : ConversionBasedUnitAndLengthUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnitAndLengthUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cdl
index 0f11c42cb7..c8832df29e 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndMassUnit.cdl
@@ -29,7 +29,7 @@ is
     Create returns RWConversionBasedUnitAndMassUnit;
 
     ReadStep (me; data : StepReaderData; num : Integer;
-	          ach : in out Check; ent : mutable ConversionBasedUnitAndMassUnit from StepBasic);
+	          ach : in out Check; ent : ConversionBasedUnitAndMassUnit from StepBasic);
 
     WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnitAndMassUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cdl
index 71907be57f..95a44eb8bf 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndPlaneAngleUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConversionBasedUnitAndPlaneAngleUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ConversionBasedUnitAndPlaneAngleUnit from StepBasic);
+	              ach : in out Check; ent : ConversionBasedUnitAndPlaneAngleUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnitAndPlaneAngleUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cdl
index 7f7e57cd62..9403cfecb4 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndRatioUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConversionBasedUnitAndRatioUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ConversionBasedUnitAndRatioUnit from StepBasic);
+	              ach : in out Check; ent : ConversionBasedUnitAndRatioUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnitAndRatioUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cdl
index b5eccb1948..25c219514b 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndSolidAngleUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConversionBasedUnitAndSolidAngleUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ConversionBasedUnitAndSolidAngleUnit from StepBasic);
+	              ach : in out Check; ent : ConversionBasedUnitAndSolidAngleUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnitAndSolidAngleUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cdl
index d19990951d..8c5041eda8 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndTimeUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConversionBasedUnitAndTimeUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ConversionBasedUnitAndTimeUnit from StepBasic);
+	              ach : in out Check; ent : ConversionBasedUnitAndTimeUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnitAndTimeUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cdl b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cdl
index 6a3f8e3ac8..606db362d6 100644
--- a/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWConversionBasedUnitAndVolumeUnit.cdl
@@ -31,7 +31,7 @@ is
     Create returns RWConversionBasedUnitAndVolumeUnit from RWStepBasic;
     
     ReadStep (me; data: StepReaderData; num : Integer;
-	          ach : in out Check; ent : mutable ConversionBasedUnitAndVolumeUnit from StepBasic);
+	          ach : in out Check; ent : ConversionBasedUnitAndVolumeUnit from StepBasic);
 
     WriteStep (me; SW : in out StepWriter; ent : ConversionBasedUnitAndVolumeUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.cdl b/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.cdl
index 09b2de2efd..6cdccbcec6 100644
--- a/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWCoordinatedUniversalTimeOffset.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWCoordinatedUniversalTimeOffset;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CoordinatedUniversalTimeOffset from StepBasic);
+	              ach : in out Check; ent : CoordinatedUniversalTimeOffset from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : CoordinatedUniversalTimeOffset from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDate.cdl b/src/RWStepBasic/RWStepBasic_RWDate.cdl
index 3f8b3e0b0c..520c420c8e 100644
--- a/src/RWStepBasic/RWStepBasic_RWDate.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDate.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWDate;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Date from StepBasic);
+	              ach : in out Check; ent : Date from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : Date from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDateAndTime.cdl b/src/RWStepBasic/RWStepBasic_RWDateAndTime.cdl
index 7f82692fe8..7e812b5090 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateAndTime.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDateAndTime.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDateAndTime;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DateAndTime from StepBasic);
+	              ach : in out Check; ent : DateAndTime from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DateAndTime from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDateRole.cdl b/src/RWStepBasic/RWStepBasic_RWDateRole.cdl
index c8e1f7885a..e8f7404716 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateRole.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDateRole.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWDateRole;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DateRole from StepBasic);
+	              ach : in out Check; ent : DateRole from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DateRole from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDateTimeRole.cdl b/src/RWStepBasic/RWStepBasic_RWDateTimeRole.cdl
index 9ad85616ae..2b611bec7b 100644
--- a/src/RWStepBasic/RWStepBasic_RWDateTimeRole.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDateTimeRole.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWDateTimeRole;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DateTimeRole from StepBasic);
+	              ach : in out Check; ent : DateTimeRole from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DateTimeRole from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDerivedUnit.cdl b/src/RWStepBasic/RWStepBasic_RWDerivedUnit.cdl
index 33b1f19fcf..3c9812a9d7 100644
--- a/src/RWStepBasic/RWStepBasic_RWDerivedUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDerivedUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDerivedUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DerivedUnit from StepBasic);
+	              ach : in out Check; ent : DerivedUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DerivedUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.cdl b/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.cdl
index 5328782622..12637218c7 100644
--- a/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDerivedUnitElement.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDerivedUnitElement;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DerivedUnitElement from StepBasic);
+	              ach : in out Check; ent : DerivedUnitElement from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DerivedUnitElement from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.cdl b/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.cdl
index 14a62cd917..91a2051c24 100644
--- a/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDimensionalExponents.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWDimensionalExponents;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DimensionalExponents from StepBasic);
+	              ach : in out Check; ent : DimensionalExponents from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DimensionalExponents from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.cdl b/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.cdl
index 6382208ed6..ac2bd2f40e 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentRelationship.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDocumentRelationship;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DocumentRelationship from StepBasic);
+	              ach : in out Check; ent : DocumentRelationship from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DocumentRelationship from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentType.cdl b/src/RWStepBasic/RWStepBasic_RWDocumentType.cdl
index dfc5c8faaa..7ed0358ca4 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentType.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentType.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDocumentType;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DocumentType from StepBasic);
+	              ach : in out Check; ent : DocumentType from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DocumentType from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.cdl b/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.cdl
index f556f5dc08..827d15a2b7 100644
--- a/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWDocumentUsageConstraint.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDocumentUsageConstraint;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DocumentUsageConstraint from StepBasic);
+	              ach : in out Check; ent : DocumentUsageConstraint from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : DocumentUsageConstraint from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWEffectivity.cdl b/src/RWStepBasic/RWStepBasic_RWEffectivity.cdl
index 41dfd59970..46f5568a5f 100644
--- a/src/RWStepBasic/RWStepBasic_RWEffectivity.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWEffectivity.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWEffectivity;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Effectivity from StepBasic);
+	              ach : in out Check; ent : Effectivity from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : Effectivity from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.cdl b/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.cdl
index 2b01a91bb0..f60bceb538 100644
--- a/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWLengthMeasureWithUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWLengthMeasureWithUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable LengthMeasureWithUnit from StepBasic);
+	              ach : in out Check; ent : LengthMeasureWithUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : LengthMeasureWithUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWLengthUnit.cdl b/src/RWStepBasic/RWStepBasic_RWLengthUnit.cdl
index 28118c950f..e5323cd40a 100644
--- a/src/RWStepBasic/RWStepBasic_RWLengthUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWLengthUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWLengthUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable LengthUnit from StepBasic);
+	              ach : in out Check; ent : LengthUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : LengthUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWLocalTime.cdl b/src/RWStepBasic/RWStepBasic_RWLocalTime.cdl
index d9181f2602..cccbb83e6c 100644
--- a/src/RWStepBasic/RWStepBasic_RWLocalTime.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWLocalTime.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWLocalTime;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable LocalTime from StepBasic);
+	              ach : in out Check; ent : LocalTime from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : LocalTime from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.cdl b/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.cdl
index c49316fbc8..4ca6092e07 100644
--- a/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWMassMeasureWithUnit.cdl
@@ -29,7 +29,7 @@ is
     Create returns RWMassMeasureWithUnit;
 
     ReadStep (me; data : StepReaderData; num : Integer;
-	          ach : in out Check; ent : mutable MassMeasureWithUnit from StepBasic);
+	          ach : in out Check; ent : MassMeasureWithUnit from StepBasic);
 
     WriteStep (me; SW : in out StepWriter; ent : MassMeasureWithUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.cdl b/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.cdl
index 93750a8c60..09bdca4e84 100644
--- a/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWMeasureWithUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWMeasureWithUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable MeasureWithUnit from StepBasic);
+	              ach : in out Check; ent : MeasureWithUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : MeasureWithUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWMechanicalContext.cdl b/src/RWStepBasic/RWStepBasic_RWMechanicalContext.cdl
index 311ea6dc14..27b3891447 100644
--- a/src/RWStepBasic/RWStepBasic_RWMechanicalContext.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWMechanicalContext.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWMechanicalContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable MechanicalContext from StepBasic);
+	              ach : in out Check; ent : MechanicalContext from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : MechanicalContext from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWNamedUnit.cdl b/src/RWStepBasic/RWStepBasic_RWNamedUnit.cdl
index 60a044c8fc..342b0c7170 100644
--- a/src/RWStepBasic/RWStepBasic_RWNamedUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWNamedUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWNamedUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable NamedUnit from StepBasic);
+	              ach : in out Check; ent : NamedUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : NamedUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWOrdinalDate.cdl b/src/RWStepBasic/RWStepBasic_RWOrdinalDate.cdl
index 5f189143c8..dd52803a62 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrdinalDate.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWOrdinalDate.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWOrdinalDate;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OrdinalDate from StepBasic);
+	              ach : in out Check; ent : OrdinalDate from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : OrdinalDate from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganization.cdl b/src/RWStepBasic/RWStepBasic_RWOrganization.cdl
index b628d4be49..b05932594e 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganization.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWOrganization.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWOrganization;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Organization from StepBasic);
+	              ach : in out Check; ent : Organization from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : Organization from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganizationRole.cdl b/src/RWStepBasic/RWStepBasic_RWOrganizationRole.cdl
index db1d9bd789..0394575977 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganizationRole.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWOrganizationRole.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWOrganizationRole;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OrganizationRole from StepBasic);
+	              ach : in out Check; ent : OrganizationRole from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : OrganizationRole from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.cdl b/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.cdl
index b743c2fc73..4f02b8313b 100644
--- a/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWOrganizationalAddress.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOrganizationalAddress;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OrganizationalAddress from StepBasic);
+	              ach : in out Check; ent : OrganizationalAddress from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : OrganizationalAddress from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPerson.cdl b/src/RWStepBasic/RWStepBasic_RWPerson.cdl
index 8f5350ece5..583c4fabf5 100644
--- a/src/RWStepBasic/RWStepBasic_RWPerson.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWPerson.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPerson;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Person from StepBasic);
+	              ach : in out Check; ent : Person from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : Person from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.cdl b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.cdl
index 421151779f..0908695e2f 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganization.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPersonAndOrganization;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PersonAndOrganization from StepBasic);
+	              ach : in out Check; ent : PersonAndOrganization from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : PersonAndOrganization from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.cdl b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.cdl
index bec7153050..89108cea05 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWPersonAndOrganizationRole.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPersonAndOrganizationRole;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PersonAndOrganizationRole from StepBasic);
+	              ach : in out Check; ent : PersonAndOrganizationRole from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : PersonAndOrganizationRole from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPersonalAddress.cdl b/src/RWStepBasic/RWStepBasic_RWPersonalAddress.cdl
index 08bed2e179..732fd502d3 100644
--- a/src/RWStepBasic/RWStepBasic_RWPersonalAddress.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWPersonalAddress.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPersonalAddress;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PersonalAddress from StepBasic);
+	              ach : in out Check; ent : PersonalAddress from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : PersonalAddress from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.cdl b/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.cdl
index a9e35d072a..8fe72f36dd 100644
--- a/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWPlaneAngleMeasureWithUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPlaneAngleMeasureWithUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PlaneAngleMeasureWithUnit from StepBasic);
+	              ach : in out Check; ent : PlaneAngleMeasureWithUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : PlaneAngleMeasureWithUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.cdl b/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.cdl
index a7d864b5a2..cdd5016d36 100644
--- a/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWPlaneAngleUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPlaneAngleUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PlaneAngleUnit from StepBasic);
+	              ach : in out Check; ent : PlaneAngleUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : PlaneAngleUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProduct.cdl b/src/RWStepBasic/RWStepBasic_RWProduct.cdl
index 71d5befb5b..9c11ff9996 100644
--- a/src/RWStepBasic/RWStepBasic_RWProduct.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProduct.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProduct;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Product from StepBasic);
+	              ach : in out Check; ent : Product from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : Product from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductCategory.cdl b/src/RWStepBasic/RWStepBasic_RWProductCategory.cdl
index a0ffd2967d..44d0a384fa 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductCategory.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductCategory.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWProductCategory;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductCategory from StepBasic);
+	              ach : in out Check; ent : ProductCategory from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductCategory from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductContext.cdl b/src/RWStepBasic/RWStepBasic_RWProductContext.cdl
index 84433e916c..4fd072b9bc 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductContext.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductContext.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductContext from StepBasic);
+	              ach : in out Check; ent : ProductContext from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductContext from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinition.cdl b/src/RWStepBasic/RWStepBasic_RWProductDefinition.cdl
index 32860b7020..41e92f42ac 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinition.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinition.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductDefinition;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductDefinition from StepBasic);
+	              ach : in out Check; ent : ProductDefinition from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductDefinition from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.cdl b/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.cdl
index a094ac0df1..109babd2c4 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionContext.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductDefinitionContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductDefinitionContext from StepBasic);
+	              ach : in out Check; ent : ProductDefinitionContext from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductDefinitionContext from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.cdl b/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.cdl
index 756ebae82a..c3d0a9a60e 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionEffectivity.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductDefinitionEffectivity;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductDefinitionEffectivity from StepBasic);
+	              ach : in out Check; ent : ProductDefinitionEffectivity from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductDefinitionEffectivity from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cdl b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cdl
index f6b071efea..817f805e6b 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductDefinitionFormation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductDefinitionFormation from StepBasic);
+	              ach : in out Check; ent : ProductDefinitionFormation from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductDefinitionFormation from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cdl b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cdl
index 5b1c9e51c5..c9962f623f 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionFormationWithSpecifiedSource.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductDefinitionFormationWithSpecifiedSource;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductDefinitionFormationWithSpecifiedSource from StepBasic);
+	              ach : in out Check; ent : ProductDefinitionFormationWithSpecifiedSource from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductDefinitionFormationWithSpecifiedSource from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cdl b/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cdl
index 31f1d12540..00d7fa6503 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductDefinitionWithAssociatedDocuments.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductDefinitionWithAssociatedDocuments;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductDefinitionWithAssociatedDocuments from StepBasic);
+	              ach : in out Check; ent : ProductDefinitionWithAssociatedDocuments from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductDefinitionWithAssociatedDocuments from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.cdl b/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.cdl
index 1d372414c5..ec4de4ff94 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductRelatedProductCategory.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductRelatedProductCategory;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductRelatedProductCategory from StepBasic);
+	              ach : in out Check; ent : ProductRelatedProductCategory from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductRelatedProductCategory from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWProductType.cdl b/src/RWStepBasic/RWStepBasic_RWProductType.cdl
index 3ee9bbafd8..d0621beea5 100644
--- a/src/RWStepBasic/RWStepBasic_RWProductType.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWProductType.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWProductType;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ProductType from StepBasic);
+	              ach : in out Check; ent : ProductType from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : ProductType from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.cdl b/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.cdl
index be4432dd18..e5dec26fa0 100644
--- a/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWRatioMeasureWithUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRatioMeasureWithUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RatioMeasureWithUnit from StepBasic);
+	              ach : in out Check; ent : RatioMeasureWithUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : RatioMeasureWithUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSecurityClassification.cdl b/src/RWStepBasic/RWStepBasic_RWSecurityClassification.cdl
index 5f94fd3965..744e515d84 100644
--- a/src/RWStepBasic/RWStepBasic_RWSecurityClassification.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSecurityClassification.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSecurityClassification;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SecurityClassification from StepBasic);
+	              ach : in out Check; ent : SecurityClassification from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SecurityClassification from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.cdl b/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.cdl
index b1378275f5..e057de1c10 100644
--- a/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSecurityClassificationLevel.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWSecurityClassificationLevel;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SecurityClassificationLevel from StepBasic);
+	              ach : in out Check; ent : SecurityClassificationLevel from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SecurityClassificationLevel from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnit.cdl
index 3b2dbe5483..d6014a7a8a 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnit.cdl
@@ -33,7 +33,7 @@ is
     Create returns RWSiUnit;
 
     ReadStep (me; data: StepReaderData; num: Integer;
-	          ach : in out Check;   ent: mutable SiUnit from StepBasic);
+	          ach : in out Check;   ent: SiUnit from StepBasic);
 
     WriteStep (me; SW : in out StepWriter; ent : SiUnit from StepBasic);
     
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.cdl
index 7bed69af4c..42e7084216 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndAreaUnit.cdl
@@ -30,7 +30,7 @@ is
     Create returns  RWSiUnitAndAreaUnit from RWStepBasic;
     
     ReadStep (me; data: StepReaderData; num: Integer;
-	          ach : in out Check;   ent: mutable SiUnitAndAreaUnit from StepBasic);
+	          ach : in out Check;   ent: SiUnitAndAreaUnit from StepBasic);
     
     WriteStep (me; SW : in out StepWriter; ent: SiUnitAndAreaUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.cdl
index 526d69ab6a..a5cc213967 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndLengthUnit.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWSiUnitAndLengthUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SiUnitAndLengthUnit from StepBasic);
+	              ach : in out Check; ent : SiUnitAndLengthUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SiUnitAndLengthUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.cdl
index d81301c07d..51ee384ef2 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndMassUnit.cdl
@@ -27,7 +27,7 @@ is
 	Create returns RWSiUnitAndMassUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SiUnitAndMassUnit from StepBasic);
+	              ach : in out Check; ent : SiUnitAndMassUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SiUnitAndMassUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.cdl
index dab8d58056..6831307dd2 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndPlaneAngleUnit.cdl
@@ -28,7 +28,7 @@ is
     Create returns RWSiUnitAndPlaneAngleUnit;
 
     ReadStep (me; data : StepReaderData; num : Integer;
-	      ach : in out Check; ent : mutable SiUnitAndPlaneAngleUnit from StepBasic);
+	      ach : in out Check; ent : SiUnitAndPlaneAngleUnit from StepBasic);
 
     WriteStep (me; SW : in out StepWriter; ent : SiUnitAndPlaneAngleUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.cdl
index b683fbfbd0..727c542b14 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndRatioUnit.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWSiUnitAndRatioUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SiUnitAndRatioUnit from StepBasic);
+	              ach : in out Check; ent : SiUnitAndRatioUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SiUnitAndRatioUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.cdl
index d6a7c563a2..573fb6b3a0 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndSolidAngleUnit.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWSiUnitAndSolidAngleUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SiUnitAndSolidAngleUnit from StepBasic);
+	              ach : in out Check; ent : SiUnitAndSolidAngleUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SiUnitAndSolidAngleUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cdl
index e6b53bce86..74500bf453 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndThermodynamicTemperatureUnit.cdl
@@ -27,7 +27,7 @@ is
 	Create returns RWSiUnitAndThermodynamicTemperatureUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SiUnitAndThermodynamicTemperatureUnit from StepBasic);
+	              ach : in out Check; ent : SiUnitAndThermodynamicTemperatureUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SiUnitAndThermodynamicTemperatureUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.cdl
index 25d3d21bc2..89c5d16193 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndTimeUnit.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWSiUnitAndTimeUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SiUnitAndTimeUnit from StepBasic);
+	              ach : in out Check; ent : SiUnitAndTimeUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SiUnitAndTimeUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.cdl
index 73128ea56d..c2b6677334 100644
--- a/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSiUnitAndVolumeUnit.cdl
@@ -30,7 +30,7 @@ is
     Create returns RWSiUnitAndVolumeUnit from RWStepBasic;
     
     ReadStep (me; data: StepReaderData; num: Integer;
-	          ach : in out Check;   ent: mutable SiUnitAndVolumeUnit from StepBasic);
+	          ach : in out Check;   ent: SiUnitAndVolumeUnit from StepBasic);
     
     WriteStep (me; SW : in out StepWriter; ent: SiUnitAndVolumeUnit from StepBasic);
     
diff --git a/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.cdl
index 1f69e4fd8e..2e5e13fa8a 100644
--- a/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSolidAngleMeasureWithUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSolidAngleMeasureWithUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SolidAngleMeasureWithUnit from StepBasic);
+	              ach : in out Check; ent : SolidAngleMeasureWithUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SolidAngleMeasureWithUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.cdl b/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.cdl
index 04f1d4cc77..88ea982ed0 100644
--- a/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWSolidAngleUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSolidAngleUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SolidAngleUnit from StepBasic);
+	              ach : in out Check; ent : SolidAngleUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : SolidAngleUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.cdl b/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.cdl
index c13d5c3db6..2648d2a801 100644
--- a/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWUncertaintyMeasureWithUnit.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWUncertaintyMeasureWithUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable UncertaintyMeasureWithUnit from StepBasic);
+	              ach : in out Check; ent : UncertaintyMeasureWithUnit from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : UncertaintyMeasureWithUnit from StepBasic);
 
diff --git a/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.cdl b/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.cdl
index 4d2c34e558..f078464338 100644
--- a/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.cdl
+++ b/src/RWStepBasic/RWStepBasic_RWWeekOfYearAndDayDate.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWWeekOfYearAndDayDate;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable WeekOfYearAndDayDate from StepBasic);
+	              ach : in out Check; ent : WeekOfYearAndDayDate from StepBasic);
 
 	WriteStep (me; SW : in out StepWriter; ent : WeekOfYearAndDayDate from StepBasic);
 
diff --git a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl
index ef998f3e75..f0f5702ddc 100644
--- a/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl
+++ b/src/RWStepDimTol/RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl
@@ -29,7 +29,7 @@ is
     Create returns RWGeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol;
 
     ReadStep (me; data : StepReaderData; num : Integer; ach : in out Check;
-                  ent : mutable GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol from StepDimTol);
+                  ent : GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol from StepDimTol);
 
     WriteStep (me; SW : in out StepWriter;
                    ent : GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol from StepDimTol);
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis1Placement.cdl b/src/RWStepGeom/RWStepGeom_RWAxis1Placement.cdl
index 62b78d1843..d423516393 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis1Placement.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWAxis1Placement.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAxis1Placement;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Axis1Placement from StepGeom);
+	              ach : in out Check; ent : Axis1Placement from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Axis1Placement from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.cdl b/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.cdl
index da4965a6a7..ca5003b9d9 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWAxis2Placement2d.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAxis2Placement2d;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Axis2Placement2d from StepGeom);
+	              ach : in out Check; ent : Axis2Placement2d from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Axis2Placement2d from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.cdl b/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.cdl
index 25848688ac..72a21b0349 100644
--- a/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWAxis2Placement3d.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAxis2Placement3d;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Axis2Placement3d from StepGeom);
+	              ach : in out Check; ent : Axis2Placement3d from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Axis2Placement3d from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurve.cdl b/src/RWStepGeom/RWStepGeom_RWBSplineCurve.cdl
index 2263e0cf5b..8bf2655365 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBSplineCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BSplineCurve from StepGeom);
+	              ach : in out Check; ent : BSplineCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BSplineCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.cdl b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.cdl
index 86286e6f8b..b4523fd78e 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnots.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWBSplineCurveWithKnots;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BSplineCurveWithKnots from StepGeom);
+	              ach : in out Check; ent : BSplineCurveWithKnots from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BSplineCurveWithKnots from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cdl b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cdl
index 3025ce07fa..248c76e9ec 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineCurveWithKnotsAndRationalBSplineCurve.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWBSplineCurveWithKnotsAndRationalBSplineCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BSplineCurveWithKnotsAndRationalBSplineCurve from StepGeom);
+	              ach : in out Check; ent : BSplineCurveWithKnotsAndRationalBSplineCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BSplineCurveWithKnotsAndRationalBSplineCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurface.cdl b/src/RWStepGeom/RWStepGeom_RWBSplineSurface.cdl
index 64c202ea21..9db744e38c 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBSplineSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BSplineSurface from StepGeom);
+	              ach : in out Check; ent : BSplineSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BSplineSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.cdl b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.cdl
index cb6487c205..f8ff0679ff 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnots.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWBSplineSurfaceWithKnots;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BSplineSurfaceWithKnots from StepGeom);
+	              ach : in out Check; ent : BSplineSurfaceWithKnots from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BSplineSurfaceWithKnots from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cdl b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cdl
index 5778001ce2..81e7eb5191 100644
--- a/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBSplineSurfaceWithKnotsAndRationalBSplineSurface.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWBSplineSurfaceWithKnotsAndRationalBSplineSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BSplineSurfaceWithKnotsAndRationalBSplineSurface from StepGeom);
+	              ach : in out Check; ent : BSplineSurfaceWithKnotsAndRationalBSplineSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BSplineSurfaceWithKnotsAndRationalBSplineSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierCurve.cdl b/src/RWStepGeom/RWStepGeom_RWBezierCurve.cdl
index af009406c5..75d289b17f 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBezierCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBezierCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BezierCurve from StepGeom);
+	              ach : in out Check; ent : BezierCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BezierCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cdl b/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cdl
index 295a4cbc6e..e2f81634b7 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBezierCurveAndRationalBSplineCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBezierCurveAndRationalBSplineCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BezierCurveAndRationalBSplineCurve from StepGeom);
+	              ach : in out Check; ent : BezierCurveAndRationalBSplineCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BezierCurveAndRationalBSplineCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierSurface.cdl b/src/RWStepGeom/RWStepGeom_RWBezierSurface.cdl
index 61e1165b74..4eda5f093c 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBezierSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBezierSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BezierSurface from StepGeom);
+	              ach : in out Check; ent : BezierSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BezierSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cdl b/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cdl
index a9b8f244ff..22e9457648 100644
--- a/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBezierSurfaceAndRationalBSplineSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBezierSurfaceAndRationalBSplineSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BezierSurfaceAndRationalBSplineSurface from StepGeom);
+	              ach : in out Check; ent : BezierSurfaceAndRationalBSplineSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BezierSurfaceAndRationalBSplineSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cdl b/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cdl
index dfac4828b3..5d10a53ae1 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBoundaryCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBoundaryCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BoundaryCurve from StepGeom);
+	              ach : in out Check; ent : BoundaryCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BoundaryCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundedCurve.cdl b/src/RWStepGeom/RWStepGeom_RWBoundedCurve.cdl
index 26d5c1756b..b1301b0fe5 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundedCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBoundedCurve.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWBoundedCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BoundedCurve from StepGeom);
+	              ach : in out Check; ent : BoundedCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BoundedCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWBoundedSurface.cdl b/src/RWStepGeom/RWStepGeom_RWBoundedSurface.cdl
index b5511e1f1e..c6eaa27a32 100644
--- a/src/RWStepGeom/RWStepGeom_RWBoundedSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWBoundedSurface.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWBoundedSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BoundedSurface from StepGeom);
+	              ach : in out Check; ent : BoundedSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : BoundedSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianPoint.cdl b/src/RWStepGeom/RWStepGeom_RWCartesianPoint.cdl
index 89a336d700..0d120e67d8 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianPoint.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianPoint.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWCartesianPoint;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CartesianPoint from StepGeom);
+	              ach : in out Check; ent : CartesianPoint from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : CartesianPoint from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.cdl b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.cdl
index f2602a666f..854209052b 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCartesianTransformationOperator;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CartesianTransformationOperator from StepGeom);
+	              ach : in out Check; ent : CartesianTransformationOperator from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : CartesianTransformationOperator from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.cdl b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.cdl
index 894c4e6bae..6725fa8e3c 100644
--- a/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCartesianTransformationOperator3d.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCartesianTransformationOperator3d;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CartesianTransformationOperator3d from StepGeom);
+	              ach : in out Check; ent : CartesianTransformationOperator3d from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : CartesianTransformationOperator3d from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCircle.cdl b/src/RWStepGeom/RWStepGeom_RWCircle.cdl
index 6ab2565ab4..c724c6096c 100644
--- a/src/RWStepGeom/RWStepGeom_RWCircle.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCircle.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCircle;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Circle from StepGeom);
+	              ach : in out Check; ent : Circle from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Circle from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurve.cdl b/src/RWStepGeom/RWStepGeom_RWCompositeCurve.cdl
index 8f1758c91c..80e7e61367 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCompositeCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CompositeCurve from StepGeom);
+	              ach : in out Check; ent : CompositeCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : CompositeCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.cdl b/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.cdl
index c505dd3a5e..a45fc0e8bb 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurveOnSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCompositeCurveOnSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CompositeCurveOnSurface from StepGeom);
+	              ach : in out Check; ent : CompositeCurveOnSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : CompositeCurveOnSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.cdl b/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.cdl
index f1558541c1..e6a2b75c46 100644
--- a/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCompositeCurveSegment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCompositeCurveSegment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CompositeCurveSegment from StepGeom);
+	              ach : in out Check; ent : CompositeCurveSegment from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : CompositeCurveSegment from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWConic.cdl b/src/RWStepGeom/RWStepGeom_RWConic.cdl
index 998bacae8e..ea41add22d 100644
--- a/src/RWStepGeom/RWStepGeom_RWConic.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWConic.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConic;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Conic from StepGeom);
+	              ach : in out Check; ent : Conic from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Conic from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWConicalSurface.cdl b/src/RWStepGeom/RWStepGeom_RWConicalSurface.cdl
index 818d9e0114..682a4be362 100644
--- a/src/RWStepGeom/RWStepGeom_RWConicalSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWConicalSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConicalSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ConicalSurface from StepGeom);
+	              ach : in out Check; ent : ConicalSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : ConicalSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCurve.cdl b/src/RWStepGeom/RWStepGeom_RWCurve.cdl
index 2d143dfda4..6cbc48f80e 100644
--- a/src/RWStepGeom/RWStepGeom_RWCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCurve.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Curve from StepGeom);
+	              ach : in out Check; ent : Curve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Curve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCurveReplica.cdl b/src/RWStepGeom/RWStepGeom_RWCurveReplica.cdl
index 3f69bf6d21..080f5ec7ad 100644
--- a/src/RWStepGeom/RWStepGeom_RWCurveReplica.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCurveReplica.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCurveReplica;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CurveReplica from StepGeom);
+	              ach : in out Check; ent : CurveReplica from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : CurveReplica from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.cdl b/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.cdl
index 0a8dd541b9..4e3bee353b 100644
--- a/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWCylindricalSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCylindricalSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CylindricalSurface from StepGeom);
+	              ach : in out Check; ent : CylindricalSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : CylindricalSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.cdl b/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.cdl
index 2289b3b4a6..357f2635e7 100644
--- a/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWDegeneratePcurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDegeneratePcurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DegeneratePcurve from StepGeom);
+	              ach : in out Check; ent : DegeneratePcurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : DegeneratePcurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.cdl b/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.cdl
index 017766f28a..96c6139741 100644
--- a/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWDegenerateToroidalSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDegenerateToroidalSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DegenerateToroidalSurface from StepGeom);
+	              ach : in out Check; ent : DegenerateToroidalSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : DegenerateToroidalSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWDirection.cdl b/src/RWStepGeom/RWStepGeom_RWDirection.cdl
index 5cba13b8f4..2f810f61ec 100644
--- a/src/RWStepGeom/RWStepGeom_RWDirection.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWDirection.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDirection;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Direction from StepGeom);
+	              ach : in out Check; ent : Direction from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Direction from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWElementarySurface.cdl b/src/RWStepGeom/RWStepGeom_RWElementarySurface.cdl
index f8e1a7333d..83b8f170a7 100644
--- a/src/RWStepGeom/RWStepGeom_RWElementarySurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWElementarySurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWElementarySurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ElementarySurface from StepGeom);
+	              ach : in out Check; ent : ElementarySurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : ElementarySurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWEllipse.cdl b/src/RWStepGeom/RWStepGeom_RWEllipse.cdl
index 79640f0a6d..52dd4459f8 100644
--- a/src/RWStepGeom/RWStepGeom_RWEllipse.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWEllipse.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWEllipse;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Ellipse from StepGeom);
+	              ach : in out Check; ent : Ellipse from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Ellipse from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.cdl b/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.cdl
index ab2f89d5d6..67162aff53 100644
--- a/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWEvaluatedDegeneratePcurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWEvaluatedDegeneratePcurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable EvaluatedDegeneratePcurve from StepGeom);
+	              ach : in out Check; ent : EvaluatedDegeneratePcurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : EvaluatedDegeneratePcurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl b/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl
index 27f4c3d01d..e9a4939cdc 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWGeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl
@@ -33,7 +33,7 @@ is
    	      data : StepReaderData; 
     	      num : Integer;
               ach : in out Check; 
-    	      ent : mutable GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx from StepGeom);
+    	      ent : GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx from StepGeom);
 
     WriteStep (me; SW : in out StepWriter; 
        	       ent : GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx from StepGeom);
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.cdl b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.cdl
index 919c69a670..465c96fd86 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContext.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWGeometricRepresentationContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GeometricRepresentationContext from StepGeom);
+	              ach : in out Check; ent : GeometricRepresentationContext from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : GeometricRepresentationContext from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cdl b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cdl
index f1f1798cbf..464a2ef89c 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndGlobalUnitAssignedContext.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWGeometricRepresentationContextAndGlobalUnitAssignedContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GeometricRepresentationContextAndGlobalUnitAssignedContext from StepGeom);
+	              ach : in out Check; ent : GeometricRepresentationContextAndGlobalUnitAssignedContext from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : GeometricRepresentationContextAndGlobalUnitAssignedContext from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cdl b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cdl
index 253f584203..161f133b2c 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationContextAndParametricRepresentationContext.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWGeometricRepresentationContextAndParametricRepresentationContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GeometricRepresentationContextAndParametricRepresentationContext from StepGeom);
+	              ach : in out Check; ent : GeometricRepresentationContextAndParametricRepresentationContext from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : GeometricRepresentationContextAndParametricRepresentationContext from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.cdl b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.cdl
index 8d6ad18cc8..fa1d471433 100644
--- a/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWGeometricRepresentationItem.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWGeometricRepresentationItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GeometricRepresentationItem from StepGeom);
+	              ach : in out Check; ent : GeometricRepresentationItem from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : GeometricRepresentationItem from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWHyperbola.cdl b/src/RWStepGeom/RWStepGeom_RWHyperbola.cdl
index 541a378333..3df4426f6e 100644
--- a/src/RWStepGeom/RWStepGeom_RWHyperbola.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWHyperbola.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWHyperbola;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Hyperbola from StepGeom);
+	              ach : in out Check; ent : Hyperbola from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Hyperbola from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.cdl b/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.cdl
index ded3201144..6017590258 100644
--- a/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWIntersectionCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWIntersectionCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable IntersectionCurve from StepGeom);
+	              ach : in out Check; ent : IntersectionCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : IntersectionCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWLine.cdl b/src/RWStepGeom/RWStepGeom_RWLine.cdl
index 0bcb368221..b557c943a7 100644
--- a/src/RWStepGeom/RWStepGeom_RWLine.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWLine.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWLine;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Line from StepGeom);
+	              ach : in out Check; ent : Line from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Line from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cdl b/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cdl
index b26d7fcce5..db6fa1ddbe 100644
--- a/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWOffsetCurve3d.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOffsetCurve3d;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OffsetCurve3d from StepGeom);
+	              ach : in out Check; ent : OffsetCurve3d from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : OffsetCurve3d from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWOffsetSurface.cdl b/src/RWStepGeom/RWStepGeom_RWOffsetSurface.cdl
index b7eb8c9af7..61930194b4 100644
--- a/src/RWStepGeom/RWStepGeom_RWOffsetSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWOffsetSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOffsetSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OffsetSurface from StepGeom);
+	              ach : in out Check; ent : OffsetSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : OffsetSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.cdl b/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.cdl
index 041d78bd0c..a24212ba3f 100644
--- a/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWOuterBoundaryCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOuterBoundaryCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OuterBoundaryCurve from StepGeom);
+	              ach : in out Check; ent : OuterBoundaryCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : OuterBoundaryCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWParabola.cdl b/src/RWStepGeom/RWStepGeom_RWParabola.cdl
index b948451cdd..8d84d0bb29 100644
--- a/src/RWStepGeom/RWStepGeom_RWParabola.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWParabola.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWParabola;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Parabola from StepGeom);
+	              ach : in out Check; ent : Parabola from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Parabola from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPcurve.cdl b/src/RWStepGeom/RWStepGeom_RWPcurve.cdl
index 8767e9befd..8e0fa831b9 100644
--- a/src/RWStepGeom/RWStepGeom_RWPcurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWPcurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPcurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Pcurve from StepGeom);
+	              ach : in out Check; ent : Pcurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Pcurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPlacement.cdl b/src/RWStepGeom/RWStepGeom_RWPlacement.cdl
index 561749c331..7c118ad4c0 100644
--- a/src/RWStepGeom/RWStepGeom_RWPlacement.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWPlacement.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPlacement;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Placement from StepGeom);
+	              ach : in out Check; ent : Placement from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Placement from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPlane.cdl b/src/RWStepGeom/RWStepGeom_RWPlane.cdl
index 2992484b5d..9ed9b17782 100644
--- a/src/RWStepGeom/RWStepGeom_RWPlane.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWPlane.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPlane;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Plane from StepGeom);
+	              ach : in out Check; ent : Plane from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Plane from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPoint.cdl b/src/RWStepGeom/RWStepGeom_RWPoint.cdl
index de7e487771..4723960b9c 100644
--- a/src/RWStepGeom/RWStepGeom_RWPoint.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWPoint.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPoint;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Point from StepGeom);
+	              ach : in out Check; ent : Point from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Point from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPointOnCurve.cdl b/src/RWStepGeom/RWStepGeom_RWPointOnCurve.cdl
index b411ebadfd..aac6eb7a02 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointOnCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWPointOnCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPointOnCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PointOnCurve from StepGeom);
+	              ach : in out Check; ent : PointOnCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : PointOnCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPointOnSurface.cdl b/src/RWStepGeom/RWStepGeom_RWPointOnSurface.cdl
index 836cdd5528..8da7429c21 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointOnSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWPointOnSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPointOnSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PointOnSurface from StepGeom);
+	              ach : in out Check; ent : PointOnSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : PointOnSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPointReplica.cdl b/src/RWStepGeom/RWStepGeom_RWPointReplica.cdl
index c9418d7a5e..a6200a4ab0 100644
--- a/src/RWStepGeom/RWStepGeom_RWPointReplica.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWPointReplica.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPointReplica;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PointReplica from StepGeom);
+	              ach : in out Check; ent : PointReplica from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : PointReplica from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWPolyline.cdl b/src/RWStepGeom/RWStepGeom_RWPolyline.cdl
index a27a762b58..77e9473940 100644
--- a/src/RWStepGeom/RWStepGeom_RWPolyline.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWPolyline.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPolyline;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Polyline from StepGeom);
+	              ach : in out Check; ent : Polyline from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Polyline from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.cdl b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.cdl
index 50b9c2b742..4b73c8feec 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWQuasiUniformCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable QuasiUniformCurve from StepGeom);
+	              ach : in out Check; ent : QuasiUniformCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : QuasiUniformCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cdl b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cdl
index 37894daaa9..fb17f4a589 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformCurveAndRationalBSplineCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWQuasiUniformCurveAndRationalBSplineCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable QuasiUniformCurveAndRationalBSplineCurve from StepGeom);
+	              ach : in out Check; ent : QuasiUniformCurveAndRationalBSplineCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : QuasiUniformCurveAndRationalBSplineCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.cdl b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.cdl
index 12798aa9ac..5d465fe3b3 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWQuasiUniformSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable QuasiUniformSurface from StepGeom);
+	              ach : in out Check; ent : QuasiUniformSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : QuasiUniformSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cdl b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cdl
index ca6efedb9e..e9a8021ede 100644
--- a/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWQuasiUniformSurfaceAndRationalBSplineSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWQuasiUniformSurfaceAndRationalBSplineSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable QuasiUniformSurfaceAndRationalBSplineSurface from StepGeom);
+	              ach : in out Check; ent : QuasiUniformSurfaceAndRationalBSplineSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : QuasiUniformSurfaceAndRationalBSplineSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.cdl b/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.cdl
index e656893787..b7df95187a 100644
--- a/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWRationalBSplineCurve.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWRationalBSplineCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RationalBSplineCurve from StepGeom);
+	              ach : in out Check; ent : RationalBSplineCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : RationalBSplineCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.cdl b/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.cdl
index 533beabd1b..b06eb0c891 100644
--- a/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWRationalBSplineSurface.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWRationalBSplineSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RationalBSplineSurface from StepGeom);
+	              ach : in out Check; ent : RationalBSplineSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : RationalBSplineSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.cdl b/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.cdl
index a69d66f146..357473d5e2 100644
--- a/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWRectangularCompositeSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRectangularCompositeSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RectangularCompositeSurface from StepGeom);
+	              ach : in out Check; ent : RectangularCompositeSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : RectangularCompositeSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.cdl b/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.cdl
index f42b7534ea..8e86f1de87 100644
--- a/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWRectangularTrimmedSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRectangularTrimmedSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RectangularTrimmedSurface from StepGeom);
+	              ach : in out Check; ent : RectangularTrimmedSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : RectangularTrimmedSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.cdl b/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.cdl
index 4e7149a4f1..f71905a3d6 100644
--- a/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWReparametrisedCompositeCurveSegment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWReparametrisedCompositeCurveSegment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ReparametrisedCompositeCurveSegment from StepGeom);
+	              ach : in out Check; ent : ReparametrisedCompositeCurveSegment from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : ReparametrisedCompositeCurveSegment from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSeamCurve.cdl b/src/RWStepGeom/RWStepGeom_RWSeamCurve.cdl
index 99a6100677..b8c7f23521 100644
--- a/src/RWStepGeom/RWStepGeom_RWSeamCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSeamCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSeamCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SeamCurve from StepGeom);
+	              ach : in out Check; ent : SeamCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : SeamCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSphericalSurface.cdl b/src/RWStepGeom/RWStepGeom_RWSphericalSurface.cdl
index 80bc7b7e07..728611d52e 100644
--- a/src/RWStepGeom/RWStepGeom_RWSphericalSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSphericalSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSphericalSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SphericalSurface from StepGeom);
+	              ach : in out Check; ent : SphericalSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : SphericalSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurface.cdl b/src/RWStepGeom/RWStepGeom_RWSurface.cdl
index 7fa525f9ed..ebeb1279ca 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSurface.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Surface from StepGeom);
+	              ach : in out Check; ent : Surface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Surface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cdl b/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cdl
index 5054a5329c..34cbf2848b 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceCurve from StepGeom);
+	              ach : in out Check; ent : SurfaceCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.cdl b/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.cdl
index cab5783348..0211093c95 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceCurveAndBoundedCurve.cdl
@@ -30,7 +30,7 @@ is
     Create returns RWSurfaceCurveAndBoundedCurve;
     
     ReadStep (me; data : StepReaderData; num : Integer;
-	          ach : in out Check; ent : mutable SurfaceCurveAndBoundedCurve from StepGeom);
+	          ach : in out Check; ent : SurfaceCurveAndBoundedCurve from StepGeom);
 
     WriteStep (me; SW : in out StepWriter; ent : SurfaceCurveAndBoundedCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.cdl b/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.cdl
index 8a860a7cd2..cca4b112e0 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceOfLinearExtrusion.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceOfLinearExtrusion;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceOfLinearExtrusion from StepGeom);
+	              ach : in out Check; ent : SurfaceOfLinearExtrusion from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceOfLinearExtrusion from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.cdl b/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.cdl
index 3a7f6aef12..e1bad8e12f 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceOfRevolution.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceOfRevolution;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceOfRevolution from StepGeom);
+	              ach : in out Check; ent : SurfaceOfRevolution from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceOfRevolution from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfacePatch.cdl b/src/RWStepGeom/RWStepGeom_RWSurfacePatch.cdl
index 1f0bfef0f4..fff2bf9f55 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfacePatch.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSurfacePatch.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfacePatch;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfacePatch from StepGeom);
+	              ach : in out Check; ent : SurfacePatch from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfacePatch from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.cdl b/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.cdl
index 6802b4b574..badd9e2c5e 100644
--- a/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSurfaceReplica.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceReplica;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceReplica from StepGeom);
+	              ach : in out Check; ent : SurfaceReplica from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceReplica from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWSweptSurface.cdl b/src/RWStepGeom/RWStepGeom_RWSweptSurface.cdl
index 11670cbf56..97a0407387 100644
--- a/src/RWStepGeom/RWStepGeom_RWSweptSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWSweptSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSweptSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SweptSurface from StepGeom);
+	              ach : in out Check; ent : SweptSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : SweptSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWToroidalSurface.cdl b/src/RWStepGeom/RWStepGeom_RWToroidalSurface.cdl
index e380695212..c50b11a421 100644
--- a/src/RWStepGeom/RWStepGeom_RWToroidalSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWToroidalSurface.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWToroidalSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ToroidalSurface from StepGeom);
+	              ach : in out Check; ent : ToroidalSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : ToroidalSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cdl b/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cdl
index 534fcc6048..41bcb6c32e 100644
--- a/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWTrimmedCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTrimmedCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TrimmedCurve from StepGeom);
+	              ach : in out Check; ent : TrimmedCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : TrimmedCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformCurve.cdl b/src/RWStepGeom/RWStepGeom_RWUniformCurve.cdl
index 97424499bb..c28be99f67 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWUniformCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWUniformCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable UniformCurve from StepGeom);
+	              ach : in out Check; ent : UniformCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : UniformCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cdl b/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cdl
index 1533f55e4a..519cb5e3aa 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWUniformCurveAndRationalBSplineCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWUniformCurveAndRationalBSplineCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable UniformCurveAndRationalBSplineCurve from StepGeom);
+	              ach : in out Check; ent : UniformCurveAndRationalBSplineCurve from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : UniformCurveAndRationalBSplineCurve from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformSurface.cdl b/src/RWStepGeom/RWStepGeom_RWUniformSurface.cdl
index 281225ed19..9279c70dc2 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWUniformSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWUniformSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable UniformSurface from StepGeom);
+	              ach : in out Check; ent : UniformSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : UniformSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cdl b/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cdl
index d72b8317ef..ac3ce00edf 100644
--- a/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWUniformSurfaceAndRationalBSplineSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWUniformSurfaceAndRationalBSplineSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable UniformSurfaceAndRationalBSplineSurface from StepGeom);
+	              ach : in out Check; ent : UniformSurfaceAndRationalBSplineSurface from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : UniformSurfaceAndRationalBSplineSurface from StepGeom);
 
diff --git a/src/RWStepGeom/RWStepGeom_RWVector.cdl b/src/RWStepGeom/RWStepGeom_RWVector.cdl
index 53bfd3a9d5..47dc7c107c 100644
--- a/src/RWStepGeom/RWStepGeom_RWVector.cdl
+++ b/src/RWStepGeom/RWStepGeom_RWVector.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWVector;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Vector from StepGeom);
+	              ach : in out Check; ent : Vector from StepGeom);
 
 	WriteStep (me; SW : in out StepWriter; ent : Vector from StepGeom);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.cdl b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.cdl
index 9cb3ae34b4..6de6b196f7 100644
--- a/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWAssemblyComponentUsageSubstitute.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAssemblyComponentUsageSubstitute;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AssemblyComponentUsageSubstitute from StepRepr);
+	              ach : in out Check; ent : AssemblyComponentUsageSubstitute from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : AssemblyComponentUsageSubstitute from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.cdl b/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.cdl
index 51f23e1398..29093f9a2e 100644
--- a/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWCompoundRepresentationItem.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCompoundRepresentationItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CompoundRepresentationItem from StepRepr);
+	              ach : in out Check; ent : CompoundRepresentationItem from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : CompoundRepresentationItem from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.cdl b/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.cdl
index b698021673..32dd175f27 100644
--- a/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWDefinitionalRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWDefinitionalRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DefinitionalRepresentation from StepRepr);
+	              ach : in out Check; ent : DefinitionalRepresentation from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : DefinitionalRepresentation from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cdl b/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cdl
index 332f89a0ca..04f7b7c135 100644
--- a/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWDescriptiveRepresentationItem.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWDescriptiveRepresentationItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DescriptiveRepresentationItem from StepRepr);
+	              ach : in out Check; ent : DescriptiveRepresentationItem from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : DescriptiveRepresentationItem from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.cdl b/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.cdl
index 280cfeb391..c3e9c9138c 100644
--- a/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWFunctionallyDefinedTransformation.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWFunctionallyDefinedTransformation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FunctionallyDefinedTransformation from StepRepr);
+	              ach : in out Check; ent : FunctionallyDefinedTransformation from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : FunctionallyDefinedTransformation from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.cdl b/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.cdl
index 481b876a34..df7e73aa5c 100644
--- a/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWGlobalUncertaintyAssignedContext.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWGlobalUncertaintyAssignedContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GlobalUncertaintyAssignedContext from StepRepr);
+	              ach : in out Check; ent : GlobalUncertaintyAssignedContext from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : GlobalUncertaintyAssignedContext from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.cdl b/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.cdl
index 1972e4af9f..b261a58aed 100644
--- a/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWGlobalUnitAssignedContext.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWGlobalUnitAssignedContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GlobalUnitAssignedContext from StepRepr);
+	              ach : in out Check; ent : GlobalUnitAssignedContext from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : GlobalUnitAssignedContext from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.cdl b/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.cdl
index db0037c35c..4b15b85c2b 100644
--- a/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWItemDefinedTransformation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWItemDefinedTransformation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ItemDefinedTransformation from StepRepr);
+	              ach : in out Check; ent : ItemDefinedTransformation from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : ItemDefinedTransformation from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMappedItem.cdl b/src/RWStepRepr/RWStepRepr_RWMappedItem.cdl
index f9e9aaa212..d8e84fd741 100644
--- a/src/RWStepRepr/RWStepRepr_RWMappedItem.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWMappedItem.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWMappedItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable MappedItem from StepRepr);
+	              ach : in out Check; ent : MappedItem from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : MappedItem from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.cdl b/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.cdl
index 9e5380b86b..ffb7e5dba9 100644
--- a/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWMaterialDesignation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWMaterialDesignation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable MaterialDesignation from StepRepr);
+	              ach : in out Check; ent : MaterialDesignation from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : MaterialDesignation from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.cdl b/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.cdl
index f77c66c263..cc8d1b4bd3 100644
--- a/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWMeasureRepresentationItem.cdl
@@ -29,7 +29,7 @@ is
     Create returns RWMeasureRepresentationItem;
 
     ReadStep (me; data : StepReaderData; num : Integer;
-	          ach : in out Check; ent : mutable MeasureRepresentationItem from StepRepr);
+	          ach : in out Check; ent : MeasureRepresentationItem from StepRepr);
 
     WriteStep (me; SW : in out StepWriter; ent : MeasureRepresentationItem from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.cdl b/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.cdl
index 57fabc9a07..05be1d56af 100644
--- a/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWParametricRepresentationContext.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWParametricRepresentationContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ParametricRepresentationContext from StepRepr);
+	              ach : in out Check; ent : ParametricRepresentationContext from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : ParametricRepresentationContext from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cdl b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cdl
index f44bfa70ce..b5fe470321 100644
--- a/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWReprItemAndLengthMeasureWithUnit.cdl
@@ -27,7 +27,7 @@ is
 	Create returns RWReprItemAndLengthMeasureWithUnit;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ReprItemAndLengthMeasureWithUnit from StepRepr);
+	              ach : in out Check; ent : ReprItemAndLengthMeasureWithUnit from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : ReprItemAndLengthMeasureWithUnit from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentation.cdl b/src/RWStepRepr/RWStepRepr_RWRepresentation.cdl
index 86d3ae260a..5a3defdaed 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentation.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Representation from StepRepr);
+	              ach : in out Check; ent : Representation from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : Representation from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationContext.cdl b/src/RWStepRepr/RWStepRepr_RWRepresentationContext.cdl
index c131dc33c3..2506308d1e 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationContext.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationContext.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWRepresentationContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RepresentationContext from StepRepr);
+	              ach : in out Check; ent : RepresentationContext from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : RepresentationContext from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationItem.cdl b/src/RWStepRepr/RWStepRepr_RWRepresentationItem.cdl
index b067108aaf..dc3c7d1e41 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationItem.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationItem.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWRepresentationItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RepresentationItem from StepRepr);
+	              ach : in out Check; ent : RepresentationItem from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : RepresentationItem from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationMap.cdl b/src/RWStepRepr/RWStepRepr_RWRepresentationMap.cdl
index 413cdb6eb2..af4bd67703 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationMap.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationMap.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRepresentationMap;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RepresentationMap from StepRepr);
+	              ach : in out Check; ent : RepresentationMap from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : RepresentationMap from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.cdl b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.cdl
index 5e6f6491c4..5fb804d5c7 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationship.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRepresentationRelationship;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RepresentationRelationship from StepRepr);
+	              ach : in out Check; ent : RepresentationRelationship from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : RepresentationRelationship from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.cdl b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.cdl
index 9051d47b47..45e64f1257 100644
--- a/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWRepresentationRelationshipWithTransformation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRepresentationRelationshipWithTransformation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RepresentationRelationshipWithTransformation from StepRepr);
+	              ach : in out Check; ent : RepresentationRelationshipWithTransformation from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : RepresentationRelationshipWithTransformation from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeAspect.cdl b/src/RWStepRepr/RWStepRepr_RWShapeAspect.cdl
index 5716ef6a69..afbc2fb35e 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeAspect.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWShapeAspect.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWShapeAspect;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ShapeAspect from StepRepr);
+	              ach : in out Check; ent : ShapeAspect from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : ShapeAspect from StepRepr);
 
diff --git a/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cdl b/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cdl
index c791bd7189..39e7ec0c4a 100644
--- a/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cdl
+++ b/src/RWStepRepr/RWStepRepr_RWShapeRepresentationRelationshipWithTransformation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWShapeRepresentationRelationshipWithTransformation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ShapeRepresentationRelationshipWithTransformation from StepRepr);
+	              ach : in out Check; ent : ShapeRepresentationRelationshipWithTransformation from StepRepr);
 
 	WriteStep (me; SW : in out StepWriter; ent : ShapeRepresentationRelationshipWithTransformation from StepRepr);
 
diff --git a/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.cdl
index c67dc99664..bcb68dc01e 100644
--- a/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWAdvancedBrepShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAdvancedBrepShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AdvancedBrepShapeRepresentation from StepShape);
+	              ach : in out Check; ent : AdvancedBrepShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : AdvancedBrepShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWAdvancedFace.cdl b/src/RWStepShape/RWStepShape_RWAdvancedFace.cdl
index 94f76a4a34..14c7aa2b09 100644
--- a/src/RWStepShape/RWStepShape_RWAdvancedFace.cdl
+++ b/src/RWStepShape/RWStepShape_RWAdvancedFace.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAdvancedFace;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AdvancedFace from StepShape);
+	              ach : in out Check; ent : AdvancedFace from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : AdvancedFace from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWBlock.cdl b/src/RWStepShape/RWStepShape_RWBlock.cdl
index 24323e0e93..c211d6aee0 100644
--- a/src/RWStepShape/RWStepShape_RWBlock.cdl
+++ b/src/RWStepShape/RWStepShape_RWBlock.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBlock;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Block from StepShape);
+	              ach : in out Check; ent : Block from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : Block from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWBooleanResult.cdl b/src/RWStepShape/RWStepShape_RWBooleanResult.cdl
index df43b19457..36aa7c2045 100644
--- a/src/RWStepShape/RWStepShape_RWBooleanResult.cdl
+++ b/src/RWStepShape/RWStepShape_RWBooleanResult.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBooleanResult;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BooleanResult from StepShape);
+	              ach : in out Check; ent : BooleanResult from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : BooleanResult from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWBoxDomain.cdl b/src/RWStepShape/RWStepShape_RWBoxDomain.cdl
index 69c6dd9c5c..ec8079bc23 100644
--- a/src/RWStepShape/RWStepShape_RWBoxDomain.cdl
+++ b/src/RWStepShape/RWStepShape_RWBoxDomain.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBoxDomain;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BoxDomain from StepShape);
+	              ach : in out Check; ent : BoxDomain from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : BoxDomain from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.cdl b/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.cdl
index 4eaf0910ad..f03dc3a43b 100644
--- a/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.cdl
+++ b/src/RWStepShape/RWStepShape_RWBoxedHalfSpace.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBoxedHalfSpace;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BoxedHalfSpace from StepShape);
+	              ach : in out Check; ent : BoxedHalfSpace from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : BoxedHalfSpace from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWBrepWithVoids.cdl b/src/RWStepShape/RWStepShape_RWBrepWithVoids.cdl
index 6e2d66269e..6113687723 100644
--- a/src/RWStepShape/RWStepShape_RWBrepWithVoids.cdl
+++ b/src/RWStepShape/RWStepShape_RWBrepWithVoids.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWBrepWithVoids;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BrepWithVoids from StepShape);
+	              ach : in out Check; ent : BrepWithVoids from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : BrepWithVoids from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWClosedShell.cdl b/src/RWStepShape/RWStepShape_RWClosedShell.cdl
index 54081a23cc..9f7c3cc518 100644
--- a/src/RWStepShape/RWStepShape_RWClosedShell.cdl
+++ b/src/RWStepShape/RWStepShape_RWClosedShell.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWClosedShell;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ClosedShell from StepShape);
+	              ach : in out Check; ent : ClosedShell from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ClosedShell from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWConnectedFaceSet.cdl b/src/RWStepShape/RWStepShape_RWConnectedFaceSet.cdl
index ecd47d0d28..f813189c64 100644
--- a/src/RWStepShape/RWStepShape_RWConnectedFaceSet.cdl
+++ b/src/RWStepShape/RWStepShape_RWConnectedFaceSet.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWConnectedFaceSet;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ConnectedFaceSet from StepShape);
+	              ach : in out Check; ent : ConnectedFaceSet from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ConnectedFaceSet from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.cdl
index 17f03bd45a..5823344c53 100644
--- a/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWContextDependentShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
     Create returns RWContextDependentShapeRepresentation;
 
     ReadStep (me; data : StepReaderData; num : Integer; ach : in out Check;
-                  ent : mutable ContextDependentShapeRepresentation from StepShape);
+                  ent : ContextDependentShapeRepresentation from StepShape);
 
     WriteStep (me; SW : in out StepWriter; ent : ContextDependentShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.cdl
index 376420ad92..7fdbf93b16 100644
--- a/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWCsgShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCsgShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CsgShapeRepresentation from StepShape);
+	              ach : in out Check; ent : CsgShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : CsgShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWCsgSolid.cdl b/src/RWStepShape/RWStepShape_RWCsgSolid.cdl
index 48cb67c4e6..354583b0a6 100644
--- a/src/RWStepShape/RWStepShape_RWCsgSolid.cdl
+++ b/src/RWStepShape/RWStepShape_RWCsgSolid.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCsgSolid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CsgSolid from StepShape);
+	              ach : in out Check; ent : CsgSolid from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : CsgSolid from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cdl
index 299ef176d3..6d34dc5774 100644
--- a/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWDefinitionalRepresentationAndShapeRepresentation.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWDefinitionalRepresentationAndShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DefinitionalRepresentationAndShapeRepresentation from StepShape);
+	              ach : in out Check; ent : DefinitionalRepresentationAndShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : DefinitionalRepresentationAndShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWEdge.cdl b/src/RWStepShape/RWStepShape_RWEdge.cdl
index 6ba6a0036d..21931522cb 100644
--- a/src/RWStepShape/RWStepShape_RWEdge.cdl
+++ b/src/RWStepShape/RWStepShape_RWEdge.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWEdge;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Edge from StepShape);
+	              ach : in out Check; ent : Edge from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : Edge from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWEdgeCurve.cdl b/src/RWStepShape/RWStepShape_RWEdgeCurve.cdl
index e66beca3a6..103c0d6dbf 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeCurve.cdl
+++ b/src/RWStepShape/RWStepShape_RWEdgeCurve.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWEdgeCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable EdgeCurve from StepShape);
+	              ach : in out Check; ent : EdgeCurve from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : EdgeCurve from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWEdgeLoop.cdl b/src/RWStepShape/RWStepShape_RWEdgeLoop.cdl
index 1a8547d635..afbac80608 100644
--- a/src/RWStepShape/RWStepShape_RWEdgeLoop.cdl
+++ b/src/RWStepShape/RWStepShape_RWEdgeLoop.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWEdgeLoop;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable EdgeLoop from StepShape);
+	              ach : in out Check; ent : EdgeLoop from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : EdgeLoop from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.cdl b/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.cdl
index e93ee60f39..b7f9fe3b96 100644
--- a/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.cdl
+++ b/src/RWStepShape/RWStepShape_RWExtrudedAreaSolid.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWExtrudedAreaSolid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ExtrudedAreaSolid from StepShape);
+	              ach : in out Check; ent : ExtrudedAreaSolid from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ExtrudedAreaSolid from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.cdl b/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.cdl
index 625d5b30f4..703f0e2b35 100644
--- a/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.cdl
+++ b/src/RWStepShape/RWStepShape_RWExtrudedFaceSolid.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWExtrudedFaceSolid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ExtrudedFaceSolid from StepShape);
+	              ach : in out Check; ent : ExtrudedFaceSolid from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ExtrudedFaceSolid from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWFace.cdl b/src/RWStepShape/RWStepShape_RWFace.cdl
index b9ea8617b8..87043e16bb 100644
--- a/src/RWStepShape/RWStepShape_RWFace.cdl
+++ b/src/RWStepShape/RWStepShape_RWFace.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWFace;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Face from StepShape);
+	              ach : in out Check; ent : Face from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : Face from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWFaceBound.cdl b/src/RWStepShape/RWStepShape_RWFaceBound.cdl
index a2d575d1de..af28657be0 100644
--- a/src/RWStepShape/RWStepShape_RWFaceBound.cdl
+++ b/src/RWStepShape/RWStepShape_RWFaceBound.cdl
@@ -30,7 +30,7 @@ is
 	Create returns RWFaceBound;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FaceBound from StepShape);
+	              ach : in out Check; ent : FaceBound from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : FaceBound from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWFaceOuterBound.cdl b/src/RWStepShape/RWStepShape_RWFaceOuterBound.cdl
index 4a8b09a58a..5636179518 100644
--- a/src/RWStepShape/RWStepShape_RWFaceOuterBound.cdl
+++ b/src/RWStepShape/RWStepShape_RWFaceOuterBound.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWFaceOuterBound;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FaceOuterBound from StepShape);
+	              ach : in out Check; ent : FaceOuterBound from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : FaceOuterBound from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWFaceSurface.cdl b/src/RWStepShape/RWStepShape_RWFaceSurface.cdl
index 366b023f60..d9a513ff3a 100644
--- a/src/RWStepShape/RWStepShape_RWFaceSurface.cdl
+++ b/src/RWStepShape/RWStepShape_RWFaceSurface.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWFaceSurface;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FaceSurface from StepShape);
+	              ach : in out Check; ent : FaceSurface from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : FaceSurface from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrep.cdl b/src/RWStepShape/RWStepShape_RWFacetedBrep.cdl
index ce624fd297..63b6b446e4 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrep.cdl
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrep.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWFacetedBrep;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FacetedBrep from StepShape);
+	              ach : in out Check; ent : FacetedBrep from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : FacetedBrep from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.cdl b/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.cdl
index e57ba78218..b058f54c0e 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.cdl
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrepAndBrepWithVoids.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWFacetedBrepAndBrepWithVoids;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FacetedBrepAndBrepWithVoids from StepShape);
+	              ach : in out Check; ent : FacetedBrepAndBrepWithVoids from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : FacetedBrepAndBrepWithVoids from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.cdl
index 2f306e9236..af9b9f344c 100644
--- a/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWFacetedBrepShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWFacetedBrepShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FacetedBrepShapeRepresentation from StepShape);
+	              ach : in out Check; ent : FacetedBrepShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : FacetedBrepShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWGeometricCurveSet.cdl b/src/RWStepShape/RWStepShape_RWGeometricCurveSet.cdl
index ec18c467e4..3a9ad5be1c 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricCurveSet.cdl
+++ b/src/RWStepShape/RWStepShape_RWGeometricCurveSet.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWGeometricCurveSet;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GeometricCurveSet from StepShape);
+	              ach : in out Check; ent : GeometricCurveSet from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : GeometricCurveSet from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWGeometricSet.cdl b/src/RWStepShape/RWStepShape_RWGeometricSet.cdl
index 804dab1145..189f61e9c5 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricSet.cdl
+++ b/src/RWStepShape/RWStepShape_RWGeometricSet.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWGeometricSet;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GeometricSet from StepShape);
+	              ach : in out Check; ent : GeometricSet from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : GeometricSet from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cdl
index d543b9489e..d16d9f5e8b 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedSurfaceShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWGeometricallyBoundedSurfaceShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GeometricallyBoundedSurfaceShapeRepresentation from StepShape);
+	              ach : in out Check; ent : GeometricallyBoundedSurfaceShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : GeometricallyBoundedSurfaceShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cdl
index 2d8d9389c4..89e9f3d9fd 100644
--- a/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWGeometricallyBoundedWireframeShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWGeometricallyBoundedWireframeShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable GeometricallyBoundedWireframeShapeRepresentation from StepShape);
+	              ach : in out Check; ent : GeometricallyBoundedWireframeShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : GeometricallyBoundedWireframeShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.cdl b/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.cdl
index 8fe75753f7..a10545c0e3 100644
--- a/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.cdl
+++ b/src/RWStepShape/RWStepShape_RWHalfSpaceSolid.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWHalfSpaceSolid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable HalfSpaceSolid from StepShape);
+	              ach : in out Check; ent : HalfSpaceSolid from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : HalfSpaceSolid from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWLimitsAndFits.cdl b/src/RWStepShape/RWStepShape_RWLimitsAndFits.cdl
index ab9ee2db71..212de3c69b 100644
--- a/src/RWStepShape/RWStepShape_RWLimitsAndFits.cdl
+++ b/src/RWStepShape/RWStepShape_RWLimitsAndFits.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWLimitsAndFits;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable LimitsAndFits from StepShape);
+	              ach : in out Check; ent : LimitsAndFits from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : LimitsAndFits from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWLoop.cdl b/src/RWStepShape/RWStepShape_RWLoop.cdl
index 48d2d4c00e..858915c868 100644
--- a/src/RWStepShape/RWStepShape_RWLoop.cdl
+++ b/src/RWStepShape/RWStepShape_RWLoop.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWLoop;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Loop from StepShape);
+	              ach : in out Check; ent : Loop from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : Loop from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWLoopAndPath.cdl b/src/RWStepShape/RWStepShape_RWLoopAndPath.cdl
index 0700a080b5..d1816d4536 100644
--- a/src/RWStepShape/RWStepShape_RWLoopAndPath.cdl
+++ b/src/RWStepShape/RWStepShape_RWLoopAndPath.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWLoopAndPath;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable LoopAndPath from StepShape);
+	              ach : in out Check; ent : LoopAndPath from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : LoopAndPath from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cdl b/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cdl
index b88796414c..ba57ed3012 100644
--- a/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cdl
+++ b/src/RWStepShape/RWStepShape_RWManifoldSolidBrep.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWManifoldSolidBrep;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ManifoldSolidBrep from StepShape);
+	              ach : in out Check; ent : ManifoldSolidBrep from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ManifoldSolidBrep from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.cdl
index 9bbbcb2095..d959352c7a 100644
--- a/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWManifoldSurfaceShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWManifoldSurfaceShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ManifoldSurfaceShapeRepresentation from StepShape);
+	              ach : in out Check; ent : ManifoldSurfaceShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ManifoldSurfaceShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWMeasureQualification.cdl b/src/RWStepShape/RWStepShape_RWMeasureQualification.cdl
index ef9ed6f2e6..42cea87aaa 100644
--- a/src/RWStepShape/RWStepShape_RWMeasureQualification.cdl
+++ b/src/RWStepShape/RWStepShape_RWMeasureQualification.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWMeasureQualification;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable MeasureQualification from StepShape);
+	              ach : in out Check; ent : MeasureQualification from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : MeasureQualification from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cdl b/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cdl
index 95d3db3f4f..7efdde4c9e 100644
--- a/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cdl
+++ b/src/RWStepShape/RWStepShape_RWMeasureRepresentationItemAndQualifiedRepresentationItem.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWMeasureRepresentationItemAndQualifiedRepresentationItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable MeasureRepresentationItemAndQualifiedRepresentationItem from StepShape);
+	              ach : in out Check; ent : MeasureRepresentationItemAndQualifiedRepresentationItem from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : MeasureRepresentationItemAndQualifiedRepresentationItem from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWOpenShell.cdl b/src/RWStepShape/RWStepShape_RWOpenShell.cdl
index 3931f8cb9e..46aeee6031 100644
--- a/src/RWStepShape/RWStepShape_RWOpenShell.cdl
+++ b/src/RWStepShape/RWStepShape_RWOpenShell.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOpenShell;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OpenShell from StepShape);
+	              ach : in out Check; ent : OpenShell from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : OpenShell from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedClosedShell.cdl b/src/RWStepShape/RWStepShape_RWOrientedClosedShell.cdl
index bf3a40dbf3..92b8bcab30 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedClosedShell.cdl
+++ b/src/RWStepShape/RWStepShape_RWOrientedClosedShell.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOrientedClosedShell;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OrientedClosedShell from StepShape);
+	              ach : in out Check; ent : OrientedClosedShell from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : OrientedClosedShell from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedEdge.cdl b/src/RWStepShape/RWStepShape_RWOrientedEdge.cdl
index 4e073774c9..26977af588 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedEdge.cdl
+++ b/src/RWStepShape/RWStepShape_RWOrientedEdge.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOrientedEdge;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OrientedEdge from StepShape);
+	              ach : in out Check; ent : OrientedEdge from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : OrientedEdge from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedFace.cdl b/src/RWStepShape/RWStepShape_RWOrientedFace.cdl
index ffd274b096..af5d1e4c3a 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedFace.cdl
+++ b/src/RWStepShape/RWStepShape_RWOrientedFace.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOrientedFace;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OrientedFace from StepShape);
+	              ach : in out Check; ent : OrientedFace from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : OrientedFace from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedOpenShell.cdl b/src/RWStepShape/RWStepShape_RWOrientedOpenShell.cdl
index 03d6e2d950..3e193a506a 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedOpenShell.cdl
+++ b/src/RWStepShape/RWStepShape_RWOrientedOpenShell.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOrientedOpenShell;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OrientedOpenShell from StepShape);
+	              ach : in out Check; ent : OrientedOpenShell from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : OrientedOpenShell from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWOrientedPath.cdl b/src/RWStepShape/RWStepShape_RWOrientedPath.cdl
index 19dafffbc0..34d399cf7b 100644
--- a/src/RWStepShape/RWStepShape_RWOrientedPath.cdl
+++ b/src/RWStepShape/RWStepShape_RWOrientedPath.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOrientedPath;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OrientedPath from StepShape);
+	              ach : in out Check; ent : OrientedPath from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : OrientedPath from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWPath.cdl b/src/RWStepShape/RWStepShape_RWPath.cdl
index 73201e3046..32990f7d0b 100644
--- a/src/RWStepShape/RWStepShape_RWPath.cdl
+++ b/src/RWStepShape/RWStepShape_RWPath.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPath;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Path from StepShape);
+	              ach : in out Check; ent : Path from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : Path from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.cdl b/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.cdl
index 5cf770ab01..08a76126b4 100644
--- a/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.cdl
+++ b/src/RWStepShape/RWStepShape_RWPlusMinusTolerance.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPlusMinusTolerance;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PlusMinusTolerance from StepShape);
+	              ach : in out Check; ent : PlusMinusTolerance from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : PlusMinusTolerance from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWPolyLoop.cdl b/src/RWStepShape/RWStepShape_RWPolyLoop.cdl
index df770d88a6..686e80fded 100644
--- a/src/RWStepShape/RWStepShape_RWPolyLoop.cdl
+++ b/src/RWStepShape/RWStepShape_RWPolyLoop.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPolyLoop;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PolyLoop from StepShape);
+	              ach : in out Check; ent : PolyLoop from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : PolyLoop from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWPrecisionQualifier.cdl b/src/RWStepShape/RWStepShape_RWPrecisionQualifier.cdl
index 78e4236292..ef96fb69bf 100644
--- a/src/RWStepShape/RWStepShape_RWPrecisionQualifier.cdl
+++ b/src/RWStepShape/RWStepShape_RWPrecisionQualifier.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPrecisionQualifier;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PrecisionQualifier from StepShape);
+	              ach : in out Check; ent : PrecisionQualifier from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : PrecisionQualifier from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.cdl b/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.cdl
index c56170e9ca..03d5397323 100644
--- a/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.cdl
+++ b/src/RWStepShape/RWStepShape_RWQualifiedRepresentationItem.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWQualifiedRepresentationItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable QualifiedRepresentationItem from StepShape);
+	              ach : in out Check; ent : QualifiedRepresentationItem from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : QualifiedRepresentationItem from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.cdl b/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.cdl
index 2b7f5d035a..4ba3a4a0cc 100644
--- a/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.cdl
+++ b/src/RWStepShape/RWStepShape_RWRevolvedAreaSolid.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRevolvedAreaSolid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RevolvedAreaSolid from StepShape);
+	              ach : in out Check; ent : RevolvedAreaSolid from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : RevolvedAreaSolid from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.cdl b/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.cdl
index b0dd9e5570..1f98957795 100644
--- a/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.cdl
+++ b/src/RWStepShape/RWStepShape_RWRevolvedFaceSolid.cdl
@@ -30,7 +30,7 @@ is
     	Create returns RWRevolvedFaceSolid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RevolvedFaceSolid from StepShape);
+	              ach : in out Check; ent : RevolvedFaceSolid from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : RevolvedFaceSolid from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWRightAngularWedge.cdl b/src/RWStepShape/RWStepShape_RWRightAngularWedge.cdl
index 3fd9855080..760a477795 100644
--- a/src/RWStepShape/RWStepShape_RWRightAngularWedge.cdl
+++ b/src/RWStepShape/RWStepShape_RWRightAngularWedge.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRightAngularWedge;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RightAngularWedge from StepShape);
+	              ach : in out Check; ent : RightAngularWedge from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : RightAngularWedge from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWRightCircularCone.cdl b/src/RWStepShape/RWStepShape_RWRightCircularCone.cdl
index 73693f724b..ca4f42f198 100644
--- a/src/RWStepShape/RWStepShape_RWRightCircularCone.cdl
+++ b/src/RWStepShape/RWStepShape_RWRightCircularCone.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRightCircularCone;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RightCircularCone from StepShape);
+	              ach : in out Check; ent : RightCircularCone from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : RightCircularCone from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWRightCircularCylinder.cdl b/src/RWStepShape/RWStepShape_RWRightCircularCylinder.cdl
index a1d422ac0f..0b4620c6da 100644
--- a/src/RWStepShape/RWStepShape_RWRightCircularCylinder.cdl
+++ b/src/RWStepShape/RWStepShape_RWRightCircularCylinder.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWRightCircularCylinder;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable RightCircularCylinder from StepShape);
+	              ach : in out Check; ent : RightCircularCylinder from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : RightCircularCylinder from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWShapeRepresentation.cdl
index 7210fe81aa..bfa054bf66 100644
--- a/src/RWStepShape/RWStepShape_RWShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ShapeRepresentation from StepShape);
+	              ach : in out Check; ent : ShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.cdl b/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.cdl
index a8180fb864..546816d2fa 100644
--- a/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.cdl
+++ b/src/RWStepShape/RWStepShape_RWShellBasedSurfaceModel.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWShellBasedSurfaceModel;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ShellBasedSurfaceModel from StepShape);
+	              ach : in out Check; ent : ShellBasedSurfaceModel from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ShellBasedSurfaceModel from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWSolidModel.cdl b/src/RWStepShape/RWStepShape_RWSolidModel.cdl
index 9427f4ba8d..7efb6cb268 100644
--- a/src/RWStepShape/RWStepShape_RWSolidModel.cdl
+++ b/src/RWStepShape/RWStepShape_RWSolidModel.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWSolidModel;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SolidModel from StepShape);
+	              ach : in out Check; ent : SolidModel from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : SolidModel from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWSolidReplica.cdl b/src/RWStepShape/RWStepShape_RWSolidReplica.cdl
index 3344e3c526..bbc7362fb6 100644
--- a/src/RWStepShape/RWStepShape_RWSolidReplica.cdl
+++ b/src/RWStepShape/RWStepShape_RWSolidReplica.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSolidReplica;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SolidReplica from StepShape);
+	              ach : in out Check; ent : SolidReplica from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : SolidReplica from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWSphere.cdl b/src/RWStepShape/RWStepShape_RWSphere.cdl
index 26dfed77e1..c89e947158 100644
--- a/src/RWStepShape/RWStepShape_RWSphere.cdl
+++ b/src/RWStepShape/RWStepShape_RWSphere.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSphere;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Sphere from StepShape);
+	              ach : in out Check; ent : Sphere from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : Sphere from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWSweptAreaSolid.cdl b/src/RWStepShape/RWStepShape_RWSweptAreaSolid.cdl
index c170342a09..a9dbc1c3a9 100644
--- a/src/RWStepShape/RWStepShape_RWSweptAreaSolid.cdl
+++ b/src/RWStepShape/RWStepShape_RWSweptAreaSolid.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSweptAreaSolid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SweptAreaSolid from StepShape);
+	              ach : in out Check; ent : SweptAreaSolid from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : SweptAreaSolid from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWSweptFaceSolid.cdl b/src/RWStepShape/RWStepShape_RWSweptFaceSolid.cdl
index 2a77a9150e..824da8d4c3 100644
--- a/src/RWStepShape/RWStepShape_RWSweptFaceSolid.cdl
+++ b/src/RWStepShape/RWStepShape_RWSweptFaceSolid.cdl
@@ -30,7 +30,7 @@ is
     	Create returns RWSweptFaceSolid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SweptFaceSolid from StepShape);
+	              ach : in out Check; ent : SweptFaceSolid from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : SweptFaceSolid from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWToleranceValue.cdl b/src/RWStepShape/RWStepShape_RWToleranceValue.cdl
index 72d41b6cde..c38b9027ae 100644
--- a/src/RWStepShape/RWStepShape_RWToleranceValue.cdl
+++ b/src/RWStepShape/RWStepShape_RWToleranceValue.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWToleranceValue;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ToleranceValue from StepShape);
+	              ach : in out Check; ent : ToleranceValue from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : ToleranceValue from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.cdl b/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.cdl
index dc4b943efd..7026ba6f21 100644
--- a/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.cdl
+++ b/src/RWStepShape/RWStepShape_RWTopologicalRepresentationItem.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWTopologicalRepresentationItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TopologicalRepresentationItem from StepShape);
+	              ach : in out Check; ent : TopologicalRepresentationItem from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : TopologicalRepresentationItem from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWTorus.cdl b/src/RWStepShape/RWStepShape_RWTorus.cdl
index 22fc87186e..7babc176d0 100644
--- a/src/RWStepShape/RWStepShape_RWTorus.cdl
+++ b/src/RWStepShape/RWStepShape_RWTorus.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTorus;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Torus from StepShape);
+	              ach : in out Check; ent : Torus from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : Torus from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.cdl b/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.cdl
index 602df895ec..851d9b6f27 100644
--- a/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.cdl
+++ b/src/RWStepShape/RWStepShape_RWTransitionalShapeRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTransitionalShapeRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TransitionalShapeRepresentation from StepShape);
+	              ach : in out Check; ent : TransitionalShapeRepresentation from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : TransitionalShapeRepresentation from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWTypeQualifier.cdl b/src/RWStepShape/RWStepShape_RWTypeQualifier.cdl
index 5e59323dc6..5c04bba295 100644
--- a/src/RWStepShape/RWStepShape_RWTypeQualifier.cdl
+++ b/src/RWStepShape/RWStepShape_RWTypeQualifier.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWTypeQualifier;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TypeQualifier from StepShape);
+	              ach : in out Check; ent : TypeQualifier from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : TypeQualifier from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWVertex.cdl b/src/RWStepShape/RWStepShape_RWVertex.cdl
index 11e4c958d7..8ce8380097 100644
--- a/src/RWStepShape/RWStepShape_RWVertex.cdl
+++ b/src/RWStepShape/RWStepShape_RWVertex.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWVertex;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Vertex from StepShape);
+	              ach : in out Check; ent : Vertex from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : Vertex from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWVertexLoop.cdl b/src/RWStepShape/RWStepShape_RWVertexLoop.cdl
index 6091574150..d03a586dcf 100644
--- a/src/RWStepShape/RWStepShape_RWVertexLoop.cdl
+++ b/src/RWStepShape/RWStepShape_RWVertexLoop.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWVertexLoop;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable VertexLoop from StepShape);
+	              ach : in out Check; ent : VertexLoop from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : VertexLoop from StepShape);
 
diff --git a/src/RWStepShape/RWStepShape_RWVertexPoint.cdl b/src/RWStepShape/RWStepShape_RWVertexPoint.cdl
index 40299ef403..cb812fafd6 100644
--- a/src/RWStepShape/RWStepShape_RWVertexPoint.cdl
+++ b/src/RWStepShape/RWStepShape_RWVertexPoint.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWVertexPoint;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable VertexPoint from StepShape);
+	              ach : in out Check; ent : VertexPoint from StepShape);
 
 	WriteStep (me; SW : in out StepWriter; ent : VertexPoint from StepShape);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWAreaInSet.cdl b/src/RWStepVisual/RWStepVisual_RWAreaInSet.cdl
index 3349c157ab..816a2a1382 100644
--- a/src/RWStepVisual/RWStepVisual_RWAreaInSet.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWAreaInSet.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWAreaInSet;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable AreaInSet from StepVisual);
+	              ach : in out Check; ent : AreaInSet from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : AreaInSet from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWBackgroundColour.cdl b/src/RWStepVisual/RWStepVisual_RWBackgroundColour.cdl
index e06a6dc647..ecb24687e3 100644
--- a/src/RWStepVisual/RWStepVisual_RWBackgroundColour.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWBackgroundColour.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWBackgroundColour;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable BackgroundColour from StepVisual);
+	              ach : in out Check; ent : BackgroundColour from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : BackgroundColour from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraImage.cdl b/src/RWStepVisual/RWStepVisual_RWCameraImage.cdl
index cf40b81e18..6cffdffe0b 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraImage.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCameraImage.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCameraImage;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CameraImage from StepVisual);
+	              ach : in out Check; ent : CameraImage from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CameraImage from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModel.cdl b/src/RWStepVisual/RWStepVisual_RWCameraModel.cdl
index f39701c205..08d5917c7e 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModel.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModel.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWCameraModel;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CameraModel from StepVisual);
+	              ach : in out Check; ent : CameraModel from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CameraModel from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD2.cdl b/src/RWStepVisual/RWStepVisual_RWCameraModelD2.cdl
index 5251211b11..746a1d8d42 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD2.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD2.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCameraModelD2;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CameraModelD2 from StepVisual);
+	              ach : in out Check; ent : CameraModelD2 from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CameraModelD2 from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraModelD3.cdl b/src/RWStepVisual/RWStepVisual_RWCameraModelD3.cdl
index ccf7eb1a51..70e7baf343 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraModelD3.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCameraModelD3.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCameraModelD3;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CameraModelD3 from StepVisual);
+	              ach : in out Check; ent : CameraModelD3 from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CameraModelD3 from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCameraUsage.cdl b/src/RWStepVisual/RWStepVisual_RWCameraUsage.cdl
index 45108f46eb..b3a24214f7 100644
--- a/src/RWStepVisual/RWStepVisual_RWCameraUsage.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCameraUsage.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCameraUsage;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CameraUsage from StepVisual);
+	              ach : in out Check; ent : CameraUsage from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CameraUsage from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWColour.cdl b/src/RWStepVisual/RWStepVisual_RWColour.cdl
index 5254a44815..c9d24a0a13 100644
--- a/src/RWStepVisual/RWStepVisual_RWColour.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWColour.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWColour;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Colour from StepVisual);
+	              ach : in out Check; ent : Colour from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : Colour from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWColourRgb.cdl b/src/RWStepVisual/RWStepVisual_RWColourRgb.cdl
index 7df4a26870..e942530614 100644
--- a/src/RWStepVisual/RWStepVisual_RWColourRgb.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWColourRgb.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWColourRgb;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ColourRgb from StepVisual);
+	              ach : in out Check; ent : ColourRgb from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : ColourRgb from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWColourSpecification.cdl b/src/RWStepVisual/RWStepVisual_RWColourSpecification.cdl
index 21bcaf6ada..3cb41a7e52 100644
--- a/src/RWStepVisual/RWStepVisual_RWColourSpecification.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWColourSpecification.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWColourSpecification;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ColourSpecification from StepVisual);
+	              ach : in out Check; ent : ColourSpecification from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : ColourSpecification from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCompositeText.cdl b/src/RWStepVisual/RWStepVisual_RWCompositeText.cdl
index 34fed5699a..c09cb80663 100644
--- a/src/RWStepVisual/RWStepVisual_RWCompositeText.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCompositeText.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCompositeText;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CompositeText from StepVisual);
+	              ach : in out Check; ent : CompositeText from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CompositeText from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.cdl b/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.cdl
index b0d88663f6..259c74b85f 100644
--- a/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCompositeTextWithExtent.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCompositeTextWithExtent;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CompositeTextWithExtent from StepVisual);
+	              ach : in out Check; ent : CompositeTextWithExtent from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CompositeTextWithExtent from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.cdl b/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.cdl
index 8e8555ef56..f83bed81a5 100644
--- a/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWContextDependentInvisibility.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWContextDependentInvisibility;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ContextDependentInvisibility from StepVisual);
+	              ach : in out Check; ent : ContextDependentInvisibility from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : ContextDependentInvisibility from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.cdl b/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.cdl
index 3e0f0b4997..b64e5408d4 100644
--- a/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWContextDependentOverRidingStyledItem.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWContextDependentOverRidingStyledItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ContextDependentOverRidingStyledItem from StepVisual);
+	              ach : in out Check; ent : ContextDependentOverRidingStyledItem from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : ContextDependentOverRidingStyledItem from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyle.cdl b/src/RWStepVisual/RWStepVisual_RWCurveStyle.cdl
index 125455947c..e625a70c1e 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyle.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyle.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCurveStyle;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CurveStyle from StepVisual);
+	              ach : in out Check; ent : CurveStyle from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CurveStyle from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.cdl b/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.cdl
index 5b6e8dfd44..d8affd4a27 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyleFont.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWCurveStyleFont;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CurveStyleFont from StepVisual);
+	              ach : in out Check; ent : CurveStyleFont from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CurveStyleFont from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.cdl b/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.cdl
index 820dafc3d1..6e423f271e 100644
--- a/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWCurveStyleFontPattern.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWCurveStyleFontPattern;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable CurveStyleFontPattern from StepVisual);
+	              ach : in out Check; ent : CurveStyleFontPattern from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : CurveStyleFontPattern from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.cdl b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.cdl
index 310c19d514..e59da5e388 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedColour.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWDraughtingPreDefinedColour;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DraughtingPreDefinedColour from StepVisual);
+	              ach : in out Check; ent : DraughtingPreDefinedColour from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : DraughtingPreDefinedColour from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.cdl b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.cdl
index 96f619a501..c8fa033a35 100644
--- a/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWDraughtingPreDefinedCurveFont.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWDraughtingPreDefinedCurveFont;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable DraughtingPreDefinedCurveFont from StepVisual);
+	              ach : in out Check; ent : DraughtingPreDefinedCurveFont from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : DraughtingPreDefinedCurveFont from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.cdl b/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.cdl
index 3190b78c1b..e4599bf44e 100644
--- a/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWFillAreaStyle.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWFillAreaStyle;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FillAreaStyle from StepVisual);
+	              ach : in out Check; ent : FillAreaStyle from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : FillAreaStyle from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.cdl b/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.cdl
index e84fc12fb7..48122e1f9e 100644
--- a/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWFillAreaStyleColour.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWFillAreaStyleColour;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable FillAreaStyleColour from StepVisual);
+	              ach : in out Check; ent : FillAreaStyleColour from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : FillAreaStyleColour from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWInvisibility.cdl b/src/RWStepVisual/RWStepVisual_RWInvisibility.cdl
index 407275a84e..c6d962bff1 100644
--- a/src/RWStepVisual/RWStepVisual_RWInvisibility.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWInvisibility.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWInvisibility;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Invisibility from StepVisual);
+	              ach : in out Check; ent : Invisibility from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : Invisibility from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cdl b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cdl
index 531366d75f..19ef2d9fb2 100644
--- a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWMechanicalDesignGeometricPresentationArea;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable MechanicalDesignGeometricPresentationArea from StepVisual);
+	              ach : in out Check; ent : MechanicalDesignGeometricPresentationArea from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : MechanicalDesignGeometricPresentationArea from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cdl b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cdl
index 5c005d7c57..e643425f15 100644
--- a/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWMechanicalDesignGeometricPresentationRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable MechanicalDesignGeometricPresentationRepresentation from StepVisual);
+	              ach : in out Check; ent : MechanicalDesignGeometricPresentationRepresentation from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : MechanicalDesignGeometricPresentationRepresentation from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.cdl b/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.cdl
index e5a36edb5d..0a743e4119 100644
--- a/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWOverRidingStyledItem.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWOverRidingStyledItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable OverRidingStyledItem from StepVisual);
+	              ach : in out Check; ent : OverRidingStyledItem from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : OverRidingStyledItem from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPlanarBox.cdl b/src/RWStepVisual/RWStepVisual_RWPlanarBox.cdl
index 2a9cf8a134..9d5dd10f2e 100644
--- a/src/RWStepVisual/RWStepVisual_RWPlanarBox.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPlanarBox.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPlanarBox;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PlanarBox from StepVisual);
+	              ach : in out Check; ent : PlanarBox from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PlanarBox from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPlanarExtent.cdl b/src/RWStepVisual/RWStepVisual_RWPlanarExtent.cdl
index 8af0ddb678..65f13cb18f 100644
--- a/src/RWStepVisual/RWStepVisual_RWPlanarExtent.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPlanarExtent.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPlanarExtent;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PlanarExtent from StepVisual);
+	              ach : in out Check; ent : PlanarExtent from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PlanarExtent from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPointStyle.cdl b/src/RWStepVisual/RWStepVisual_RWPointStyle.cdl
index 0810826f9c..bfb5b86e24 100644
--- a/src/RWStepVisual/RWStepVisual_RWPointStyle.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPointStyle.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPointStyle;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PointStyle from StepVisual);
+	              ach : in out Check; ent : PointStyle from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PointStyle from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.cdl b/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.cdl
index 3e93a806d4..ec2e29f71b 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedColour.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPreDefinedColour;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PreDefinedColour from StepVisual);
+	              ach : in out Check; ent : PreDefinedColour from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PreDefinedColour from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.cdl b/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.cdl
index 8455362fbc..1b2e000c67 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedCurveFont.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPreDefinedCurveFont;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PreDefinedCurveFont from StepVisual);
+	              ach : in out Check; ent : PreDefinedCurveFont from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PreDefinedCurveFont from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.cdl b/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.cdl
index 76a2603f87..33badab1c4 100644
--- a/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPreDefinedItem.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPreDefinedItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PreDefinedItem from StepVisual);
+	              ach : in out Check; ent : PreDefinedItem from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PreDefinedItem from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationArea.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationArea.cdl
index 6635d74a30..5b358fcd5d 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationArea.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationArea.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentationArea;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationArea from StepVisual);
+	              ach : in out Check; ent : PresentationArea from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationArea from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cdl
index 745cdf0c7d..1b62024464 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationLayerAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentationLayerAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationLayerAssignment from StepVisual);
+	              ach : in out Check; ent : PresentationLayerAssignment from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationLayerAssignment from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cdl
index 367213fedc..fe90cfd58c 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationLayerUsage.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentationLayerUsage;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationLayerUsage from StepVisual);
+	              ach : in out Check; ent : PresentationLayerUsage from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationLayerUsage from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.cdl
index fdb39ba290..ce7af92bb8 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentationRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationRepresentation from StepVisual);
+	              ach : in out Check; ent : PresentationRepresentation from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationRepresentation from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationSet.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationSet.cdl
index 10243331b4..d5479aba86 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationSet.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationSet.cdl
@@ -28,7 +28,7 @@ is
 	Create returns RWPresentationSet;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationSet from StepVisual);
+	              ach : in out Check; ent : PresentationSet from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationSet from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationSize.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationSize.cdl
index d7d460b4b4..9ab3a773b1 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationSize.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationSize.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentationSize;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationSize from StepVisual);
+	              ach : in out Check; ent : PresentationSize from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationSize from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.cdl
index 7dc9312af0..4b62c535c5 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationStyleAssignment.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentationStyleAssignment;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationStyleAssignment from StepVisual);
+	              ach : in out Check; ent : PresentationStyleAssignment from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationStyleAssignment from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.cdl
index 59451de7fc..43fe5f579c 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationStyleByContext.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentationStyleByContext;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationStyleByContext from StepVisual);
+	              ach : in out Check; ent : PresentationStyleByContext from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationStyleByContext from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentationView.cdl b/src/RWStepVisual/RWStepVisual_RWPresentationView.cdl
index 6fffa422cd..3d6af864ff 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentationView.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentationView.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentationView;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentationView from StepVisual);
+	              ach : in out Check; ent : PresentationView from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentationView from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.cdl b/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.cdl
index 42f29682ca..cd1d7b66b4 100644
--- a/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWPresentedItemRepresentation.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWPresentedItemRepresentation;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable PresentedItemRepresentation from StepVisual);
+	              ach : in out Check; ent : PresentedItemRepresentation from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : PresentedItemRepresentation from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWStyledItem.cdl b/src/RWStepVisual/RWStepVisual_RWStyledItem.cdl
index b083cb7571..0cca3f6b6c 100644
--- a/src/RWStepVisual/RWStepVisual_RWStyledItem.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWStyledItem.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWStyledItem;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable StyledItem from StepVisual);
+	              ach : in out Check; ent : StyledItem from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : StyledItem from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.cdl b/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.cdl
index 67b6756971..9586a3009b 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceSideStyle.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceSideStyle;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceSideStyle from StepVisual);
+	              ach : in out Check; ent : SurfaceSideStyle from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceSideStyle from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.cdl b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.cdl
index 464db03e19..04c89f3bf7 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleBoundary.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceStyleBoundary;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceStyleBoundary from StepVisual);
+	              ach : in out Check; ent : SurfaceStyleBoundary from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceStyleBoundary from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.cdl b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.cdl
index d0d3c5d792..154197e080 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleControlGrid.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceStyleControlGrid;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceStyleControlGrid from StepVisual);
+	              ach : in out Check; ent : SurfaceStyleControlGrid from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceStyleControlGrid from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.cdl b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.cdl
index 07c7b7fbaf..edbafa7e29 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleFillArea.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceStyleFillArea;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceStyleFillArea from StepVisual);
+	              ach : in out Check; ent : SurfaceStyleFillArea from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceStyleFillArea from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.cdl b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.cdl
index 850ba2387b..8e8110a79c 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleParameterLine.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceStyleParameterLine;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceStyleParameterLine from StepVisual);
+	              ach : in out Check; ent : SurfaceStyleParameterLine from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceStyleParameterLine from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.cdl b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.cdl
index 7d15638944..84ad78f254 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSegmentationCurve.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceStyleSegmentationCurve;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceStyleSegmentationCurve from StepVisual);
+	              ach : in out Check; ent : SurfaceStyleSegmentationCurve from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceStyleSegmentationCurve from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.cdl b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.cdl
index 65c033fb5c..53f4cf7438 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleSilhouette.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceStyleSilhouette;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceStyleSilhouette from StepVisual);
+	              ach : in out Check; ent : SurfaceStyleSilhouette from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceStyleSilhouette from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.cdl b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.cdl
index d35633932f..68acee815a 100644
--- a/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWSurfaceStyleUsage.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWSurfaceStyleUsage;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable SurfaceStyleUsage from StepVisual);
+	              ach : in out Check; ent : SurfaceStyleUsage from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : SurfaceStyleUsage from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTemplate.cdl b/src/RWStepVisual/RWStepVisual_RWTemplate.cdl
index 8693da992b..dc1818cf84 100644
--- a/src/RWStepVisual/RWStepVisual_RWTemplate.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWTemplate.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTemplate;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable Template from StepVisual);
+	              ach : in out Check; ent : Template from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : Template from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTemplateInstance.cdl b/src/RWStepVisual/RWStepVisual_RWTemplateInstance.cdl
index e19e5840be..17b5d90048 100644
--- a/src/RWStepVisual/RWStepVisual_RWTemplateInstance.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWTemplateInstance.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTemplateInstance;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TemplateInstance from StepVisual);
+	              ach : in out Check; ent : TemplateInstance from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : TemplateInstance from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTextLiteral.cdl b/src/RWStepVisual/RWStepVisual_RWTextLiteral.cdl
index f7851cf318..86d53c264f 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextLiteral.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWTextLiteral.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTextLiteral;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TextLiteral from StepVisual);
+	              ach : in out Check; ent : TextLiteral from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : TextLiteral from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyle.cdl b/src/RWStepVisual/RWStepVisual_RWTextStyle.cdl
index a62b702960..fe007e9cbf 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyle.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyle.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTextStyle;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TextStyle from StepVisual);
+	              ach : in out Check; ent : TextStyle from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : TextStyle from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.cdl b/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.cdl
index 535b88570b..ebef34a0cf 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyleForDefinedFont.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTextStyleForDefinedFont;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TextStyleForDefinedFont from StepVisual);
+	              ach : in out Check; ent : TextStyleForDefinedFont from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : TextStyleForDefinedFont from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.cdl b/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.cdl
index 84b9cdedda..2dd9cbb35a 100644
--- a/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWTextStyleWithBoxCharacteristics.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWTextStyleWithBoxCharacteristics;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable TextStyleWithBoxCharacteristics from StepVisual);
+	              ach : in out Check; ent : TextStyleWithBoxCharacteristics from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : TextStyleWithBoxCharacteristics from StepVisual);
 
diff --git a/src/RWStepVisual/RWStepVisual_RWViewVolume.cdl b/src/RWStepVisual/RWStepVisual_RWViewVolume.cdl
index 75ad8f2e50..c312cc3868 100644
--- a/src/RWStepVisual/RWStepVisual_RWViewVolume.cdl
+++ b/src/RWStepVisual/RWStepVisual_RWViewVolume.cdl
@@ -29,7 +29,7 @@ is
 	Create returns RWViewVolume;
 
 	ReadStep (me; data : StepReaderData; num : Integer;
-	              ach : in out Check; ent : mutable ViewVolume from StepVisual);
+	              ach : in out Check; ent : ViewVolume from StepVisual);
 
 	WriteStep (me; SW : in out StepWriter; ent : ViewVolume from StepVisual);
 
diff --git a/src/Resource/Resource_Manager.cdl b/src/Resource/Resource_Manager.cdl
index f758f7d265..181c1bc0d3 100644
--- a/src/Resource/Resource_Manager.cdl
+++ b/src/Resource/Resource_Manager.cdl
@@ -35,7 +35,7 @@ is
 ---Category: class constructor
 
      Create(aName: CString from Standard;Verbose: Boolean from Standard = Standard_False)
-     returns mutable Manager from Resource;
+     returns Manager from Resource;
      ---Purpose: Create a Resource manager.
      --          Attempts to find the two following files:
      --          $CSF_`aName`Defaults/aName
@@ -92,7 +92,7 @@ is
     	    aDefaultsDirectory: in out AsciiString from TCollection;
     	    anUserDefaultsDirectory: in out AsciiString from TCollection;
     	    Verbose: Boolean from Standard = Standard_False)
-     returns mutable Manager from Resource;
+     returns Manager from Resource;
 
      Save(me)
      returns Boolean from Standard;
diff --git a/src/STEPCAFControl/STEPCAFControl_ActorWrite.cdl b/src/STEPCAFControl/STEPCAFControl_ActorWrite.cdl
index 312fd61ba9..5ee2e52a17 100644
--- a/src/STEPCAFControl/STEPCAFControl_ActorWrite.cdl
+++ b/src/STEPCAFControl/STEPCAFControl_ActorWrite.cdl
@@ -24,7 +24,7 @@ uses
 
 is
 
-    Create returns mutable ActorWrite;
+    Create returns ActorWrite;
 
     IsAssembly (me; S: in out Shape from TopoDS) returns Boolean is redefined;
     	---Purpose: Check whether shape S is assembly
diff --git a/src/STEPCAFControl/STEPCAFControl_Controller.cdl b/src/STEPCAFControl/STEPCAFControl_Controller.cdl
index 28e4679be0..34b8f94904 100644
--- a/src/STEPCAFControl/STEPCAFControl_Controller.cdl
+++ b/src/STEPCAFControl/STEPCAFControl_Controller.cdl
@@ -25,7 +25,7 @@ uses
 
 is
 
-    Create returns mutable Controller;
+    Create returns Controller;
     ---Purpose : Initializes the use of STEP Norm (the first time)
 
     Init (myclass) returns Boolean;
diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cdl b/src/STEPCAFControl/STEPCAFControl_Reader.cdl
index de880e5918..f6a105dee9 100644
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cdl
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cdl
@@ -59,12 +59,12 @@ is
 -- STEP model and sets ColorMode, LayerMode, NameMode and
 -- PropsMode to Standard_True.
 
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True) returns Reader;
     	---Purpose: Creates a reader tool and attaches it to an already existing Session
     	-- 	    Clears the session if it was not yet set for STEP
 
-    Init (me: in out; WS : mutable WorkSession from XSControl;
+    Init (me: in out; WS : WorkSession from XSControl;
     	       	      scratch : Boolean = Standard_True);
     	---Purpose: Clears the internal data structures and attaches to a new session
     	--          Clears the session if it was not yet set for STEP
diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cdl b/src/STEPCAFControl/STEPCAFControl_Writer.cdl
index 300c5e669a..96c0628719 100644
--- a/src/STEPCAFControl/STEPCAFControl_Writer.cdl
+++ b/src/STEPCAFControl/STEPCAFControl_Writer.cdl
@@ -46,13 +46,13 @@ is
 -- STEP model and sets ColorMode, LayerMode, NameMode and
 -- PropsMode to Standard_True.
         
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True) returns Writer;
     	---Purpose: Creates a reader tool and attaches it to an already existing Session
     	--          Clears the session if it was not yet set for STEP
 	--          Clears the internal data structures
 
-    Init (me: in out; WS : mutable WorkSession from XSControl;
+    Init (me: in out; WS : WorkSession from XSControl;
     	              scratch : Boolean = Standard_True);
     	---Purpose: Clears the internal data structures and attaches to a new session
     	--          Clears the session if it was not yet set for STEP
diff --git a/src/STEPControl/STEPControl_ActorRead.cdl b/src/STEPControl/STEPControl_ActorRead.cdl
index 645f1ba243..c13aa3f770 100644
--- a/src/STEPControl/STEPControl_ActorRead.cdl
+++ b/src/STEPControl/STEPControl_ActorRead.cdl
@@ -48,25 +48,25 @@ uses
 
 is
 
-    Create  returns mutable ActorRead from STEPControl;
+    Create  returns ActorRead from STEPControl;
 
     Recognize (me : mutable; start : Transient) returns Boolean is redefined;
 
     Transfer (me : mutable; start : Transient; 
-                            TP : mutable TransientProcess from Transfer)
-    	returns mutable Binder from Transfer is redefined;
+                            TP : TransientProcess from Transfer)
+    	returns Binder from Transfer is redefined;
     -- calls TransferShape
 
     TransferShape (me         : mutable; 
     	           start      : Transient; 
-                   TP         : mutable TransientProcess from Transfer;
+                   TP         : TransientProcess from Transfer;
                    isManifold : Boolean = Standard_True)
-    	returns mutable Binder from Transfer;
+    	returns Binder from Transfer;
 
     ---Private: unit and uncertainty context management
 
     PrepareUnits (me : mutable; rep: Representation from StepRepr; 
-    	    	    	    	TP: mutable TransientProcess from Transfer);
+    	    	    	    	TP: TransientProcess from Transfer);
     	---Purpose: set units and tolerances context by given ShapeRepresentation
     
     ResetUnits (me: mutable);
@@ -75,7 +75,7 @@ is
 
     ComputeTransformation (me: mutable; Origin, Target: Axis2Placement3d from StepGeom;
     	    	    	    	    	OrigContext, TargContext: Representation from StepRepr;
-    	    	    	    	    	TP: mutable TransientProcess from Transfer;
+    	    	    	    	    	TP: TransientProcess from Transfer;
     	    	    	    	    	Trsf: out Trsf from gp)
     returns Boolean;
 	---Purpose: Computes transformation defined by two axis placements (in MAPPED_ITEM
@@ -84,53 +84,53 @@ is
 	--          Returns True if transformation is computed and is not an identity.
 
     ComputeSRRWT (me: mutable; SRR: RepresentationRelationship from StepRepr;
-    	    	    	       TP: mutable TransientProcess from Transfer;
+    	    	    	       TP: TransientProcess from Transfer;
     	    	    	       Trsf: out Trsf from gp)
     returns Boolean;
 	---Purpose: Computes transformation defined by given
         --          REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION
 	
      TransferEntity(me: mutable; PD : ProductDefinition from StepBasic;
-    	    	    TP :  mutable TransientProcess from Transfer) returns mutable ShapeBinder from TransferBRep is protected;
+    	    	    TP : TransientProcess from Transfer) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Transfers product definition entity
        
      
     TransferEntity(me: mutable; NAUO  : NextAssemblyUsageOccurrence from StepRepr;
-    	  	    TP :  mutable TransientProcess from Transfer) returns mutable ShapeBinder from TransferBRep is protected;
+    	  	    TP : TransientProcess from Transfer) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Transfers next assembly usage occurence entity
        
     TransferEntity(me: mutable; sr  : ShapeRepresentation from StepShape;
-    	  	    TP :  mutable TransientProcess from Transfer;
-    	    	    isBound : out Boolean ) returns mutable ShapeBinder from TransferBRep is protected;
+    	  	    TP : TransientProcess from Transfer;
+    	    	    isBound : out Boolean ) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Transfers shape representation entity
        
        
     TransferEntity(me: mutable; CDSR  : ContextDependentShapeRepresentation from StepShape;
-    	  	    TP :  mutable TransientProcess from Transfer) returns mutable ShapeBinder from TransferBRep is protected;
+    	  	    TP : TransientProcess from Transfer) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Transfers context dependent shape representation entity  
        
     TransferEntity(me: mutable; und  : ShapeRepresentationRelationship from StepRepr;
-    	  	    TP :  mutable TransientProcess from Transfer;
-    	    	    nbrep : Integer =0) returns mutable ShapeBinder from TransferBRep is protected;
+    	  	    TP : TransientProcess from Transfer;
+    	    	    nbrep : Integer =0) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Transfers  shape representation relationship entity    
        	
        
     TransferEntity(me         : mutable; 
                    git        : GeometricRepresentationItem from StepGeom;
-                   TP         : mutable TransientProcess from Transfer;
-                   isManifold : Boolean) returns mutable ShapeBinder from TransferBRep is protected;
+                   TP         : TransientProcess from Transfer;
+                   isManifold : Boolean) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Transfers  geometric representation item entity such as ManifoldSolidBRep ,...etc
        
     TransferEntity(me: mutable; mapit  : MappedItem from StepRepr;
-    	  	    TP :  mutable TransientProcess from Transfer) returns mutable ShapeBinder from TransferBRep is protected;
+    	  	    TP : TransientProcess from Transfer) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Transfers  mapped item
        
      TransferEntity(me: mutable; fs  : FaceSurface from StepShape;
-    	  	    TP :  mutable TransientProcess from Transfer) returns mutable ShapeBinder from TransferBRep is protected;
+    	  	    TP : TransientProcess from Transfer) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Transfers  FaceSurface entity  
               
     OldWay(me: mutable; start : Transient;
-    	  	    TP :  mutable TransientProcess from Transfer) returns mutable ShapeBinder from TransferBRep is protected;
+    	  	    TP : TransientProcess from Transfer) returns ShapeBinder from TransferBRep is protected;
        ---Purpose:Tranlates file by old way when CDSR are roots . Acts only if "read.step.product_mode" is equal Off. 
     
     closeIDEASShell(me            : mutable;
diff --git a/src/STEPControl/STEPControl_ActorWrite.cdl b/src/STEPControl/STEPControl_ActorWrite.cdl
index eebfabb0d1..87bbcb88fb 100644
--- a/src/STEPControl/STEPControl_ActorWrite.cdl
+++ b/src/STEPControl/STEPControl_ActorWrite.cdl
@@ -35,34 +35,34 @@ uses FinderProcess, TransientProcess, Binder, Finder, StepModel from StepData,
 
 is
 
-    Create  returns mutable ActorWrite from STEPControl;
+    Create  returns ActorWrite from STEPControl;
 
     Recognize (me : mutable; start : Finder) returns Boolean  is redefined;
 
-    Transfer (me : mutable; start : Finder; FP : mutable FinderProcess)
-    	returns mutable Binder is redefined;
+    Transfer (me : mutable; start : Finder; FP : FinderProcess)
+    	returns Binder is redefined;
     -- enchains : TransferShape , MakeProductData , and manages mode
     --   "simple" or in Assembly
 
     TransferSubShape (me : mutable; start : Finder;
                      SDR : ShapeDefinitionRepresentation from StepShape;
                      AX1 : out Axis2Placement3d from StepGeom;
-                      FP : mutable FinderProcess;
+                      FP : FinderProcess;
               shapeGroup : HSequenceOfShape from TopTools = NULL;
               isManifold : Boolean = Standard_True)
-    	returns mutable Binder;
+    	returns Binder;
 
     TransferShape (me : mutable; start : Finder;
                   SDR : ShapeDefinitionRepresentation from StepShape;
-    	    	       FP : mutable FinderProcess;
+    	    	       FP : FinderProcess;
 		       shapeGroup : HSequenceOfShape from TopTools = NULL;
 		       isManifold : Boolean = Standard_True)		      
-    	returns mutable Binder;
+    	returns Binder;
 
     TransferCompound (me : mutable; start : Finder;
 	              SDR : ShapeDefinitionRepresentation from StepShape;
-    	    	      FP : mutable FinderProcess)
-    	returns mutable Binder;
+    	    	      FP : FinderProcess)
+    	returns Binder;
 
 --    InitProductData  (me: mutable) returns Part from STEPConstruct;
 
@@ -71,7 +71,7 @@ is
 --    	SDRTool : Part from STEPConstruct;
 --	model   : StepModel from StepData;
 --        addPRPC : Boolean)
---    	    returns mutable Binder;
+--    	    returns Binder;
 
 
     SetMode (me : mutable; M : StepModelType from STEPControl);	
@@ -97,7 +97,7 @@ is
 	
     getNMSSRForGroup (me; 
                       shapeGroup : HSequenceOfShape from TopTools;
-                      FP : mutable FinderProcess;
+                      FP : FinderProcess;
                       isNMSSRCreated : in out Boolean)
     returns NonManifoldSurfaceShapeRepresentation from StepShape
     is private;
diff --git a/src/STEPControl/STEPControl_Controller.cdl b/src/STEPControl/STEPControl_Controller.cdl
index 27f1c9d180..3345e0f438 100644
--- a/src/STEPControl/STEPControl_Controller.cdl
+++ b/src/STEPControl/STEPControl_Controller.cdl
@@ -33,16 +33,16 @@ uses
 
 is
 
-    Create returns mutable Controller from STEPControl;
+    Create returns Controller from STEPControl;
     ---Purpose : Initializes the use of STEP Norm (the first time) and
     --           returns a Controller
 
-    NewModel     (me) returns mutable InterfaceModel from Interface;
+    NewModel     (me) returns InterfaceModel from Interface;
     ---Purpose : Creates a new empty Model ready to receive data of the Norm.
     --           It is taken from STEP Template Model
 
     ActorRead  (me; model : InterfaceModel)
-                 returns mutable ActorOfTransientProcess from Transfer;
+                 returns ActorOfTransientProcess from Transfer;
     ---Purpose : Returns a new Actor for Read attached to the pair (norm,appli)
     --           It is a PmsToTopoDSAct_Actor
 
@@ -50,8 +50,8 @@ is
     Customise (me: mutable; WS : in out WorkSession from XSControl) is redefined;
     
     TransferWriteShape (me; shape : Shape from TopoDS;
-    	    	    	FP        : mutable FinderProcess  from Transfer;
-    	    	        model     : mutable InterfaceModel from Interface;
+    	    	    	FP        : FinderProcess  from Transfer;
+    	    	        model     : InterfaceModel from Interface;
 			modetrans : Integer = 0)  returns ReturnStatus
       is redefined;
     ---Purpose : Takes one Shape and transfers it to the InterfaceModel
diff --git a/src/STEPControl/STEPControl_Reader.cdl b/src/STEPControl/STEPControl_Reader.cdl
index 77a658f91a..8ee2b70357 100644
--- a/src/STEPControl/STEPControl_Reader.cdl
+++ b/src/STEPControl/STEPControl_Reader.cdl
@@ -68,7 +68,7 @@ is
     Create returns Reader;
     ---Purpose : Creates a reader object with an empty STEP model.
 
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True) returns Reader;
     ---Purpose : Creates a Reader for STEP from an already existing Session
     --           Clears the session if it was not yet set for STEP
diff --git a/src/STEPControl/STEPControl_Writer.cdl b/src/STEPControl/STEPControl_Writer.cdl
index ac365cec57..a68fcb2f4d 100644
--- a/src/STEPControl/STEPControl_Writer.cdl
+++ b/src/STEPControl/STEPControl_Writer.cdl
@@ -35,7 +35,7 @@ is
     Create returns Writer;
     ---Purpose : Creates a Writer from scratch
 
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True) returns Writer;
     ---Purpose : Creates a Writer from an already existing Session
     --           If <scratch> is True (D), clears already recorded data
@@ -48,7 +48,7 @@ is
     UnsetTolerance (me : in out);
     ---Purpose : Unsets the tolerance formerly forced by SetTolerance
 
-    SetWS (me : in out; WS : mutable WorkSession from XSControl;
+    SetWS (me : in out; WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True);
     ---Purpose : Sets a specific session to <me>
 
diff --git a/src/STEPSelections/STEPSelections_AssemblyComponent.cdl b/src/STEPSelections/STEPSelections_AssemblyComponent.cdl
index 62a88052ac..9466583206 100644
--- a/src/STEPSelections/STEPSelections_AssemblyComponent.cdl
+++ b/src/STEPSelections/STEPSelections_AssemblyComponent.cdl
@@ -25,11 +25,11 @@ uses
 
 is
     
-    Create returns mutable AssemblyComponent from STEPSelections;
+    Create returns AssemblyComponent from STEPSelections;
     
     Create (sdr : ShapeDefinitionRepresentation from StepShape;
     	    list: HSequenceOfAssemblyLink from STEPSelections)
-    returns mutable AssemblyComponent from STEPSelections;
+    returns AssemblyComponent from STEPSelections;
     
     --Methods for getting and obtaining fields
     
diff --git a/src/STEPSelections/STEPSelections_AssemblyLink.cdl b/src/STEPSelections/STEPSelections_AssemblyLink.cdl
index 0312ed5581..d90696aa68 100644
--- a/src/STEPSelections/STEPSelections_AssemblyLink.cdl
+++ b/src/STEPSelections/STEPSelections_AssemblyLink.cdl
@@ -26,12 +26,12 @@ uses
 
 is
 
-    Create returns mutable AssemblyLink from STEPSelections;
+    Create returns AssemblyLink from STEPSelections;
     
     Create(nauo: NextAssemblyUsageOccurrence from StepRepr;
     	   item: Transient from Standard;
 	   part: AssemblyComponent from STEPSelections)
-    returns mutable AssemblyLink from STEPSelections;
+    returns AssemblyLink from STEPSelections;
     
     --Methods for setting and obtaining fields
     
diff --git a/src/STEPSelections/STEPSelections_SelectAssembly.cdl b/src/STEPSelections/STEPSelections_SelectAssembly.cdl
index 4570095f6f..eb1896dd86 100644
--- a/src/STEPSelections/STEPSelections_SelectAssembly.cdl
+++ b/src/STEPSelections/STEPSelections_SelectAssembly.cdl
@@ -24,7 +24,7 @@ uses
     EntityIterator,
     Graph
 is
-    Create returns mutable SelectAssembly from STEPSelections;
+    Create returns SelectAssembly from STEPSelections;
     
     Explore (me; level : Integer; ent : Transient; G : Graph;
     	     explored : in out EntityIterator)
diff --git a/src/STEPSelections/STEPSelections_SelectDerived.cdl b/src/STEPSelections/STEPSelections_SelectDerived.cdl
index f44f506afd..c0036f4e70 100644
--- a/src/STEPSelections/STEPSelections_SelectDerived.cdl
+++ b/src/STEPSelections/STEPSelections_SelectDerived.cdl
@@ -26,7 +26,7 @@ uses
     Protocol from StepData
     
 is
-    Create returns mutable SelectDerived;
+    Create returns SelectDerived;
     
     Matches (me; ent : Transient; model : InterfaceModel;
     	    	 text : AsciiString; exact : Boolean)
diff --git a/src/STEPSelections/STEPSelections_SelectFaces.cdl b/src/STEPSelections/STEPSelections_SelectFaces.cdl
index ecd95dde40..45856f1c08 100644
--- a/src/STEPSelections/STEPSelections_SelectFaces.cdl
+++ b/src/STEPSelections/STEPSelections_SelectFaces.cdl
@@ -27,7 +27,7 @@ uses
     
 is
 
-    Create returns mutable SelectFaces;
+    Create returns SelectFaces;
     
     Explore (me; level : Integer; ent : Transient; G : Graph;
     	     explored : in out EntityIterator)
diff --git a/src/STEPSelections/STEPSelections_SelectForTransfer.cdl b/src/STEPSelections/STEPSelections_SelectForTransfer.cdl
index 544dfa7861..28ab846a1d 100644
--- a/src/STEPSelections/STEPSelections_SelectForTransfer.cdl
+++ b/src/STEPSelections/STEPSelections_SelectForTransfer.cdl
@@ -23,8 +23,8 @@ uses
     TransferReader from XSControl
    
 is
-    Create returns mutable SelectForTransfer;
-    Create (TR : TransferReader from XSControl) returns mutable SelectForTransfer;
+    Create returns SelectForTransfer;
+    Create (TR : TransferReader from XSControl) returns SelectForTransfer;
     RootResult(me; G : Graph) returns EntityIterator is redefined;
     
 
diff --git a/src/STEPSelections/STEPSelections_SelectGSCurves.cdl b/src/STEPSelections/STEPSelections_SelectGSCurves.cdl
index 86dfa660b6..5139732acb 100644
--- a/src/STEPSelections/STEPSelections_SelectGSCurves.cdl
+++ b/src/STEPSelections/STEPSelections_SelectGSCurves.cdl
@@ -27,7 +27,7 @@ uses
 
 is
 
-    Create returns mutable SelectGSCurves;
+    Create returns SelectGSCurves;
     
     Explore(me; level: Integer; ent: Transient; G: Graph;
     	    	explored: in out EntityIterator)
diff --git a/src/STEPSelections/STEPSelections_SelectInstances.cdl b/src/STEPSelections/STEPSelections_SelectInstances.cdl
index c3e2186b2e..dbc4b40d64 100644
--- a/src/STEPSelections/STEPSelections_SelectInstances.cdl
+++ b/src/STEPSelections/STEPSelections_SelectInstances.cdl
@@ -25,7 +25,7 @@ uses
     Graph
 is
     
-    Create returns mutable SelectInstances;
+    Create returns SelectInstances;
 
     RootResult(me; G : Graph) returns EntityIterator;
 
diff --git a/src/Select3D/Select3D_SensitiveBox.cdl b/src/Select3D/Select3D_SensitiveBox.cdl
index c6e63016aa..e92cacba21 100644
--- a/src/Select3D/Select3D_SensitiveBox.cdl
+++ b/src/Select3D/Select3D_SensitiveBox.cdl
@@ -37,13 +37,13 @@ is
 
     Create (OwnerId      : EntityOwner from SelectBasics;
     	    BoundingBox  : Box from Bnd)
-    returns mutable SensitiveBox;
+    returns SensitiveBox;
 	---Purpose: Constructs a sensitive box object defined by the
     	-- owner OwnerId, and the bounding box BoundingBox.
     Create (OwnerId         : EntityOwner from SelectBasics;
     	    XMin,YMin,ZMin,
     	    XMax,YMax,ZMax  : Real)
-    returns mutable SensitiveBox;
+    returns SensitiveBox;
 	---	Purpose: Constructs a sensitive box object defined by the
     	-- owner OwnerId, and the coordinates Xmin, YMin, ZMin, XMax, YMax, ZMax.
     	-- Xmin, YMin and ZMin define the minimum point in
diff --git a/src/Select3D/Select3D_SensitiveCircle.cdl b/src/Select3D/Select3D_SensitiveCircle.cdl
index da4560b841..a2af4fe386 100644
--- a/src/Select3D/Select3D_SensitiveCircle.cdl
+++ b/src/Select3D/Select3D_SensitiveCircle.cdl
@@ -49,7 +49,7 @@ is
             TheCircle    : Circle from Geom;
             FilledCircle : Boolean = Standard_False;
             NbOfPoints   : Integer = 6)
-     returns mutable SensitiveCircle;
+     returns SensitiveCircle;
         ---Level: Public 
         ---Purpose: Constructs the sensitive circle object defined by the
         -- owner OwnerId, the circle Circle, the Boolean
@@ -61,7 +61,7 @@ is
             u2           : Real;
             FilledCircle : Boolean = Standard_False;
             NbOfPoints   : Integer = 6)
-     returns mutable SensitiveCircle;
+     returns SensitiveCircle;
         ---Level: Public 
         ---Purpose: Constructs the sensitive arc object defined by the
         -- owner OwnerId, the circle Circle, the parameters u1
@@ -71,7 +71,7 @@ is
     Create(OwnerId  : EntityOwner from SelectBasics;
            apolyg3d : HArray1OfPnt   from TColgp;
        FilledCircle : Boolean from Standard = Standard_False)
-    returns mutable SensitiveCircle;
+    returns SensitiveCircle;
         ---Level: Internal 
         ---Purpose: Constructs the sensitive circle object defined by the
         -- owner OwnerId, the array of triangles apolyg3d, and the Boolean FilledCircle.
@@ -83,7 +83,7 @@ is
     Create(OwnerId  : EntityOwner from SelectBasics;
            apolyg3d : Array1OfPnt   from TColgp;
        FilledCircle : Boolean from Standard = Standard_False)
-    returns mutable SensitiveCircle;
+    returns SensitiveCircle;
         ---Purpose: Constructs the sensitive circle object defined by the
         -- owner OwnerId, the array of points apolyg3d, and the Boolean FilledCircle. 
         -- If the length of apolyg3d is more then 1, the first point of apolyg3d 
diff --git a/src/Select3D/Select3D_SensitiveCurve.cdl b/src/Select3D/Select3D_SensitiveCurve.cdl
index fd3e521259..5c4c2971d6 100644
--- a/src/Select3D/Select3D_SensitiveCurve.cdl
+++ b/src/Select3D/Select3D_SensitiveCurve.cdl
@@ -50,7 +50,7 @@ is
     Create (OwnerId      : EntityOwner from SelectBasics;
             TheCurve     : Curve from Geom;
             MaxPoints    : Integer = 17)
-     returns mutable SensitiveCurve;
+     returns SensitiveCurve;
         ---Level: Public 
         ---Purpose: Constructs a sensitive curve object defined by the
         -- owner OwnerId, the curve TheCurve, and the
@@ -58,14 +58,14 @@ is
 
     Create (OwnerId      : EntityOwner from SelectBasics;
             ThePoints    : HArray1OfPnt from TColgp)
-     returns mutable SensitiveCurve;
+     returns SensitiveCurve;
         ---Level: Public 
         ---Purpose: Constructs a sensitive curve object defined by the
         -- owner OwnerId and the set of points ThePoints.
         
     Create (OwnerId      : EntityOwner from SelectBasics;
             ThePoints    : Array1OfPnt from TColgp)
-     returns mutable SensitiveCurve;
+     returns SensitiveCurve;
         ---Level: Public 
         ---Purpose: Creation of Sensitive Curve from Points.
         --          Warning : This Method should disappear in the next version...
diff --git a/src/Select3D/Select3D_SensitiveFace.cdl b/src/Select3D/Select3D_SensitiveFace.cdl
index ec6f24b760..e6e66280d6 100644
--- a/src/Select3D/Select3D_SensitiveFace.cdl
+++ b/src/Select3D/Select3D_SensitiveFace.cdl
@@ -44,7 +44,7 @@ is
     Create (OwnerId      : EntityOwner from SelectBasics;
             ThePoints    : Array1OfPnt from TColgp;
             Sensitivity  : TypeOfSensitivity = Select3D_TOS_INTERIOR)
-     returns mutable SensitiveFace;
+     returns SensitiveFace;
         ---Level: Public 
         ---Purpose: Constructs a sensitive face object defined by the
         -- owner OwnerId, the array of points ThePoints, and
@@ -54,7 +54,7 @@ is
     Create (OwnerId      : EntityOwner from SelectBasics;
             ThePoints    : HArray1OfPnt from TColgp;
             Sensitivity  : TypeOfSensitivity = Select3D_TOS_INTERIOR)
-     returns mutable SensitiveFace;
+     returns SensitiveFace;
         ---Level: Public 
         ---Purpose: Constructs a sensitive face object defined by the
         -- owner OwnerId, the array of points ThePoints, and
diff --git a/src/Select3D/Select3D_SensitiveGroup.cdl b/src/Select3D/Select3D_SensitiveGroup.cdl
index ad1cfc0f2e..7e8a0e11dd 100644
--- a/src/Select3D/Select3D_SensitiveGroup.cdl
+++ b/src/Select3D/Select3D_SensitiveGroup.cdl
@@ -42,7 +42,7 @@ is
 
     Create (OwnerId      : EntityOwner from SelectBasics;
     	    MatchAll     : Boolean from Standard = Standard_True)
-    returns mutable SensitiveGroup from Select3D;
+    returns SensitiveGroup from Select3D;
     	---Purpose: Constructs an empty sensitive group object.
     	-- This is a set of sensitive 3D entities. The sensitive
     	-- entities will be defined using the function Add to fill
@@ -51,7 +51,7 @@ is
     Create(OwnerId       : EntityOwner from SelectBasics;
     	   TheList       : in out ListOfSensitive from Select3D;
     	   MatchAll      : Boolean from Standard = Standard_True)
-    returns mutable SensitiveGroup from Select3D;
+    returns SensitiveGroup from Select3D;
     	---Purpose: Constructs a sensitive group object defined by the list
     	-- TheList and the entity owner OwnerId. If MatchAll is false, nothing is done.
 
diff --git a/src/Select3D/Select3D_SensitivePoint.cdl b/src/Select3D/Select3D_SensitivePoint.cdl
index 4cc1d52a02..56155421b4 100644
--- a/src/Select3D/Select3D_SensitivePoint.cdl
+++ b/src/Select3D/Select3D_SensitivePoint.cdl
@@ -37,7 +37,7 @@ is
 
     Create (OwnerId : EntityOwner from SelectBasics;
     	    Point   : Pnt from gp)
-    returns mutable SensitivePoint;
+    returns SensitivePoint;
     	---Purpose: Constructs a sensitive point object defined by the
     	-- owner OwnerId and the point Point. 
 
diff --git a/src/Select3D/Select3D_SensitivePoly.cdl b/src/Select3D/Select3D_SensitivePoly.cdl
index 56a4ca1add..d31a1f51bc 100644
--- a/src/Select3D/Select3D_SensitivePoly.cdl
+++ b/src/Select3D/Select3D_SensitivePoly.cdl
@@ -37,7 +37,7 @@ is
 
     Initialize (OwnerId      : EntityOwner from SelectBasics;
             ThePoints    : Array1OfPnt from TColgp)
-     returns mutable SensitivePoly;
+     returns SensitivePoly;
         ---Level: Public 
         ---Purpose: Constructs a sensitive face object defined by the
         -- owner OwnerId, the array of points ThePoints, and
@@ -46,7 +46,7 @@ is
 
     Initialize (OwnerId      : EntityOwner from SelectBasics;
             ThePoints    : HArray1OfPnt from TColgp)
-     returns mutable SensitivePoly;
+     returns SensitivePoly;
         ---Level: Public 
         ---Purpose: Constructs a sensitive face object defined by the
         -- owner OwnerId, the array of points ThePoints, and
@@ -55,7 +55,7 @@ is
 
     Initialize(OwnerId      : EntityOwner from SelectBasics;
             NbOfPoints   : Integer = 6)
-     returns mutable SensitivePoly;
+     returns SensitivePoly;
         ---Level: Public 
         ---Purpose: Constructs the sensitive circle object defined by the
         -- owner OwnerId, the circle Circle, the Boolean
diff --git a/src/Select3D/Select3D_SensitiveSegment.cdl b/src/Select3D/Select3D_SensitiveSegment.cdl
index 4fc5f1bc93..3f5c13d380 100644
--- a/src/Select3D/Select3D_SensitiveSegment.cdl
+++ b/src/Select3D/Select3D_SensitiveSegment.cdl
@@ -46,7 +46,7 @@ is
     Create (OwnerId      : EntityOwner from SelectBasics;
     	    FirstP,LastP : Pnt from gp;
     	    MaxRect      : Integer = 1)
-     returns mutable SensitiveSegment;
+     returns SensitiveSegment;
 	---Purpose: Constructs the sensitive segment object defined by
     	-- the owner OwnerId, the points FirstP, LastP and the
     	-- maximum number of sensitive bounding boxes MaxRect.     
diff --git a/src/Select3D/Select3D_SensitiveTriangle.cdl b/src/Select3D/Select3D_SensitiveTriangle.cdl
index c98a4c4a68..1332967873 100644
--- a/src/Select3D/Select3D_SensitiveTriangle.cdl
+++ b/src/Select3D/Select3D_SensitiveTriangle.cdl
@@ -44,7 +44,7 @@ is
     Create (OwnerId      : EntityOwner from SelectBasics;
             P1,P2,P3     : Pnt from gp;
             Sensitivity  : TypeOfSensitivity = Select3D_TOS_INTERIOR)
-     returns mutable SensitiveTriangle;
+     returns SensitiveTriangle;
     ---Level: Public 
         ---Purpose: Constructs a sensitive triangle object defined by the
         -- owner OwnerId, the points P1, P2, P3, and the type of sensitivity Sensitivity. 
diff --git a/src/Select3D/Select3D_SensitiveTriangulation.cdl b/src/Select3D/Select3D_SensitiveTriangulation.cdl
index 6959817a1a..b6ae0457be 100644
--- a/src/Select3D/Select3D_SensitiveTriangulation.cdl
+++ b/src/Select3D/Select3D_SensitiveTriangulation.cdl
@@ -44,7 +44,7 @@ is
     	   aTriangulation: Triangulation from Poly;
     	   aLoc          : Location from TopLoc;
     	   InteriorFlag  : Boolean from Standard = Standard_True)
-    returns mutable SensitiveTriangulation from Select3D;
+    returns SensitiveTriangulation from Select3D;
 
     	---Purpose: Constructs a sensitive triangulation object defined by
     	-- the owner OwnerId, the triangulation aTriangulation,
@@ -56,7 +56,7 @@ is
 	   thefreeedges  : HArray1OfInteger from TColStd;
     	   theCDG        : Pnt from gp;
     	   InteriorFlag  : Boolean from Standard)
-    returns mutable SensitiveTriangulation from Select3D;
+    returns SensitiveTriangulation from Select3D;
 	---Purpose: Constructs a sensitive triangulation object defined by
     	-- the owner OwnerId, the triangulation aTriangulation,
     	-- the location aLoc, the array of free edges
diff --git a/src/Select3D/Select3D_SensitiveWire.cdl b/src/Select3D/Select3D_SensitiveWire.cdl
index 069ed3bfe4..7e33fe6ea6 100644
--- a/src/Select3D/Select3D_SensitiveWire.cdl
+++ b/src/Select3D/Select3D_SensitiveWire.cdl
@@ -38,7 +38,7 @@ is
 
     Create (OwnerId      : EntityOwner from SelectBasics;
     	    MaxRect      : Integer = 1)
-     returns mutable SensitiveWire;
+     returns SensitiveWire;
     	---Purpose: Constructs a sensitive wire object defined by the
     	-- owner OwnerId, and the maximum number of
     	-- sensitive rectangles MaxRect.
diff --git a/src/SelectMgr/SelectMgr_AndFilter.cdl b/src/SelectMgr/SelectMgr_AndFilter.cdl
index e0fa31453b..23fd7e3458 100644
--- a/src/SelectMgr/SelectMgr_AndFilter.cdl
+++ b/src/SelectMgr/SelectMgr_AndFilter.cdl
@@ -28,7 +28,7 @@ uses
 is
 
     Create
-    returns mutable AndFilter from SelectMgr;
+    returns AndFilter from SelectMgr;
     	--- Purpose: Constructs an empty selection filter object for two or
     	-- more types of entity.   
     
diff --git a/src/SelectMgr/SelectMgr_EntityOwner.cdl b/src/SelectMgr/SelectMgr_EntityOwner.cdl
index 07ff16e3ab..148a1ea005 100644
--- a/src/SelectMgr/SelectMgr_EntityOwner.cdl
+++ b/src/SelectMgr/SelectMgr_EntityOwner.cdl
@@ -42,11 +42,11 @@ raises
     NoSuchObject from Standard
 is
 
-    Create (aPriority: Integer = 0) returns mutable EntityOwner from SelectMgr;
+    Create (aPriority: Integer = 0) returns EntityOwner from SelectMgr;
 	--- Purpose: Initializes the selection priority aPriority.  
     Create (aSO      : SelectableObject;
             aPriority : Integer=0)
-    returns mutable EntityOwner from SelectMgr;
+    returns EntityOwner from SelectMgr;
     	---Purpose: Constructs a framework with the selectable object
     	-- anSO being attributed the selection priority aPriority.
 	
diff --git a/src/SelectMgr/SelectMgr_OrFilter.cdl b/src/SelectMgr/SelectMgr_OrFilter.cdl
index 3551169580..0daba7fa81 100644
--- a/src/SelectMgr/SelectMgr_OrFilter.cdl
+++ b/src/SelectMgr/SelectMgr_OrFilter.cdl
@@ -30,7 +30,7 @@ uses
 is
 
     Create
-    returns mutable OrFilter from SelectMgr;
+    returns OrFilter from SelectMgr;
     	---Purpose: Constructs an empty or selection filter.
     IsOk(me; anobj : EntityOwner from SelectMgr)
     returns Boolean from Standard ;
diff --git a/src/SelectMgr/SelectMgr_SelectableObject.cdl b/src/SelectMgr/SelectMgr_SelectableObject.cdl
index 191fb641bc..f1beb54812 100644
--- a/src/SelectMgr/SelectMgr_SelectableObject.cdl
+++ b/src/SelectMgr/SelectMgr_SelectableObject.cdl
@@ -52,7 +52,7 @@ is
 
     Initialize(aTypeOfPresentation3d: TypeOfPresentation3d from PrsMgr = PrsMgr_TOP_AllView);
 
-    ComputeSelection(me:mutable; aSelection :mutable Selection from SelectMgr;
+    ComputeSelection(me:mutable; aSelection : Selection from SelectMgr;
                                  aMode      : Integer) is deferred private;
         ---Purpose: Recovers and calculates any sensitive primitive,
     	-- aSelection, available in Shape mode, specified by
@@ -81,7 +81,7 @@ is
         --          the <amode>th selection mode.   
 
 
-    AddSelection(me:mutable ;aSelection:mutable Selection from SelectMgr;
+    AddSelection(me:mutable ;aSelection: Selection from SelectMgr;
                              aMode : Integer) 
     is static;
         ---Purpose: Adds the selection aSelection with the selection mode
diff --git a/src/SelectMgr/SelectMgr_Selection.cdl b/src/SelectMgr/SelectMgr_Selection.cdl
index 96d7c82a75..0ae9525e1d 100644
--- a/src/SelectMgr/SelectMgr_Selection.cdl
+++ b/src/SelectMgr/SelectMgr_Selection.cdl
@@ -64,7 +64,7 @@ raises
 is
 
 
-    Create (IdMode  : Integer = 0) returns mutable Selection;
+    Create (IdMode  : Integer = 0) returns Selection;
     	--- Purpose: Constructs a selection object defined by the selection mode IdMode.
     	-- The default setting 0 is the selection mode for a shape in its entirety.   
 
diff --git a/src/SelectMgr/SelectMgr_SelectionManager.cdl b/src/SelectMgr/SelectMgr_SelectionManager.cdl
index 3dee708912..4e6f32287b 100644
--- a/src/SelectMgr/SelectMgr_SelectionManager.cdl
+++ b/src/SelectMgr/SelectMgr_SelectionManager.cdl
@@ -41,7 +41,7 @@ uses
 is
 
     
-    Create  returns mutable SelectionManager from SelectMgr;
+    Create  returns SelectionManager from SelectMgr;
     	--- Purpose: Constructs an empty selection manager object.   
 
     ---Category: Management of the view selectors
diff --git a/src/SelectMgr/SelectMgr_ViewerSelector.cdl b/src/SelectMgr/SelectMgr_ViewerSelector.cdl
index d8d763c839..1348a26a71 100644
--- a/src/SelectMgr/SelectMgr_ViewerSelector.cdl
+++ b/src/SelectMgr/SelectMgr_ViewerSelector.cdl
@@ -83,7 +83,7 @@ is
 
 
 
-    Convert (me:mutable;aSelection : mutable Selection from SelectMgr) is virtual;
+    Convert (me:mutable;aSelection : Selection from SelectMgr) is virtual;
     	---Level: Public 
     	---Purpose: to be redefined if conversion is necessary for SensitiveEntities...
 	    
diff --git a/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cdl b/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cdl
index 14f0bbfe8c..2132c5fa47 100644
--- a/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cdl
+++ b/src/ShapeAlgo/ShapeAlgo_AlgoContainer.cdl
@@ -40,7 +40,7 @@ uses
 
 is
 
-    Create returns mutable AlgoContainer from ShapeAlgo;
+    Create returns AlgoContainer from ShapeAlgo;
     	---Purpose: Empty constructor
 
     SetToolContainer (me: mutable; TC: ToolContainer from ShapeAlgo);
diff --git a/src/ShapeAlgo/ShapeAlgo_ToolContainer.cdl b/src/ShapeAlgo/ShapeAlgo_ToolContainer.cdl
index 935b102e5e..8d507ff533 100644
--- a/src/ShapeAlgo/ShapeAlgo_ToolContainer.cdl
+++ b/src/ShapeAlgo/ShapeAlgo_ToolContainer.cdl
@@ -24,7 +24,7 @@ uses
     
 is
 
-    Create returns mutable ToolContainer from ShapeAlgo;
+    Create returns ToolContainer from ShapeAlgo;
     	---Purpose: Empty constructor
 	
     FixShape (me) returns Shape from ShapeFix is virtual;
diff --git a/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.cdl b/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.cdl
index 3cc95c039f..b52566f9ce 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.cdl
+++ b/src/ShapeAnalysis/ShapeAnalysis_FreeBoundData.cdl
@@ -44,11 +44,11 @@ uses
 
 is
     
-    Create returns mutable FreeBoundData from ShapeAnalysis;
+    Create returns FreeBoundData from ShapeAnalysis;
     	---Purpose: Empty constructor
      
     Create (freebound: Wire from TopoDS)
-    returns mutable FreeBoundData from ShapeAnalysis;
+    returns FreeBoundData from ShapeAnalysis;
     	---Purpose: Creates object with contour given in the form of TopoDS_Wire
 
     Clear (me: mutable);
diff --git a/src/ShapeAnalysis/ShapeAnalysis_Surface.cdl b/src/ShapeAnalysis/ShapeAnalysis_Surface.cdl
index 2d390c7d78..f031893c23 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_Surface.cdl
+++ b/src/ShapeAnalysis/ShapeAnalysis_Surface.cdl
@@ -55,7 +55,7 @@ uses
     Array1OfPnt2d from TColgp
 
 is
-    Create (S : Surface from Geom) returns mutable Surface from ShapeAnalysis;
+    Create (S : Surface from Geom) returns Surface from ShapeAnalysis;
     	---Purpose: Creates an analyzer object on the basis of existing surface
 
     Init (me : mutable; S: Surface from Geom);
diff --git a/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.cdl b/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.cdl
index 03ef3235c1..91b0f45e45 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.cdl
+++ b/src/ShapeAnalysis/ShapeAnalysis_TransferParameters.cdl
@@ -39,11 +39,11 @@ uses
     HArray1OfReal from TColStd
 
 is
-    Create returns mutable TransferParameters from ShapeAnalysis;
+    Create returns TransferParameters from ShapeAnalysis;
     	---Purpose: Creates empty tool with myShift = 0 and myScale = 1
     
     Create(E : Edge from TopoDS; F : Face from TopoDS) 
-    returns mutable TransferParameters from ShapeAnalysis;
+    returns TransferParameters from ShapeAnalysis;
     	---Purpose: Creates a tool and initializes it with edge and face
     
     Init(me :  mutable;E : Edge from TopoDS; F : Face from TopoDS ) is virtual;
diff --git a/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cdl b/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cdl
index fdfebdeb30..cfc92711e6 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cdl
+++ b/src/ShapeAnalysis/ShapeAnalysis_TransferParametersProj.cdl
@@ -33,11 +33,11 @@ uses
     Vertex from TopoDS
 is
 
-    Create returns mutable TransferParametersProj from ShapeAnalysis;
+    Create returns TransferParametersProj from ShapeAnalysis;
     	---Purpose: Creats empty constructor. 
     
     Create(E: Edge from TopoDS; F: Face from TopoDS) 
-    returns mutable TransferParametersProj from ShapeAnalysis;
+    returns TransferParametersProj from ShapeAnalysis;
     	---Purpose:
     
     Init(me: mutable; E: Edge from TopoDS; F: Face from TopoDS ) is redefined;
diff --git a/src/ShapeBuild/ShapeBuild_ReShape.cdl b/src/ShapeBuild/ShapeBuild_ReShape.cdl
index 634dd90e44..f25a1db559 100644
--- a/src/ShapeBuild/ShapeBuild_ReShape.cdl
+++ b/src/ShapeBuild/ShapeBuild_ReShape.cdl
@@ -36,7 +36,7 @@ uses
 
 is
 
-    Create returns mutable ReShape from ShapeBuild;
+    Create returns ReShape from ShapeBuild;
     	---Purpose: Returns an empty Reshape
 
     Apply (me: mutable; shape: Shape from TopoDS; until: ShapeEnum from TopAbs; buildmode: Integer)
diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cdl b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cdl
index 84ef32cbf1..a6d1721ec7 100644
--- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cdl
+++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cdl
@@ -34,7 +34,7 @@ uses
     RestrictionParameters from ShapeCustom
     
 is
-    Create  returns  mutable BSplineRestriction from ShapeCustom;  
+    Create  returns BSplineRestriction from ShapeCustom;  
     	---Purpose: Empty constructor.
     
     
@@ -45,7 +45,7 @@ is
            aContinuity3d, aContinuity2d: Shape from GeomAbs ;  
     	   aMaxDegree, aNbMaxSeg       : Integer; 
     	   Degree, Rational            : Boolean)
-    returns  mutable BSplineRestriction from ShapeCustom;
+    returns BSplineRestriction from ShapeCustom;
         ---Purpose: Initializes with specified parameters of aproximation.
     
     Create(anApproxSurfaceFlag, anApproxCurve3dFlag, anApproxCurve2dFlag: Boolean from Standard;
@@ -54,7 +54,7 @@ is
     	   aMaxDegree, aNbMaxSeg                                        : Integer; 
     	   Degree, Rational                                             : Boolean;
 	   aModes                                       : RestrictionParameters from ShapeCustom)
-    returns  mutable BSplineRestriction from ShapeCustom;  
+    returns BSplineRestriction from ShapeCustom;  
     	---Purpose: Initializes with specified parameters of aproximation.
     
     NewSurface(me: mutable; F       :     Face     from TopoDS;
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cdl b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cdl
index 5635fe7105..598642138e 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cdl
+++ b/src/ShapeCustom/ShapeCustom_ConvertToBSpline.cdl
@@ -35,7 +35,7 @@ uses
     Location from TopLoc
 is
 
-    Create returns mutable ConvertToBSpline from ShapeCustom;
+    Create returns ConvertToBSpline from ShapeCustom;
     
     SetExtrusionMode(me: mutable; extrMode: Boolean);
     	---Purpose: Sets mode for convertion of Surfaces of Linear
diff --git a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cdl b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cdl
index 401db47f75..c729496c2d 100644
--- a/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cdl
+++ b/src/ShapeCustom/ShapeCustom_ConvertToRevolution.cdl
@@ -35,7 +35,7 @@ uses
 
 is
 
-    Create returns mutable ConvertToRevolution from ShapeCustom;
+    Create returns ConvertToRevolution from ShapeCustom;
 
     NewSurface(me: mutable; F  :     Face     from TopoDS;
                             S  : out Surface  from Geom;
diff --git a/src/ShapeCustom/ShapeCustom_DirectModification.cdl b/src/ShapeCustom/ShapeCustom_DirectModification.cdl
index 7dd4ab5554..47d20bb99f 100644
--- a/src/ShapeCustom/ShapeCustom_DirectModification.cdl
+++ b/src/ShapeCustom/ShapeCustom_DirectModification.cdl
@@ -36,7 +36,7 @@ uses
 
 is
 
-    Create returns mutable DirectModification from ShapeCustom;
+    Create returns DirectModification from ShapeCustom;
 
     NewSurface(me: mutable; F  :     Face     from TopoDS;
                             S  : out Surface  from Geom;
diff --git a/src/ShapeCustom/ShapeCustom_RestrictionParameters.cdl b/src/ShapeCustom/ShapeCustom_RestrictionParameters.cdl
index 4c9380b0af..3923c52668 100644
--- a/src/ShapeCustom/ShapeCustom_RestrictionParameters.cdl
+++ b/src/ShapeCustom/ShapeCustom_RestrictionParameters.cdl
@@ -21,7 +21,7 @@ class RestrictionParameters from ShapeCustom inherits TShared from MMgt
 
 is
 
-    Create returns mutable RestrictionParameters from ShapeCustom;
+    Create returns RestrictionParameters from ShapeCustom;
     	---Purpose: Sets default parameters.
     
     ---Methods for modifying fields.
diff --git a/src/ShapeCustom/ShapeCustom_SweptToElementary.cdl b/src/ShapeCustom/ShapeCustom_SweptToElementary.cdl
index 2e69dedb10..d08c531491 100644
--- a/src/ShapeCustom/ShapeCustom_SweptToElementary.cdl
+++ b/src/ShapeCustom/ShapeCustom_SweptToElementary.cdl
@@ -34,7 +34,7 @@ uses
 
 is
 
-    Create returns mutable SweptToElementary from ShapeCustom;
+    Create returns SweptToElementary from ShapeCustom;
 
     NewSurface(me: mutable; F  :     Face     from TopoDS;
                             S  : out Surface  from Geom;
diff --git a/src/ShapeCustom/ShapeCustom_TrsfModification.cdl b/src/ShapeCustom/ShapeCustom_TrsfModification.cdl
index f335e59b2b..6f53f564f8 100644
--- a/src/ShapeCustom/ShapeCustom_TrsfModification.cdl
+++ b/src/ShapeCustom/ShapeCustom_TrsfModification.cdl
@@ -37,7 +37,7 @@ uses
     Pnt      from gp
 
 is
-    Create (T: Trsf from gp) returns mutable TrsfModification from ShapeCustom;
+    Create (T: Trsf from gp) returns TrsfModification from ShapeCustom;
     	---Purpose: Empty constructor
     
     NewSurface (me: mutable; F       :     Face     from TopoDS;
diff --git a/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.cdl b/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.cdl
index 58df9248fc..984eac00be 100644
--- a/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.cdl
+++ b/src/ShapeExtend/ShapeExtend_BasicMsgRegistrator.cdl
@@ -33,7 +33,7 @@ uses
      
 is
 
-    Create returns mutable BasicMsgRegistrator from ShapeExtend;
+    Create returns BasicMsgRegistrator from ShapeExtend;
     	---Purpose: Empty constructor.
 
     Send (me: mutable; object : Transient;
diff --git a/src/ShapeExtend/ShapeExtend_ComplexCurve.cdl b/src/ShapeExtend/ShapeExtend_ComplexCurve.cdl
index f852255785..ddd8f9ab3d 100644
--- a/src/ShapeExtend/ShapeExtend_ComplexCurve.cdl
+++ b/src/ShapeExtend/ShapeExtend_ComplexCurve.cdl
@@ -29,7 +29,7 @@ uses
 
 is
 
-    Initialize returns mutable ComplexCurve from ShapeExtend;
+    Initialize returns ComplexCurve from ShapeExtend;
     	---Purpose:
 
     NbCurves (me) returns Integer is deferred;
diff --git a/src/ShapeExtend/ShapeExtend_CompositeSurface.cdl b/src/ShapeExtend/ShapeExtend_CompositeSurface.cdl
index a3172f7bad..9044766e7b 100644
--- a/src/ShapeExtend/ShapeExtend_CompositeSurface.cdl
+++ b/src/ShapeExtend/ShapeExtend_CompositeSurface.cdl
@@ -64,17 +64,17 @@ uses
 
 is 
  
-    Create returns mutable CompositeSurface from ShapeExtend; 
+    Create returns CompositeSurface from ShapeExtend; 
     	---Purpose: Empty constructor.
     
     Create (GridSurf: HArray2OfSurface from TColGeom; 
             param   : Parametrisation from ShapeExtend = ShapeExtend_Natural) 
-    returns mutable CompositeSurface from ShapeExtend; 
+    returns CompositeSurface from ShapeExtend; 
     	---Purpose: Initializes by a grid of surfaces (calls Init()).
     
     Create (GridSurf: HArray2OfSurface from TColGeom; 
             UJoints, VJoints : Array1OfReal from TColStd) 
-    returns mutable CompositeSurface from ShapeExtend; 
+    returns CompositeSurface from ShapeExtend; 
     	---Purpose: Initializes by a grid of surfaces (calls Init()).
     
     Init (me: mutable; GridSurf: HArray2OfSurface from TColGeom; 
@@ -222,7 +222,7 @@ is
     Transform (me : mutable; T : Trsf) is redefined;
         ---Purpose: Applies transformation to all the patches
 
-    Copy (me) returns mutable like me is redefined;
+    Copy (me) returns like me is redefined;
         ---Purpose: Returns a copy of the surface
     
     UReverse (me : mutable) is redefined;
@@ -254,10 +254,10 @@ is
     IsVPeriodic (me) returns Boolean is redefined;
         ---Purpose: Returns False
 
-    UIso (me; U : Real) returns mutable Curve is redefined;
+    UIso (me; U : Real) returns Curve is redefined;
         ---Purpose: NOT IMPLEMENTED (returns Null curve)
 
-    VIso (me; V : Real) returns mutable Curve is redefined;
+    VIso (me; V : Real) returns Curve is redefined;
         ---Purpose: NOT IMPLEMENTED (returns Null curve)
 
 
diff --git a/src/ShapeExtend/ShapeExtend_MsgRegistrator.cdl b/src/ShapeExtend/ShapeExtend_MsgRegistrator.cdl
index cd6113874c..48dd25408b 100644
--- a/src/ShapeExtend/ShapeExtend_MsgRegistrator.cdl
+++ b/src/ShapeExtend/ShapeExtend_MsgRegistrator.cdl
@@ -35,7 +35,7 @@ uses
 
 is
 
-    Create returns mutable MsgRegistrator from ShapeExtend;
+    Create returns MsgRegistrator from ShapeExtend;
     	---Purpose: Creates an object.
 	
     
diff --git a/src/ShapeExtend/ShapeExtend_WireData.cdl b/src/ShapeExtend/ShapeExtend_WireData.cdl
index 730a451b1f..5b80e65f60 100644
--- a/src/ShapeExtend/ShapeExtend_WireData.cdl
+++ b/src/ShapeExtend/ShapeExtend_WireData.cdl
@@ -51,12 +51,12 @@ uses
 
 is
 
-    Create returns mutable WireData from ShapeExtend;
+    Create returns WireData from ShapeExtend;
     	---Purpose: Empty constructor, creates empty wire with no edges
 
     Create (wire: Wire from TopoDS; chained: Boolean = Standard_True ;
             theManifoldMode :Boolean = Standard_True)
-    returns mutable WireData from ShapeExtend;
+    returns WireData from ShapeExtend;
     	---Purpose: Constructor initializing the data from TopoDS_Wire. Calls Init(wire,chained).
 
     Init (me: mutable; other: WireData from ShapeExtend);
diff --git a/src/ShapeFix/ShapeFix_EdgeProjAux.cdl b/src/ShapeFix/ShapeFix_EdgeProjAux.cdl
index 40ed93f7b0..b09a04744a 100644
--- a/src/ShapeFix/ShapeFix_EdgeProjAux.cdl
+++ b/src/ShapeFix/ShapeFix_EdgeProjAux.cdl
@@ -28,10 +28,10 @@ uses
     
 is
 
-    Create returns mutable EdgeProjAux from ShapeFix;
+    Create returns EdgeProjAux from ShapeFix;
 
     Create (F: Face from TopoDS; E: Edge from TopoDS)
-    returns mutable EdgeProjAux from ShapeFix;
+    returns EdgeProjAux from ShapeFix;
     
     Init (me: mutable; F: Face from TopoDS; E: Edge from TopoDS);
 
diff --git a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cdl b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cdl
index 056ec6d069..34a719179c 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_ConvertSurfaceToBezierBasis.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-    Create returns mutable ConvertSurfaceToBezierBasis from ShapeUpgrade;
+    Create returns ConvertSurfaceToBezierBasis from ShapeUpgrade;
     	---Purpose: Empty constructor.
     
     Build (me: mutable; Segment: Boolean) is redefined;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cdl b/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cdl
index 17262d77d9..86f72f61ca 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_EdgeDivide.cdl
@@ -27,7 +27,7 @@ uses
 
 is
 
-    Create returns mutable EdgeDivide from ShapeUpgrade;
+    Create returns EdgeDivide from ShapeUpgrade;
     	---Purpose: Empty constructor
     
     Clear (me: mutable);
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cdl b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cdl
index 53e07d32d9..ef81325f6d 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve.cdl
@@ -26,7 +26,7 @@ uses
     Status         from  ShapeExtend
 is 
  
-    Create returns mutable SplitCurve from ShapeUpgrade;
+    Create returns SplitCurve from ShapeUpgrade;
     	---Purpose: Empty constructor.
 
     Init (me: mutable; First, Last: Real);
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cdl b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cdl
index 1597a0e856..5a26d09eda 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve2d.cdl
@@ -24,7 +24,7 @@ uses
    
 is 
  
-    Create returns mutable SplitCurve2d from ShapeUpgrade;
+    Create returns SplitCurve2d from ShapeUpgrade;
     	---Purpose: Empty constructor.
 
     Init (me: mutable; C: Curve from  Geom2d);
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cdl b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cdl
index 60628dd79d..3bf1c0da0a 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitCurve3d.cdl
@@ -24,7 +24,7 @@ uses
    
 is 
  
-    Create returns mutable SplitCurve3d from ShapeUpgrade;
+    Create returns SplitCurve3d from ShapeUpgrade;
     	---Purpose: Empty constructor.
 
     Init (me: mutable; C: Curve from  Geom);
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cdl b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cdl
index 5d49d08f71..b42b23ecc1 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurface.cdl
@@ -28,7 +28,7 @@ uses
 
 is 
  
-    Create returns mutable SplitSurface from ShapeUpgrade; 
+    Create returns SplitSurface from ShapeUpgrade; 
     	---Purpose: Empty constructor.
     
     Init (me: mutable; S: Surface from Geom);  
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.cdl b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.cdl
index ac25639251..489d3c6ecb 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceAngle.cdl
@@ -22,7 +22,7 @@ class SplitSurfaceAngle from ShapeUpgrade inherits SplitSurface from ShapeUpgrad
 
 is
 
-    Create (MaxAngle: Real)  returns mutable SplitSurfaceAngle from ShapeUpgrade;
+    Create (MaxAngle: Real)  returns SplitSurfaceAngle from ShapeUpgrade;
     	---Purpose: Empty constructor.
     
     SetMaxAngle (me: mutable; MaxAngle: Real);
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.cdl b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.cdl
index b1704921b8..a663fa0d40 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceArea.cdl
@@ -21,7 +21,7 @@ class SplitSurfaceArea from ShapeUpgrade inherits SplitSurface from ShapeUpgrade
 
 
 is
-    Create returns mutable SplitSurfaceArea from ShapeUpgrade; 
+    Create returns SplitSurfaceArea from ShapeUpgrade; 
     	---Purpose: Empty constructor.
     
     NbParts(me: mutable) returns Integer;
diff --git a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cdl b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cdl
index 2c77d57a63..6d0bf00feb 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_SplitSurfaceContinuity.cdl
@@ -28,7 +28,7 @@ uses
 
 is
 
-    Create returns mutable SplitSurfaceContinuity from ShapeUpgrade; 
+    Create returns SplitSurfaceContinuity from ShapeUpgrade; 
         ---Purpose: Empty constructor.
 	
     SetCriterion (me: mutable; Criterion: Shape from GeomAbs);
diff --git a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cdl b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cdl
index fe3ff94b3d..b14a863c4f 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cdl
+++ b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cdl
@@ -44,7 +44,7 @@ uses
     FixSmallCurves from ShapeUpgrade
 is
 
-    Create returns mutable WireDivide from ShapeUpgrade;
+    Create returns WireDivide from ShapeUpgrade;
     	---Purpose: Empty constructor
 	
     Init (me: mutable; W: Wire from TopoDS; F: Face from TopoDS);
diff --git a/src/Standard/Standard_Failure.cdl b/src/Standard/Standard_Failure.cdl
index aaee2a26c2..6890cb484e 100644
--- a/src/Standard/Standard_Failure.cdl
+++ b/src/Standard/Standard_Failure.cdl
@@ -33,13 +33,13 @@ raises
     
 is
 
-    Create returns mutable Failure;
+    Create returns Failure;
     	---Purpose: 
     	--   Creates a status object of type "Failure".
     	---Level: Advanced
 	---C++: alias "Standard_EXPORT Standard_Failure (const Standard_Failure& f);"
 
-    Create (aString: CString) returns mutable Failure;
+    Create (aString: CString) returns Failure;
     	---Purpose: 
     	--   Creates a status object of type "Failure".
         ---Level: Advanced
@@ -87,7 +87,7 @@ is
     	--          at run-time.
         ---Level: Advanced
     
-    NewInstance(myclass; aMessage: CString) returns mutable Failure;
+    NewInstance(myclass; aMessage: CString) returns Failure;
    	---Purpose: Used to construct an instance of the exception object
 	--          as a handle. Shall be used to protect against possible
 	--          construction of exception object in C stack -- that is 
@@ -102,7 +102,7 @@ is
         --          converted to C++ exception.
         ---Level: Advanced, not for regular use
     
-    Caught (myclass) returns mutable Failure raises NoSuchObject;
+    Caught (myclass) returns Failure raises NoSuchObject;
     	---Purpose: Returns the last caught exception. 
 	--          Needed when exceptions are emulated by C longjumps,
         --          in other cases is also provided for compatibility.
diff --git a/src/Standard/Standard_Persistent.cdl b/src/Standard/Standard_Persistent.cdl
index a146003c59..d0e5156788 100644
--- a/src/Standard/Standard_Persistent.cdl
+++ b/src/Standard/Standard_Persistent.cdl
@@ -110,7 +110,7 @@ is
     	    -- assert(p->IsKind(tt));   
     	is static;
 	    
-	This (me) returns mutable Persistent
+	This (me) returns Persistent
 	    ---Purpose:  Returns a handle on the object. 
     	    -- This method is useful only in constructors of persistent 
     	    -- objects when you need a handle on the object being constructed. 
diff --git a/src/Standard/Standard_Transient.cdl b/src/Standard/Standard_Transient.cdl
index f76e3fc252..27058cf440 100644
--- a/src/Standard/Standard_Transient.cdl
+++ b/src/Standard/Standard_Transient.cdl
@@ -70,7 +70,7 @@ is
 	    --          Note that multiple inheritance is not supported by OCCT RTTI mechanism.
 	    ---Level: Advanced
 	    
-	This (me) returns mutable Transient
+	This (me) returns Transient
 	    ---Purpose: Returns a Handle which references this object.
 	    ---Warning: Must never be called to objects created in stack.
 	    ---Level: Advanced
diff --git a/src/Standard/Standard_Type.cdl b/src/Standard/Standard_Type.cdl
index fbef45f9d3..0b2ebcfffe 100644
--- a/src/Standard/Standard_Type.cdl
+++ b/src/Standard/Standard_Type.cdl
@@ -70,7 +70,7 @@ is
    ---Purpose:
    --   The constructor for a imported type.
    ---Level: Advanced
-   returns mutable Type;
+   returns Type;
 
    Create(aName           : CString;
 	  aSize		  : Integer;
@@ -79,7 +79,7 @@ is
    ---Purpose:
    --   The constructor for a primitive.
    ---Level: Advanced
-   returns mutable Type;
+   returns Type;
 
    Create(aName           : CString;
 	  aSize		  : Integer;
@@ -90,7 +90,7 @@ is
    ---Purpose:
    --   The constructor for an enumeration.
    ---Level: Advanced
-   returns mutable Type;
+   returns Type;
 
    Create(aName           : CString;
 	  aSize		  : Integer;
@@ -100,7 +100,7 @@ is
    ---Purpose:
    --   The constructor for a class.
    ---Level: Advanced
-   returns mutable Type;
+   returns Type;
 
    ---------------------------------------------------------------------
    ---Category: Comparison between types
diff --git a/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.cdl b/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.cdl
index 58102642fc..e8ba311597 100644
--- a/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.cdl
+++ b/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create
-    returns mutable DocumentRetrievalDriver from StdDrivers;
+    returns DocumentRetrievalDriver from StdDrivers;
 
     AttributeDrivers(me : mutable; theMessageDriver : MessageDriver from CDM) 
     returns ARDriverTable from MDF
diff --git a/src/StdDrivers/StdDrivers_DocumentStorageDriver.cdl b/src/StdDrivers/StdDrivers_DocumentStorageDriver.cdl
index bf2877634a..26fd1efe6e 100644
--- a/src/StdDrivers/StdDrivers_DocumentStorageDriver.cdl
+++ b/src/StdDrivers/StdDrivers_DocumentStorageDriver.cdl
@@ -29,7 +29,7 @@ uses Document from CDM,
 is
 
     Create
-    returns mutable DocumentStorageDriver from StdDrivers;
+    returns DocumentStorageDriver from StdDrivers;
     
     Make(me : mutable; aDocument :     Document from CDM;
                        Documents : out SequenceOfDocument from PCDM)
diff --git a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cdl b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cdl
index 07aec58603..487744c39e 100644
--- a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cdl
+++ b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create
-    returns mutable DocumentRetrievalDriver from StdLDrivers;
+    returns DocumentRetrievalDriver from StdLDrivers;
 
     AttributeDrivers(me : mutable; theMessageDriver : MessageDriver from CDM) 
     returns ARDriverTable from MDF
diff --git a/src/StdLDrivers/StdLDrivers_DocumentStorageDriver.cdl b/src/StdLDrivers/StdLDrivers_DocumentStorageDriver.cdl
index 144df70851..5b96bb1114 100644
--- a/src/StdLDrivers/StdLDrivers_DocumentStorageDriver.cdl
+++ b/src/StdLDrivers/StdLDrivers_DocumentStorageDriver.cdl
@@ -29,7 +29,7 @@ uses Document from CDM,
 is
 
     Create
-    returns mutable DocumentStorageDriver from StdLDrivers;
+    returns DocumentStorageDriver from StdLDrivers;
     
     Make(me : mutable; aDocument :     Document from CDM;
                        Documents : out SequenceOfDocument from PCDM)
diff --git a/src/StdSelect/StdSelect.cdl b/src/StdSelect/StdSelect.cdl
index 9011ccbacd..151213a3b9 100644
--- a/src/StdSelect/StdSelect.cdl
+++ b/src/StdSelect/StdSelect.cdl
@@ -123,7 +123,7 @@ is
 
     GetProjector (aView: View from V3d) returns Projector from Select3D;
     	---Purpose: Returns the 3D projector for the view aView.
-    SetDrawerForBRepOwner(aSelection: mutable Selection from SelectMgr;
+    SetDrawerForBRepOwner(aSelection: Selection from SelectMgr;
 			  aDrawer   : Drawer from Prs3d);
      	---Purpose: puts The same drawer in every BRepOwner Of SensitivePrimitive
      	--          Used Only for hilight Of BRepOwner...
diff --git a/src/StdSelect/StdSelect_BRepOwner.cdl b/src/StdSelect/StdSelect_BRepOwner.cdl
index 650a6a4eff..63241b1982 100644
--- a/src/StdSelect/StdSelect_BRepOwner.cdl
+++ b/src/StdSelect/StdSelect_BRepOwner.cdl
@@ -37,13 +37,13 @@ is
 
 
     Create(aPriority:Integer from Standard)
-    returns mutable BRepOwner from StdSelect;
+    returns BRepOwner from StdSelect;
     	---Purpose: Constructs an owner specification framework defined
     	-- by the priority aPriority.
     Create (aShape    : Shape from TopoDS;
     	    aPriority : Integer = 0;
     	    ComesFromDecomposition:Boolean from Standard = Standard_False)
-    returns mutable BRepOwner;
+    returns BRepOwner;
     	---Purpose: Constructs an owner specification framework defined
     	-- by the shape aShape and the priority aPriority.
     	-- aShape and aPriority are stored in this framework. If
@@ -54,7 +54,7 @@ is
     	    theOrigin : SelectableObject from SelectMgr;
     	    aPriority : Integer = 0;
 	    FromDecomposition:Boolean from Standard = Standard_False)
-    returns mutable BRepOwner;
+    returns BRepOwner;
     	---Purpose: Constructs an owner specification framework defined
     	-- by the shape aShape, the selectable object theOrigin
     	-- and the priority aPriority.
diff --git a/src/StdSelect/StdSelect_BRepSelectionTool.cdl b/src/StdSelect/StdSelect_BRepSelectionTool.cdl
index d0d33f3a21..1b8094fd05 100644
--- a/src/StdSelect/StdSelect_BRepSelectionTool.cdl
+++ b/src/StdSelect/StdSelect_BRepSelectionTool.cdl
@@ -64,7 +64,7 @@ uses
 is
     
     Load(myclass;
-    	 aSelection        : mutable Selection from SelectMgr;
+    	 aSelection        : Selection from SelectMgr;
     	 aShape            : Shape             from TopoDS;
 	 aType             : ShapeEnum         from TopAbs;
      theDeflection : Real from Standard;
@@ -90,7 +90,7 @@ is
 
 
     Load(myclass;
-    	 aSelection : mutable Selection from SelectMgr;
+    	 aSelection : Selection from SelectMgr;
     	 Origin     : SelectableObject  from SelectMgr;
     	 aShape     : Shape             from TopoDS;
 	 aType      : ShapeEnum         from TopAbs;
@@ -106,7 +106,7 @@ is
 
 
    -- Load(myclass;
-    --	 aSelection : mutable Selection from SelectMgr;
+    --	 aSelection : Selection from SelectMgr;
     --	 Users      : SequenceOfAddress from SelectBasics;
     --	 aShape     : Shape             from TopoDS;
     -- aType      : ShapeEnum         from TopAbs;
@@ -135,7 +135,7 @@ is
     ComputeSensitive(myclass;
     	    	     aShape     : Shape     from TopoDS;
 		     anOwner    : BRepOwner from StdSelect;
-		     aSelection : mutable Selection from SelectMgr;
+		     aSelection : Selection from SelectMgr;
 		     theDeflection : Real from Standard;
 		     theDeviationAngle : Real from Standard;
     	    	     NbPOnEdge  : Integer;
@@ -155,7 +155,7 @@ is
     GetEdgeSensitive(myclass;
     	    	     aShape     : Shape     from TopoDS;
 		     anOwner    : BRepOwner from StdSelect;
-		     aSelection : mutable Selection from SelectMgr;
+		     aSelection : Selection from SelectMgr;
 		     theDeflection : Real from Standard;
 		     theDeflectionAngle : Real from Standard;
     	    	     NbPOnEdge  : Integer;
diff --git a/src/StdSelect/StdSelect_EdgeFilter.cdl b/src/StdSelect/StdSelect_EdgeFilter.cdl
index 77f2effd2a..258427c08e 100644
--- a/src/StdSelect/StdSelect_EdgeFilter.cdl
+++ b/src/StdSelect/StdSelect_EdgeFilter.cdl
@@ -29,7 +29,7 @@ uses
     ShapeEnum from TopAbs
 is
     Create (Edge: TypeOfEdge from StdSelect)
-    returns mutable EdgeFilter from StdSelect;
+    returns EdgeFilter from StdSelect;
     	---Purpose: Constructs an edge filter object defined by the type of edge Edge.   
     SetType(me:mutable;aNewType : TypeOfEdge from StdSelect);  
     	---Purpose: Sets the type of edge aNewType. aNewType is to be highlighted in selection.    
diff --git a/src/StdSelect/StdSelect_FaceFilter.cdl b/src/StdSelect/StdSelect_FaceFilter.cdl
index 1d2f8d60fa..62f0cb9c87 100644
--- a/src/StdSelect/StdSelect_FaceFilter.cdl
+++ b/src/StdSelect/StdSelect_FaceFilter.cdl
@@ -33,7 +33,7 @@ uses
 is
 
     Create (aTypeOfFace: TypeOfFace from StdSelect)
-    returns mutable FaceFilter from StdSelect;
+    returns FaceFilter from StdSelect;
     	---Purpose: Constructs a face filter object defined by the type of face aTypeOfFace.    
     SetType(me:mutable;aNewType : TypeOfFace from StdSelect);  
     	--- Purpose: Sets the type of face aNewType. aNewType is to be highlighted in selection.   
diff --git a/src/StdSelect/StdSelect_Prs.cdl b/src/StdSelect/StdSelect_Prs.cdl
index bace49c976..63d56ee446 100644
--- a/src/StdSelect/StdSelect_Prs.cdl
+++ b/src/StdSelect/StdSelect_Prs.cdl
@@ -24,7 +24,7 @@ uses
 
 is
     Create(aStructureManager: StructureManager from Graphic3d)
-    returns mutable Prs;
+    returns Prs;
 
     Manager(me) returns any StructureManager from Graphic3d;
     	---C++: inline
diff --git a/src/StdSelect/StdSelect_Shape.cdl b/src/StdSelect/StdSelect_Shape.cdl
index ba802aa436..fc3d7ff147 100644
--- a/src/StdSelect/StdSelect_Shape.cdl
+++ b/src/StdSelect/StdSelect_Shape.cdl
@@ -26,24 +26,24 @@ uses
     Presentation          from Prs3d
 
 is
-    Create(Sh:Shape from TopoDS) returns mutable Shape from StdSelect;
+    Create(Sh:Shape from TopoDS) returns Shape from StdSelect;
     
     Compute(me:mutable;
     	        aPresentationManager: PresentationManager3d from PrsMgr;
-                aPresentation: mutable Presentation from Prs3d;
+                aPresentation: Presentation from Prs3d;
                 aMode: Integer from Standard = 0)
     is redefined static;
     
     Compute(me:mutable;
     	        aProjector: Projector from Prs3d;
-                aPresentation: mutable Presentation from Prs3d)
+                aPresentation: Presentation from Prs3d)
     is redefined static private;     
 
 
     Compute(me            : mutable;
     	    aProjector    : Projector from Prs3d;
     	    aTrsf         : Transformation from Geom;
-	    aPresentation : mutable Presentation from Prs3d)
+	    aPresentation : Presentation from Prs3d)
     is redefined;
     	---Purpose: computes the presentation according to a point of view
     	--          given by <aProjector>. 
diff --git a/src/StdSelect/StdSelect_ShapeTypeFilter.cdl b/src/StdSelect/StdSelect_ShapeTypeFilter.cdl
index 48ece1cf3e..8be0c0b125 100644
--- a/src/StdSelect/StdSelect_ShapeTypeFilter.cdl
+++ b/src/StdSelect/StdSelect_ShapeTypeFilter.cdl
@@ -34,7 +34,7 @@ uses
 is
 
     Create (aType: ShapeEnum from TopAbs)
-    returns mutable ShapeTypeFilter from StdSelect;
+    returns ShapeTypeFilter from StdSelect;
     	---Purpose: Constructs a filter object defined by the shape type aType.
     
     IsOk (me;anobj : EntityOwner from SelectMgr) 
diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.cdl b/src/StdSelect/StdSelect_ViewerSelector3d.cdl
index dbee19e7c5..b519d631db 100644
--- a/src/StdSelect/StdSelect_ViewerSelector3d.cdl
+++ b/src/StdSelect/StdSelect_ViewerSelector3d.cdl
@@ -38,13 +38,13 @@ uses
 
 is
 
-    Create  returns mutable ViewerSelector3d from StdSelect;
+    Create  returns ViewerSelector3d from StdSelect;
     ---Purpose: Constructs an empty 3D selector object.
 
-    Create (theProj : Projector from Select3D) returns mutable ViewerSelector3d from StdSelect;
+    Create (theProj : Projector from Select3D) returns ViewerSelector3d from StdSelect;
     ---Purpose: Constructs a 3D selector object defined by the projector <theProj>.
 
-    Convert (me : mutable; theSel : mutable Selection from SelectMgr)
+    Convert (me : mutable; theSel : Selection from SelectMgr)
     is redefined static;
         ---Level: Public 
         ---Purpose: Processes the projection of the sensitive  primitives
diff --git a/src/StepAP214/StepAP214_AppliedApprovalAssignment.cdl b/src/StepAP214/StepAP214_AppliedApprovalAssignment.cdl
index bbad138324..8995286909 100644
--- a/src/StepAP214/StepAP214_AppliedApprovalAssignment.cdl
+++ b/src/StepAP214/StepAP214_AppliedApprovalAssignment.cdl
@@ -24,21 +24,21 @@ uses
     	Approval from StepBasic
 is
 
-    	Create returns mutable AppliedApprovalAssignment;
+    	Create returns AppliedApprovalAssignment;
 	---Purpose: Returns a AppliedApprovalAssignment
 
 
 	Init (me : mutable;
-	      aAssignedApproval : mutable Approval from StepBasic) is redefined;
+	      aAssignedApproval : Approval from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedApproval : mutable Approval from StepBasic;
-	      aItems : mutable HArray1OfApprovalItem from StepAP214) is virtual;
+	      aAssignedApproval : Approval from StepBasic;
+	      aItems : HArray1OfApprovalItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfApprovalItem);
-	Items (me) returns mutable HArray1OfApprovalItem;
+	SetItems(me : mutable; aItems : HArray1OfApprovalItem);
+	Items (me) returns HArray1OfApprovalItem;
 	ItemsValue (me; num : Integer) returns ApprovalItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cdl b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cdl
index c58a810ba7..23803f868a 100644
--- a/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cdl
+++ b/src/StepAP214/StepAP214_AppliedDateAndTimeAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	DateTimeRole from StepBasic
 is
 
-	Create returns mutable AppliedDateAndTimeAssignment;
+	Create returns AppliedDateAndTimeAssignment;
 	---Purpose: Returns a AppliedDateAndTimeAssignment
 
 
 	Init (me : mutable;
-	      aAssignedDateAndTime : mutable DateAndTime from StepBasic;
-	      aRole : mutable DateTimeRole from StepBasic) is redefined;
+	      aAssignedDateAndTime : DateAndTime from StepBasic;
+	      aRole : DateTimeRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedDateAndTime : mutable DateAndTime from StepBasic;
-	      aRole : mutable DateTimeRole from StepBasic;
-	      aItems : mutable HArray1OfDateAndTimeItem from StepAP214) is virtual;
+	      aAssignedDateAndTime : DateAndTime from StepBasic;
+	      aRole : DateTimeRole from StepBasic;
+	      aItems : HArray1OfDateAndTimeItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfDateAndTimeItem);
-	Items (me) returns mutable HArray1OfDateAndTimeItem;
+	SetItems(me : mutable; aItems : HArray1OfDateAndTimeItem);
+	Items (me) returns HArray1OfDateAndTimeItem;
 	ItemsValue (me; num : Integer) returns DateAndTimeItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AppliedDateAssignment.cdl b/src/StepAP214/StepAP214_AppliedDateAssignment.cdl
index d76f8f3b1f..5623440a0e 100644
--- a/src/StepAP214/StepAP214_AppliedDateAssignment.cdl
+++ b/src/StepAP214/StepAP214_AppliedDateAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	DateRole from StepBasic
 is
 
-	Create returns mutable AppliedDateAssignment;
+	Create returns AppliedDateAssignment;
 	---Purpose: Returns a AppliedDateAssignment
 
 
 	Init (me : mutable;
-	      aAssignedDate : mutable Date from StepBasic;
-	      aRole : mutable DateRole from StepBasic) is redefined;
+	      aAssignedDate : Date from StepBasic;
+	      aRole : DateRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedDate : mutable Date from StepBasic;
-	      aRole : mutable DateRole from StepBasic;
-	      aItems : mutable HArray1OfDateItem from StepAP214) is virtual;
+	      aAssignedDate : Date from StepBasic;
+	      aRole : DateRole from StepBasic;
+	      aItems : HArray1OfDateItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfDateItem);
-	Items (me) returns mutable HArray1OfDateItem;
+	SetItems(me : mutable; aItems : HArray1OfDateItem);
+	Items (me) returns HArray1OfDateItem;
 	ItemsValue (me; num : Integer) returns DateItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cdl b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cdl
index 5ad57f2687..d36ed530ce 100644
--- a/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cdl
+++ b/src/StepAP214/StepAP214_AppliedOrganizationAssignment.cdl
@@ -26,23 +26,23 @@ uses
 
 is
     
-    Create returns mutable AppliedOrganizationAssignment;
+    Create returns AppliedOrganizationAssignment;
 	---Purpose: Returns a AppliedOrganizationAssignment
 
 
 	Init (me : mutable;
-	      aAssignedOrganization : mutable Organization from StepBasic;
-	      aRole : mutable OrganizationRole from StepBasic) is redefined;
+	      aAssignedOrganization : Organization from StepBasic;
+	      aRole : OrganizationRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedOrganization : mutable Organization from StepBasic;
-	      aRole : mutable OrganizationRole from StepBasic;
-	      aItems : mutable HArray1OfOrganizationItem from StepAP214) is virtual;
+	      aAssignedOrganization : Organization from StepBasic;
+	      aRole : OrganizationRole from StepBasic;
+	      aItems : HArray1OfOrganizationItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfOrganizationItem);
-	Items (me) returns mutable HArray1OfOrganizationItem;
+	SetItems(me : mutable; aItems : HArray1OfOrganizationItem);
+	Items (me) returns HArray1OfOrganizationItem;
 	ItemsValue (me; num : Integer) returns OrganizationItem;
 	NbItems (me) returns Integer;
     
diff --git a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cdl b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cdl
index 5c835ae645..c8fe7cce27 100644
--- a/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cdl
+++ b/src/StepAP214/StepAP214_AppliedPersonAndOrganizationAssignment.cdl
@@ -27,22 +27,22 @@ uses
     	PersonAndOrganizationRole from StepBasic
 
 is
-    	Create returns mutable AppliedPersonAndOrganizationAssignment;
+    	Create returns AppliedPersonAndOrganizationAssignment;
 	---Purpose: Returns a AutoDesignDateAndPersonAssignment
 	
 	Init (me : mutable;
-	      aAssignedPersonAndOrganization : mutable PersonAndOrganization from StepBasic;
-	      aRole : mutable PersonAndOrganizationRole from StepBasic) is redefined;
+	      aAssignedPersonAndOrganization : PersonAndOrganization from StepBasic;
+	      aRole : PersonAndOrganizationRole from StepBasic) is redefined;
 	
 	Init (me : mutable;
-	      aAssignedPersonAndOrganization : mutable PersonAndOrganization from StepBasic;
-	      aRole : mutable PersonAndOrganizationRole from StepBasic;
-	      aItems : mutable HArray1OfPersonAndOrganizationItem from StepAP214) is virtual;
+	      aAssignedPersonAndOrganization : PersonAndOrganization from StepBasic;
+	      aRole : PersonAndOrganizationRole from StepBasic;
+	      aItems : HArray1OfPersonAndOrganizationItem from StepAP214) is virtual;
 	
     	-- Specific Methods for Field Data Access --
 	
-	SetItems(me : mutable; aItems : mutable HArray1OfPersonAndOrganizationItem);
-	Items (me) returns mutable HArray1OfPersonAndOrganizationItem;
+	SetItems(me : mutable; aItems : HArray1OfPersonAndOrganizationItem);
+	Items (me) returns HArray1OfPersonAndOrganizationItem;
 	ItemsValue (me; num : Integer) returns PersonAndOrganizationItem;
 	NbItems (me) returns Integer;
 	
diff --git a/src/StepAP214/StepAP214_AppliedPresentedItem.cdl b/src/StepAP214/StepAP214_AppliedPresentedItem.cdl
index 1f1df45a1e..00f0f1bb01 100644
--- a/src/StepAP214/StepAP214_AppliedPresentedItem.cdl
+++ b/src/StepAP214/StepAP214_AppliedPresentedItem.cdl
@@ -24,16 +24,16 @@ uses
 
 
 is
-    	Create returns mutable AppliedPresentedItem;
+    	Create returns AppliedPresentedItem;
 	---Purpose: Returns a AutoDesignPresentedItem
 
 	Init (me : mutable;
-	      aItems : mutable HArray1OfPresentedItemSelect from StepAP214) is virtual;
+	      aItems : HArray1OfPresentedItemSelect from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfPresentedItemSelect);
-	Items (me) returns mutable HArray1OfPresentedItemSelect;
+	SetItems(me : mutable; aItems : HArray1OfPresentedItemSelect);
+	Items (me) returns HArray1OfPresentedItemSelect;
 	ItemsValue (me; num : Integer) returns PresentedItemSelect;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cdl b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cdl
index fc39d4b74b..835d19f235 100644
--- a/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cdl
+++ b/src/StepAP214/StepAP214_AppliedSecurityClassificationAssignment.cdl
@@ -25,21 +25,21 @@ uses
 
 
 is
-    	Create returns mutable AppliedSecurityClassificationAssignment;
+    	Create returns AppliedSecurityClassificationAssignment;
 	---Purpose: Returns a AppliedSecurityClassificationAssignment
 
 
 	Init (me : mutable;
-	      aAssignedSecurityClassification : mutable SecurityClassification from StepBasic) is redefined;
+	      aAssignedSecurityClassification : SecurityClassification from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedSecurityClassification : mutable SecurityClassification from StepBasic;
-	      aItems : mutable HArray1OfSecurityClassificationItem from StepAP214) is virtual;
+	      aAssignedSecurityClassification : SecurityClassification from StepBasic;
+	      aItems : HArray1OfSecurityClassificationItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfSecurityClassificationItem from StepAP214);
-	Items (me) returns mutable HArray1OfSecurityClassificationItem from StepAP214;
+	SetItems(me : mutable; aItems : HArray1OfSecurityClassificationItem from StepAP214);
+	Items (me) returns HArray1OfSecurityClassificationItem from StepAP214;
 	ItemsValue (me; num : Integer) returns SecurityClassificationItem;
 	---C++: return const &
 	NbItems (me) returns Integer;
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cdl
index 085272862b..98e9ec92b3 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAndTimeAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	DateTimeRole from StepBasic
 is
 
-	Create returns mutable AutoDesignActualDateAndTimeAssignment;
+	Create returns AutoDesignActualDateAndTimeAssignment;
 	---Purpose: Returns a AutoDesignActualDateAndTimeAssignment
 
 
 	Init (me : mutable;
-	      aAssignedDateAndTime : mutable DateAndTime from StepBasic;
-	      aRole : mutable DateTimeRole from StepBasic) is redefined;
+	      aAssignedDateAndTime : DateAndTime from StepBasic;
+	      aRole : DateTimeRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedDateAndTime : mutable DateAndTime from StepBasic;
-	      aRole : mutable DateTimeRole from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignDateAndTimeItem from StepAP214) is virtual;
+	      aAssignedDateAndTime : DateAndTime from StepBasic;
+	      aRole : DateTimeRole from StepBasic;
+	      aItems : HArray1OfAutoDesignDateAndTimeItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignDateAndTimeItem);
-	Items (me) returns mutable HArray1OfAutoDesignDateAndTimeItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignDateAndTimeItem);
+	Items (me) returns HArray1OfAutoDesignDateAndTimeItem;
 	ItemsValue (me; num : Integer) returns AutoDesignDateAndTimeItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cdl
index cf6e46d960..f9f3d28b04 100644
--- a/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignActualDateAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	DateRole from StepBasic
 is
 
-	Create returns mutable AutoDesignActualDateAssignment;
+	Create returns AutoDesignActualDateAssignment;
 	---Purpose: Returns a AutoDesignActualDateAssignment
 
 
 	Init (me : mutable;
-	      aAssignedDate : mutable Date from StepBasic;
-	      aRole : mutable DateRole from StepBasic) is redefined;
+	      aAssignedDate : Date from StepBasic;
+	      aRole : DateRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedDate : mutable Date from StepBasic;
-	      aRole : mutable DateRole from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignDatedItem from StepAP214) is virtual;
+	      aAssignedDate : Date from StepBasic;
+	      aRole : DateRole from StepBasic;
+	      aItems : HArray1OfAutoDesignDatedItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignDatedItem);
-	Items (me) returns mutable HArray1OfAutoDesignDatedItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignDatedItem);
+	Items (me) returns HArray1OfAutoDesignDatedItem;
 	ItemsValue (me; num : Integer) returns AutoDesignDatedItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cdl
index e4675ef0cc..b169ebe145 100644
--- a/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignApprovalAssignment.cdl
@@ -25,21 +25,21 @@ uses
 	Approval from StepBasic
 is
 
-	Create returns mutable AutoDesignApprovalAssignment;
+	Create returns AutoDesignApprovalAssignment;
 	---Purpose: Returns a AutoDesignApprovalAssignment
 
 
 	Init (me : mutable;
-	      aAssignedApproval : mutable Approval from StepBasic) is redefined;
+	      aAssignedApproval : Approval from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedApproval : mutable Approval from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignGeneralOrgItem from StepAP214) is virtual;
+	      aAssignedApproval : Approval from StepBasic;
+	      aItems : HArray1OfAutoDesignGeneralOrgItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignGeneralOrgItem);
-	Items (me) returns mutable HArray1OfAutoDesignGeneralOrgItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignGeneralOrgItem);
+	Items (me) returns HArray1OfAutoDesignGeneralOrgItem;
 	ItemsValue (me; num : Integer) returns AutoDesignGeneralOrgItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cdl
index b2f1905ff3..3589f44a60 100644
--- a/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignDateAndPersonAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	PersonAndOrganizationRole from StepBasic
 is
 
-	Create returns mutable AutoDesignDateAndPersonAssignment;
+	Create returns AutoDesignDateAndPersonAssignment;
 	---Purpose: Returns a AutoDesignDateAndPersonAssignment
 
 
 	Init (me : mutable;
-	      aAssignedPersonAndOrganization : mutable PersonAndOrganization from StepBasic;
-	      aRole : mutable PersonAndOrganizationRole from StepBasic) is redefined;
+	      aAssignedPersonAndOrganization : PersonAndOrganization from StepBasic;
+	      aRole : PersonAndOrganizationRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedPersonAndOrganization : mutable PersonAndOrganization from StepBasic;
-	      aRole : mutable PersonAndOrganizationRole from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignDateAndPersonItem from StepAP214) is virtual;
+	      aAssignedPersonAndOrganization : PersonAndOrganization from StepBasic;
+	      aRole : PersonAndOrganizationRole from StepBasic;
+	      aItems : HArray1OfAutoDesignDateAndPersonItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignDateAndPersonItem);
-	Items (me) returns mutable HArray1OfAutoDesignDateAndPersonItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignDateAndPersonItem);
+	Items (me) returns HArray1OfAutoDesignDateAndPersonItem;
 	ItemsValue (me; num : Integer) returns AutoDesignDateAndPersonItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cdl
index 9d1ccfb184..c11eef9836 100644
--- a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cdl
@@ -25,21 +25,18 @@ uses
 	Group from StepBasic
 is
 
-	Create returns mutable AutoDesignGroupAssignment;
+	Create returns AutoDesignGroupAssignment;
 	---Purpose: Returns a AutoDesignGroupAssignment
 
 
 	Init (me : mutable;
-	      aAssignedGroup : mutable Group from StepBasic);
-
-	Init (me : mutable;
-	      aAssignedGroup : mutable Group from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignGroupedItem from StepAP214) is virtual;
+	      aAssignedGroup : Group from StepBasic;
+	      aItems : HArray1OfAutoDesignGroupedItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignGroupedItem);
-	Items (me) returns mutable HArray1OfAutoDesignGroupedItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignGroupedItem);
+	Items (me) returns HArray1OfAutoDesignGroupedItem;
 	ItemsValue (me; num : Integer) returns AutoDesignGroupedItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
index 682f397630..682923d2cd 100644
--- a/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
+++ b/src/StepAP214/StepAP214_AutoDesignGroupAssignment.cxx
@@ -16,13 +16,6 @@
 
 StepAP214_AutoDesignGroupAssignment::StepAP214_AutoDesignGroupAssignment ()  {}
 
-void StepAP214_AutoDesignGroupAssignment::Init(
-	const Handle(StepBasic_Group)& aAssignedGroup)
-{
-
-	StepBasic_GroupAssignment::Init(aAssignedGroup);
-}
-
 void StepAP214_AutoDesignGroupAssignment::Init(
 	const Handle(StepBasic_Group)& aAssignedGroup,
 	const Handle(StepAP214_HArray1OfAutoDesignGroupedItem)& aItems)
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cdl
index 1322356112..0af9db375d 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAndTimeAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	DateTimeRole from StepBasic
 is
 
-	Create returns mutable AutoDesignNominalDateAndTimeAssignment;
+	Create returns AutoDesignNominalDateAndTimeAssignment;
 	---Purpose: Returns a AutoDesignNominalDateAndTimeAssignment
 
 
 	Init (me : mutable;
-	      aAssignedDateAndTime : mutable DateAndTime from StepBasic;
-	      aRole : mutable DateTimeRole from StepBasic) is redefined;
+	      aAssignedDateAndTime : DateAndTime from StepBasic;
+	      aRole : DateTimeRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedDateAndTime : mutable DateAndTime from StepBasic;
-	      aRole : mutable DateTimeRole from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignDateAndTimeItem from StepAP214) is virtual;
+	      aAssignedDateAndTime : DateAndTime from StepBasic;
+	      aRole : DateTimeRole from StepBasic;
+	      aItems : HArray1OfAutoDesignDateAndTimeItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignDateAndTimeItem);
-	Items (me) returns mutable HArray1OfAutoDesignDateAndTimeItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignDateAndTimeItem);
+	Items (me) returns HArray1OfAutoDesignDateAndTimeItem;
 	ItemsValue (me; num : Integer) returns AutoDesignDateAndTimeItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cdl
index b4ad4c371a..0232fbc823 100644
--- a/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignNominalDateAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	DateRole from StepBasic
 is
 
-	Create returns mutable AutoDesignNominalDateAssignment;
+	Create returns AutoDesignNominalDateAssignment;
 	---Purpose: Returns a AutoDesignNominalDateAssignment
 
 
 	Init (me : mutable;
-	      aAssignedDate : mutable Date from StepBasic;
-	      aRole : mutable DateRole from StepBasic) is redefined;
+	      aAssignedDate : Date from StepBasic;
+	      aRole : DateRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedDate : mutable Date from StepBasic;
-	      aRole : mutable DateRole from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignDatedItem from StepAP214) is virtual;
+	      aAssignedDate : Date from StepBasic;
+	      aRole : DateRole from StepBasic;
+	      aItems : HArray1OfAutoDesignDatedItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignDatedItem);
-	Items (me) returns mutable HArray1OfAutoDesignDatedItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignDatedItem);
+	Items (me) returns HArray1OfAutoDesignDatedItem;
 	ItemsValue (me; num : Integer) returns AutoDesignDatedItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cdl
index b42d19e12c..4636543cdb 100644
--- a/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignOrganizationAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	OrganizationRole from StepBasic
 is
 
-	Create returns mutable AutoDesignOrganizationAssignment;
+	Create returns AutoDesignOrganizationAssignment;
 	---Purpose: Returns a AutoDesignOrganizationAssignment
 
 
 	Init (me : mutable;
-	      aAssignedOrganization : mutable Organization from StepBasic;
-	      aRole : mutable OrganizationRole from StepBasic) is redefined;
+	      aAssignedOrganization : Organization from StepBasic;
+	      aRole : OrganizationRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedOrganization : mutable Organization from StepBasic;
-	      aRole : mutable OrganizationRole from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignGeneralOrgItem from StepAP214) is virtual;
+	      aAssignedOrganization : Organization from StepBasic;
+	      aRole : OrganizationRole from StepBasic;
+	      aItems : HArray1OfAutoDesignGeneralOrgItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignGeneralOrgItem);
-	Items (me) returns mutable HArray1OfAutoDesignGeneralOrgItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignGeneralOrgItem);
+	Items (me) returns HArray1OfAutoDesignGeneralOrgItem;
 	ItemsValue (me; num : Integer) returns AutoDesignGeneralOrgItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cdl
index 86a8fccea6..c519971436 100644
--- a/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignPersonAndOrganizationAssignment.cdl
@@ -26,23 +26,23 @@ uses
 	PersonAndOrganizationRole from StepBasic
 is
 
-	Create returns mutable AutoDesignPersonAndOrganizationAssignment;
+	Create returns AutoDesignPersonAndOrganizationAssignment;
 	---Purpose: Returns a AutoDesignPersonAndOrganizationAssignment
 
 
 	Init (me : mutable;
-	      aAssignedPersonAndOrganization : mutable PersonAndOrganization from StepBasic;
-	      aRole : mutable PersonAndOrganizationRole from StepBasic) is redefined;
+	      aAssignedPersonAndOrganization : PersonAndOrganization from StepBasic;
+	      aRole : PersonAndOrganizationRole from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedPersonAndOrganization : mutable PersonAndOrganization from StepBasic;
-	      aRole : mutable PersonAndOrganizationRole from StepBasic;
-	      aItems : mutable HArray1OfAutoDesignGeneralOrgItem from StepAP214) is virtual;
+	      aAssignedPersonAndOrganization : PersonAndOrganization from StepBasic;
+	      aRole : PersonAndOrganizationRole from StepBasic;
+	      aItems : HArray1OfAutoDesignGeneralOrgItem from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignGeneralOrgItem);
-	Items (me) returns mutable HArray1OfAutoDesignGeneralOrgItem;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignGeneralOrgItem);
+	Items (me) returns HArray1OfAutoDesignGeneralOrgItem;
 	ItemsValue (me; num : Integer) returns AutoDesignGeneralOrgItem;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignPresentedItem.cdl b/src/StepAP214/StepAP214_AutoDesignPresentedItem.cdl
index e523944fd5..a7eac8ca2d 100644
--- a/src/StepAP214/StepAP214_AutoDesignPresentedItem.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignPresentedItem.cdl
@@ -26,16 +26,16 @@ uses
 	AutoDesignPresentedItemSelect from StepAP214
 is
 
-	Create returns mutable AutoDesignPresentedItem;
+	Create returns AutoDesignPresentedItem;
 	---Purpose: Returns a AutoDesignPresentedItem
 
 	Init (me : mutable;
-	      aItems : mutable HArray1OfAutoDesignPresentedItemSelect from StepAP214) is virtual;
+	      aItems : HArray1OfAutoDesignPresentedItemSelect from StepAP214) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfAutoDesignPresentedItemSelect);
-	Items (me) returns mutable HArray1OfAutoDesignPresentedItemSelect;
+	SetItems(me : mutable; aItems : HArray1OfAutoDesignPresentedItemSelect);
+	Items (me) returns HArray1OfAutoDesignPresentedItemSelect;
 	ItemsValue (me; num : Integer) returns AutoDesignPresentedItemSelect;
 	NbItems (me) returns Integer;
 
diff --git a/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.cdl b/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.cdl
index de593ef4cd..c5ad7d7f16 100644
--- a/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.cdl
+++ b/src/StepAP214/StepAP214_AutoDesignSecurityClassificationAssignment.cdl
@@ -25,22 +25,22 @@ uses
 	SecurityClassification from StepBasic
 is
 
-	Create returns mutable AutoDesignSecurityClassificationAssignment;
+	Create returns AutoDesignSecurityClassificationAssignment;
 	---Purpose: Returns a AutoDesignSecurityClassificationAssignment
 
 
 	Init (me : mutable;
-	      aAssignedSecurityClassification : mutable SecurityClassification from StepBasic) is redefined;
+	      aAssignedSecurityClassification : SecurityClassification from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aAssignedSecurityClassification : mutable SecurityClassification from StepBasic;
-	      aItems : mutable HArray1OfApproval from StepBasic) is virtual;
+	      aAssignedSecurityClassification : SecurityClassification from StepBasic;
+	      aItems : HArray1OfApproval from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetItems(me : mutable; aItems : mutable HArray1OfApproval);
-	Items (me) returns mutable HArray1OfApproval;
-	ItemsValue (me; num : Integer) returns mutable Approval;
+	SetItems(me : mutable; aItems : HArray1OfApproval);
+	Items (me) returns HArray1OfApproval;
+	ItemsValue (me; num : Integer) returns Approval;
 	NbItems (me) returns Integer;
 
 fields
diff --git a/src/StepAP214/StepAP214_Protocol.cdl b/src/StepAP214/StepAP214_Protocol.cdl
index 37ef19f6ef..2e9144a7dc 100644
--- a/src/StepAP214/StepAP214_Protocol.cdl
+++ b/src/StepAP214/StepAP214_Protocol.cdl
@@ -22,7 +22,7 @@ uses Protocol from Interface,
      CString from Standard
 
 is
-	Create returns mutable Protocol from StepAP214;
+	Create returns Protocol from StepAP214;
 	TypeNumber (me; atype : any Type) returns Integer is redefined;
 	---Purpose :Returns a Case Number for each of the StepAP214 Entities
 	SchemaName(me) returns CString from Standard is redefined;
diff --git a/src/StepBasic/StepBasic_Address.cdl b/src/StepBasic/StepBasic_Address.cdl
index d513f79446..d6eb83b64c 100644
--- a/src/StepBasic/StepBasic_Address.cdl
+++ b/src/StepBasic/StepBasic_Address.cdl
@@ -24,84 +24,84 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable Address;
+	Create returns Address;
 	---Purpose: Returns a Address
 
 	Init (me : mutable;
 	      hasAinternalLocation : Boolean from Standard;
-	      aInternalLocation : mutable HAsciiString from TCollection;
+	      aInternalLocation : HAsciiString from TCollection;
 	      hasAstreetNumber : Boolean from Standard;
-	      aStreetNumber : mutable HAsciiString from TCollection;
+	      aStreetNumber : HAsciiString from TCollection;
 	      hasAstreet : Boolean from Standard;
-	      aStreet : mutable HAsciiString from TCollection;
+	      aStreet : HAsciiString from TCollection;
 	      hasApostalBox : Boolean from Standard;
-	      aPostalBox : mutable HAsciiString from TCollection;
+	      aPostalBox : HAsciiString from TCollection;
 	      hasAtown : Boolean from Standard;
-	      aTown : mutable HAsciiString from TCollection;
+	      aTown : HAsciiString from TCollection;
 	      hasAregion : Boolean from Standard;
-	      aRegion : mutable HAsciiString from TCollection;
+	      aRegion : HAsciiString from TCollection;
 	      hasApostalCode : Boolean from Standard;
-	      aPostalCode : mutable HAsciiString from TCollection;
+	      aPostalCode : HAsciiString from TCollection;
 	      hasAcountry : Boolean from Standard;
-	      aCountry : mutable HAsciiString from TCollection;
+	      aCountry : HAsciiString from TCollection;
 	      hasAfacsimileNumber : Boolean from Standard;
-	      aFacsimileNumber : mutable HAsciiString from TCollection;
+	      aFacsimileNumber : HAsciiString from TCollection;
 	      hasAtelephoneNumber : Boolean from Standard;
-	      aTelephoneNumber : mutable HAsciiString from TCollection;
+	      aTelephoneNumber : HAsciiString from TCollection;
 	      hasAelectronicMailAddress : Boolean from Standard;
-	      aElectronicMailAddress : mutable HAsciiString from TCollection;
+	      aElectronicMailAddress : HAsciiString from TCollection;
 	      hasAtelexNumber : Boolean from Standard;
-	      aTelexNumber : mutable HAsciiString from TCollection) is virtual;
+	      aTelexNumber : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetInternalLocation(me : mutable; aInternalLocation : mutable HAsciiString);
+	SetInternalLocation(me : mutable; aInternalLocation : HAsciiString);
 	UnSetInternalLocation (me:mutable);
-	InternalLocation (me) returns mutable HAsciiString;
+	InternalLocation (me) returns HAsciiString;
 	HasInternalLocation (me) returns Boolean;
-	SetStreetNumber(me : mutable; aStreetNumber : mutable HAsciiString);
+	SetStreetNumber(me : mutable; aStreetNumber : HAsciiString);
 	UnSetStreetNumber (me:mutable);
-	StreetNumber (me) returns mutable HAsciiString;
+	StreetNumber (me) returns HAsciiString;
 	HasStreetNumber (me) returns Boolean;
-	SetStreet(me : mutable; aStreet : mutable HAsciiString);
+	SetStreet(me : mutable; aStreet : HAsciiString);
 	UnSetStreet (me:mutable);
-	Street (me) returns mutable HAsciiString;
+	Street (me) returns HAsciiString;
 	HasStreet (me) returns Boolean;
-	SetPostalBox(me : mutable; aPostalBox : mutable HAsciiString);
+	SetPostalBox(me : mutable; aPostalBox : HAsciiString);
 	UnSetPostalBox (me:mutable);
-	PostalBox (me) returns mutable HAsciiString;
+	PostalBox (me) returns HAsciiString;
 	HasPostalBox (me) returns Boolean;
-	SetTown(me : mutable; aTown : mutable HAsciiString);
+	SetTown(me : mutable; aTown : HAsciiString);
 	UnSetTown (me:mutable);
-	Town (me) returns mutable HAsciiString;
+	Town (me) returns HAsciiString;
 	HasTown (me) returns Boolean;
-	SetRegion(me : mutable; aRegion : mutable HAsciiString);
+	SetRegion(me : mutable; aRegion : HAsciiString);
 	UnSetRegion (me:mutable);
-	Region (me) returns mutable HAsciiString;
+	Region (me) returns HAsciiString;
 	HasRegion (me) returns Boolean;
-	SetPostalCode(me : mutable; aPostalCode : mutable HAsciiString);
+	SetPostalCode(me : mutable; aPostalCode : HAsciiString);
 	UnSetPostalCode (me:mutable);
-	PostalCode (me) returns mutable HAsciiString;
+	PostalCode (me) returns HAsciiString;
 	HasPostalCode (me) returns Boolean;
-	SetCountry(me : mutable; aCountry : mutable HAsciiString);
+	SetCountry(me : mutable; aCountry : HAsciiString);
 	UnSetCountry (me:mutable);
-	Country (me) returns mutable HAsciiString;
+	Country (me) returns HAsciiString;
 	HasCountry (me) returns Boolean;
-	SetFacsimileNumber(me : mutable; aFacsimileNumber : mutable HAsciiString);
+	SetFacsimileNumber(me : mutable; aFacsimileNumber : HAsciiString);
 	UnSetFacsimileNumber (me:mutable);
-	FacsimileNumber (me) returns mutable HAsciiString;
+	FacsimileNumber (me) returns HAsciiString;
 	HasFacsimileNumber (me) returns Boolean;
-	SetTelephoneNumber(me : mutable; aTelephoneNumber : mutable HAsciiString);
+	SetTelephoneNumber(me : mutable; aTelephoneNumber : HAsciiString);
 	UnSetTelephoneNumber (me:mutable);
-	TelephoneNumber (me) returns mutable HAsciiString;
+	TelephoneNumber (me) returns HAsciiString;
 	HasTelephoneNumber (me) returns Boolean;
-	SetElectronicMailAddress(me : mutable; aElectronicMailAddress : mutable HAsciiString);
+	SetElectronicMailAddress(me : mutable; aElectronicMailAddress : HAsciiString);
 	UnSetElectronicMailAddress (me:mutable);
-	ElectronicMailAddress (me) returns mutable HAsciiString;
+	ElectronicMailAddress (me) returns HAsciiString;
 	HasElectronicMailAddress (me) returns Boolean;
-	SetTelexNumber(me : mutable; aTelexNumber : mutable HAsciiString);
+	SetTelexNumber(me : mutable; aTelexNumber : HAsciiString);
 	UnSetTelexNumber (me:mutable);
-	TelexNumber (me) returns mutable HAsciiString;
+	TelexNumber (me) returns HAsciiString;
 	HasTelexNumber (me) returns Boolean;
 
 fields
diff --git a/src/StepBasic/StepBasic_ApplicationContext.cdl b/src/StepBasic/StepBasic_ApplicationContext.cdl
index 8a660076ca..4a51549a4b 100644
--- a/src/StepBasic/StepBasic_ApplicationContext.cdl
+++ b/src/StepBasic/StepBasic_ApplicationContext.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ApplicationContext;
+	Create returns ApplicationContext;
 	---Purpose: Returns a ApplicationContext
 
 	Init (me : mutable;
-	      aApplication : mutable HAsciiString from TCollection) is virtual;
+	      aApplication : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetApplication(me : mutable; aApplication : mutable HAsciiString);
-	Application (me) returns mutable HAsciiString;
+	SetApplication(me : mutable; aApplication : HAsciiString);
+	Application (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ApplicationContextElement.cdl b/src/StepBasic/StepBasic_ApplicationContextElement.cdl
index 831eb65c72..ee4cb31784 100644
--- a/src/StepBasic/StepBasic_ApplicationContextElement.cdl
+++ b/src/StepBasic/StepBasic_ApplicationContextElement.cdl
@@ -24,19 +24,19 @@ uses
 	ApplicationContext from StepBasic
 is
 
-	Create returns mutable ApplicationContextElement;
+	Create returns ApplicationContextElement;
 	---Purpose: Returns a ApplicationContextElement
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aFrameOfReference : mutable ApplicationContext from StepBasic) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aFrameOfReference : ApplicationContext from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetFrameOfReference(me : mutable; aFrameOfReference : mutable ApplicationContext);
-	FrameOfReference (me) returns mutable ApplicationContext;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetFrameOfReference(me : mutable; aFrameOfReference : ApplicationContext);
+	FrameOfReference (me) returns ApplicationContext;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cdl b/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cdl
index 688f29d6e0..9014af3780 100644
--- a/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cdl
+++ b/src/StepBasic/StepBasic_ApplicationProtocolDefinition.cdl
@@ -25,25 +25,25 @@ uses
 	ApplicationContext from StepBasic
 is
 
-	Create returns mutable ApplicationProtocolDefinition;
+	Create returns ApplicationProtocolDefinition;
 	---Purpose: Returns a ApplicationProtocolDefinition
 
 	Init (me : mutable;
-	      aStatus : mutable HAsciiString from TCollection;
-	      aApplicationInterpretedModelSchemaName : mutable HAsciiString from TCollection;
+	      aStatus : HAsciiString from TCollection;
+	      aApplicationInterpretedModelSchemaName : HAsciiString from TCollection;
 	      aApplicationProtocolYear : Integer from Standard;
-	      aApplication : mutable ApplicationContext from StepBasic) is virtual;
+	      aApplication : ApplicationContext from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStatus(me : mutable; aStatus : mutable HAsciiString);
-	Status (me) returns mutable HAsciiString;
-	SetApplicationInterpretedModelSchemaName(me : mutable; aApplicationInterpretedModelSchemaName : mutable HAsciiString);
-	ApplicationInterpretedModelSchemaName (me) returns mutable HAsciiString;
+	SetStatus(me : mutable; aStatus : HAsciiString);
+	Status (me) returns HAsciiString;
+	SetApplicationInterpretedModelSchemaName(me : mutable; aApplicationInterpretedModelSchemaName : HAsciiString);
+	ApplicationInterpretedModelSchemaName (me) returns HAsciiString;
 	SetApplicationProtocolYear(me : mutable; aApplicationProtocolYear : Integer);
 	ApplicationProtocolYear (me) returns Integer;
-	SetApplication(me : mutable; aApplication : mutable ApplicationContext);
-	Application (me) returns mutable ApplicationContext;
+	SetApplication(me : mutable; aApplication : ApplicationContext);
+	Application (me) returns ApplicationContext;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_Approval.cdl b/src/StepBasic/StepBasic_Approval.cdl
index fc5a42a400..4cb4e547eb 100644
--- a/src/StepBasic/StepBasic_Approval.cdl
+++ b/src/StepBasic/StepBasic_Approval.cdl
@@ -24,19 +24,19 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Approval;
+	Create returns Approval;
 	---Purpose: Returns a Approval
 
 	Init (me : mutable;
-	      aStatus : mutable ApprovalStatus from StepBasic;
-	      aLevel : mutable HAsciiString from TCollection) is virtual;
+	      aStatus : ApprovalStatus from StepBasic;
+	      aLevel : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStatus(me : mutable; aStatus : mutable ApprovalStatus);
-	Status (me) returns mutable ApprovalStatus;
-	SetLevel(me : mutable; aLevel : mutable HAsciiString);
-	Level (me) returns mutable HAsciiString;
+	SetStatus(me : mutable; aStatus : ApprovalStatus);
+	Status (me) returns ApprovalStatus;
+	SetLevel(me : mutable; aLevel : HAsciiString);
+	Level (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ApprovalAssignment.cdl b/src/StepBasic/StepBasic_ApprovalAssignment.cdl
index 311df3fd83..a7f7dc1267 100644
--- a/src/StepBasic/StepBasic_ApprovalAssignment.cdl
+++ b/src/StepBasic/StepBasic_ApprovalAssignment.cdl
@@ -24,12 +24,12 @@ uses
 is
 
 	Init (me : mutable;
-	      aAssignedApproval : mutable Approval from StepBasic) is virtual;
+	      aAssignedApproval : Approval from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAssignedApproval(me : mutable; aAssignedApproval : mutable Approval);
-	AssignedApproval (me) returns mutable Approval;
+	SetAssignedApproval(me : mutable; aAssignedApproval : Approval);
+	AssignedApproval (me) returns Approval;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ApprovalDateTime.cdl b/src/StepBasic/StepBasic_ApprovalDateTime.cdl
index 36c91d70c7..c9c7369f87 100644
--- a/src/StepBasic/StepBasic_ApprovalDateTime.cdl
+++ b/src/StepBasic/StepBasic_ApprovalDateTime.cdl
@@ -24,7 +24,7 @@ uses
 
 is
 
-    Create returns mutable ApprovalDateTime;
+    Create returns ApprovalDateTime;
 
     Init (me : mutable;
     	  aDateTime : DateTimeSelect;
diff --git a/src/StepBasic/StepBasic_ApprovalPersonOrganization.cdl b/src/StepBasic/StepBasic_ApprovalPersonOrganization.cdl
index da7af0eefb..525535c48b 100644
--- a/src/StepBasic/StepBasic_ApprovalPersonOrganization.cdl
+++ b/src/StepBasic/StepBasic_ApprovalPersonOrganization.cdl
@@ -25,22 +25,22 @@ uses
 	ApprovalRole from StepBasic
 is
 
-	Create returns mutable ApprovalPersonOrganization;
+	Create returns ApprovalPersonOrganization;
 	---Purpose: Returns a ApprovalPersonOrganization
 
 	Init (me : mutable;
 	      aPersonOrganization : PersonOrganizationSelect from StepBasic;
-	      aAuthorizedApproval : mutable Approval from StepBasic;
-	      aRole : mutable ApprovalRole from StepBasic) is virtual;
+	      aAuthorizedApproval : Approval from StepBasic;
+	      aRole : ApprovalRole from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
 	SetPersonOrganization(me : mutable; aPersonOrganization : PersonOrganizationSelect);
 	PersonOrganization (me) returns PersonOrganizationSelect;
-	SetAuthorizedApproval(me : mutable; aAuthorizedApproval : mutable Approval);
-	AuthorizedApproval (me) returns mutable Approval;
-	SetRole(me : mutable; aRole : mutable ApprovalRole);
-	Role (me) returns mutable ApprovalRole;
+	SetAuthorizedApproval(me : mutable; aAuthorizedApproval : Approval);
+	AuthorizedApproval (me) returns Approval;
+	SetRole(me : mutable; aRole : ApprovalRole);
+	Role (me) returns ApprovalRole;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ApprovalRelationship.cdl b/src/StepBasic/StepBasic_ApprovalRelationship.cdl
index 3c17aa0e09..c2f9cbe406 100644
--- a/src/StepBasic/StepBasic_ApprovalRelationship.cdl
+++ b/src/StepBasic/StepBasic_ApprovalRelationship.cdl
@@ -24,25 +24,25 @@ uses
 	Approval from StepBasic
 is
 
-	Create returns mutable ApprovalRelationship;
+	Create returns ApprovalRelationship;
 	---Purpose: Returns a ApprovalRelationship
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aRelatingApproval : mutable Approval from StepBasic;
-	      aRelatedApproval : mutable Approval from StepBasic) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aRelatingApproval : Approval from StepBasic;
+	      aRelatedApproval : Approval from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
-	SetRelatingApproval(me : mutable; aRelatingApproval : mutable Approval);
-	RelatingApproval (me) returns mutable Approval;
-	SetRelatedApproval(me : mutable; aRelatedApproval : mutable Approval);
-	RelatedApproval (me) returns mutable Approval;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
+	SetRelatingApproval(me : mutable; aRelatingApproval : Approval);
+	RelatingApproval (me) returns Approval;
+	SetRelatedApproval(me : mutable; aRelatedApproval : Approval);
+	RelatedApproval (me) returns Approval;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ApprovalRole.cdl b/src/StepBasic/StepBasic_ApprovalRole.cdl
index 9f02359e9a..ba3e59ec30 100644
--- a/src/StepBasic/StepBasic_ApprovalRole.cdl
+++ b/src/StepBasic/StepBasic_ApprovalRole.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ApprovalRole;
+	Create returns ApprovalRole;
 	---Purpose: Returns a ApprovalRole
 
 	Init (me : mutable;
-	      aRole : mutable HAsciiString from TCollection) is virtual;
+	      aRole : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetRole(me : mutable; aRole : mutable HAsciiString);
-	Role (me) returns mutable HAsciiString;
+	SetRole(me : mutable; aRole : HAsciiString);
+	Role (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ApprovalStatus.cdl b/src/StepBasic/StepBasic_ApprovalStatus.cdl
index 0a7fd6c3f9..8a09f9a204 100644
--- a/src/StepBasic/StepBasic_ApprovalStatus.cdl
+++ b/src/StepBasic/StepBasic_ApprovalStatus.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ApprovalStatus;
+	Create returns ApprovalStatus;
 	---Purpose: Returns a ApprovalStatus
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_AreaUnit.cdl b/src/StepBasic/StepBasic_AreaUnit.cdl
index 22bd45e90c..7fe20188ce 100644
--- a/src/StepBasic/StepBasic_AreaUnit.cdl
+++ b/src/StepBasic/StepBasic_AreaUnit.cdl
@@ -20,6 +20,6 @@ class AreaUnit from StepBasic inherits NamedUnit from StepBasic
 
 is
     
-    Create returns mutable AreaUnit from StepBasic;
+    Create returns AreaUnit from StepBasic;
     
 end AreaUnit;
diff --git a/src/StepBasic/StepBasic_CalendarDate.cdl b/src/StepBasic/StepBasic_CalendarDate.cdl
index 8bf09243b7..814972d029 100644
--- a/src/StepBasic/StepBasic_CalendarDate.cdl
+++ b/src/StepBasic/StepBasic_CalendarDate.cdl
@@ -23,7 +23,7 @@ uses
 	Integer from Standard
 is
 
-	Create returns mutable CalendarDate;
+	Create returns CalendarDate;
 	---Purpose: Returns a CalendarDate
 
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnit.cdl
index de49808c0b..8f963967f6 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnit.cdl
@@ -25,24 +25,24 @@ uses
 	DimensionalExponents from StepBasic
 is
 
-	Create returns mutable ConversionBasedUnit;
+	Create returns ConversionBasedUnit;
 	---Purpose: Returns a ConversionBasedUnit
 
 
 	Init (me : mutable;
-	      aDimensions : mutable DimensionalExponents from StepBasic) is redefined;
+	      aDimensions : DimensionalExponents from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aDimensions : mutable DimensionalExponents from StepBasic;
-	      aName : mutable HAsciiString from TCollection;
-	      aConversionFactor : mutable MeasureWithUnit from StepBasic) is virtual;
+	      aDimensions : DimensionalExponents from StepBasic;
+	      aName : HAsciiString from TCollection;
+	      aConversionFactor : MeasureWithUnit from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetConversionFactor(me : mutable; aConversionFactor : mutable MeasureWithUnit);
-	ConversionFactor (me) returns mutable MeasureWithUnit;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetConversionFactor(me : mutable; aConversionFactor : MeasureWithUnit);
+	ConversionFactor (me) returns MeasureWithUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.cdl
index 63ddea49af..b047d207d1 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndAreaUnit.cdl
@@ -24,12 +24,12 @@ uses
 
 is
 
-    Create returns mutable ConversionBasedUnitAndAreaUnit from StepBasic;
+    Create returns ConversionBasedUnitAndAreaUnit from StepBasic;
     	---Purpose: Returns a ConversionBasedUnitAndAreaUnit
     
-    SetAreaUnit(me: mutable; anAreaUnit: mutable AreaUnit from StepBasic);
+    SetAreaUnit(me: mutable; anAreaUnit: AreaUnit from StepBasic);
     
-    AreaUnit(me) returns mutable AreaUnit from StepBasic;
+    AreaUnit(me) returns AreaUnit from StepBasic;
     
 fields
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cdl
index 466ab9b2d4..512b3ea672 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndLengthUnit.cdl
@@ -27,21 +27,21 @@ uses
     
 is
 
-    Create returns mutable ConversionBasedUnitAndLengthUnit;
+    Create returns ConversionBasedUnitAndLengthUnit;
 	---Purpose: Returns a ConversionBasedUnitAndLengthUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic;
-	               aName      : mutable HAsciiString from TCollection;
-	               aConversionFactor: mutable MeasureWithUnit from StepBasic) is redefined;
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic;
+	               aName      : HAsciiString from TCollection;
+	               aConversionFactor: MeasureWithUnit from StepBasic) is redefined;
 
     -- Specific Methods for Field Data Access --
 
-    SetLengthUnit(me: mutable; aLengthUnit: mutable LengthUnit);
+    SetLengthUnit(me: mutable; aLengthUnit: LengthUnit);
     
-    LengthUnit (me) returns mutable LengthUnit;
+    LengthUnit (me) returns LengthUnit;
 
     -- Specific Methods for ANDOR Field Data Access --
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cdl
index c53d3e3ae5..f027243686 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndMassUnit.cdl
@@ -26,21 +26,21 @@ uses
     
 is
 
-    Create returns mutable ConversionBasedUnitAndMassUnit;
+    Create returns ConversionBasedUnitAndMassUnit;
 	---Purpose: Returns a ConversionBasedUnitAndLengthUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic;
-	               aName      : mutable HAsciiString from TCollection;
-	               aConversionFactor: mutable MeasureWithUnit from StepBasic) is redefined;
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic;
+	               aName      : HAsciiString from TCollection;
+	               aConversionFactor: MeasureWithUnit from StepBasic) is redefined;
 
     -- Specific Methods for Field Data Access --
 
-    SetMassUnit(me: mutable; aMassUnit: mutable MassUnit);
+    SetMassUnit(me: mutable; aMassUnit: MassUnit);
     
-    MassUnit (me) returns mutable MassUnit;
+    MassUnit (me) returns MassUnit;
 
     -- Specific Methods for ANDOR Field Data Access --
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cdl
index e82c1839f6..6e2b93e4d7 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndPlaneAngleUnit.cdl
@@ -27,21 +27,21 @@ uses
     
 is
 
-    Create returns mutable ConversionBasedUnitAndPlaneAngleUnit;
+    Create returns ConversionBasedUnitAndPlaneAngleUnit;
 	---Purpose: Returns a ConversionBasedUnitAndPlaneAngleUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic;
-		       aName      : mutable HAsciiString from TCollection;
-		       aConversionFactor: mutable MeasureWithUnit from StepBasic) is redefined;
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic;
+		       aName      : HAsciiString from TCollection;
+		       aConversionFactor: MeasureWithUnit from StepBasic) is redefined;
 
     -- Specific Methods for Field Data Access --
 
-    SetPlaneAngleUnit(me: mutable; aPlaneAngleUnit: mutable PlaneAngleUnit);
+    SetPlaneAngleUnit(me: mutable; aPlaneAngleUnit: PlaneAngleUnit);
     
-    PlaneAngleUnit (me) returns mutable PlaneAngleUnit;
+    PlaneAngleUnit (me) returns PlaneAngleUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cdl
index a0ca0d27e5..f4f0b89470 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndRatioUnit.cdl
@@ -27,21 +27,21 @@ uses
     
 is
 
-    Create returns mutable ConversionBasedUnitAndRatioUnit;
+    Create returns ConversionBasedUnitAndRatioUnit;
 	---Purpose: Returns a ConversionBasedUnitAndRatioUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic;
-		       aName      : mutable HAsciiString from TCollection;
-		       aConversionFactor: mutable MeasureWithUnit from StepBasic) is redefined;
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic;
+		       aName      : HAsciiString from TCollection;
+		       aConversionFactor: MeasureWithUnit from StepBasic) is redefined;
 
     -- Specific Methods for Field Data Access --
 
-    SetRatioUnit(me: mutable; aRatioUnit: mutable RatioUnit);
+    SetRatioUnit(me: mutable; aRatioUnit: RatioUnit);
     
-    RatioUnit (me) returns mutable RatioUnit;
+    RatioUnit (me) returns RatioUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cdl
index c49b3a2196..35eb029cdd 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndSolidAngleUnit.cdl
@@ -27,21 +27,21 @@ uses
     
 is
 
-    Create returns mutable ConversionBasedUnitAndSolidAngleUnit;
+    Create returns ConversionBasedUnitAndSolidAngleUnit;
 	---Purpose: Returns a ConversionBasedUnitAndSolidAngleUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic;
-		       aName      : mutable HAsciiString from TCollection;
-		       aConversionFactor: mutable MeasureWithUnit from StepBasic)is redefined;
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic;
+		       aName      : HAsciiString from TCollection;
+		       aConversionFactor: MeasureWithUnit from StepBasic)is redefined;
 
     -- Specific Methods for Field Data Access --
 
-    SetSolidAngleUnit(me: mutable; aSolidAngleUnit: mutable SolidAngleUnit);
+    SetSolidAngleUnit(me: mutable; aSolidAngleUnit: SolidAngleUnit);
     
-    SolidAngleUnit (me) returns mutable SolidAngleUnit;
+    SolidAngleUnit (me) returns SolidAngleUnit;
 
 
 fields
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cdl
index 6510abc15e..81159a7adf 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndTimeUnit.cdl
@@ -27,21 +27,21 @@ uses
     
 is
 
-    Create returns mutable ConversionBasedUnitAndTimeUnit;
+    Create returns ConversionBasedUnitAndTimeUnit;
 	---Purpose: Returns a ConversionBasedUnitAndTimeUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic) is redefined;
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic) is redefined;
 
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic;
-	      	       aName      : mutable HAsciiString from TCollection;
-		       aConversionFactor: mutable MeasureWithUnit from StepBasic) is redefined;
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic;
+	      	       aName      : HAsciiString from TCollection;
+		       aConversionFactor: MeasureWithUnit from StepBasic) is redefined;
 
     -- Specific Methods for Field Data Access --
 
-    SetTimeUnit(me: mutable; aTimeUnit: mutable TimeUnit);
+    SetTimeUnit(me: mutable; aTimeUnit: TimeUnit);
     
-    TimeUnit (me) returns mutable TimeUnit;
+    TimeUnit (me) returns TimeUnit;
 
 
 fields
diff --git a/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.cdl b/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.cdl
index d6bc0167db..a668d07b9d 100644
--- a/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.cdl
+++ b/src/StepBasic/StepBasic_ConversionBasedUnitAndVolumeUnit.cdl
@@ -24,12 +24,12 @@ uses
 
 is
 
-    Create returns mutable ConversionBasedUnitAndVolumeUnit from StepBasic;
+    Create returns ConversionBasedUnitAndVolumeUnit from StepBasic;
     	---Purpose: Returns a ConversionBasedUnitAndVolumeUnit
     
-    SetVolumeUnit(me: mutable; aVolumeUnit: mutable VolumeUnit from StepBasic);
+    SetVolumeUnit(me: mutable; aVolumeUnit: VolumeUnit from StepBasic);
     
-    VolumeUnit(me) returns mutable VolumeUnit from StepBasic;
+    VolumeUnit(me) returns VolumeUnit from StepBasic;
     
 fields
 
diff --git a/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.cdl b/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.cdl
index 490ce71895..0f9be2c946 100644
--- a/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.cdl
+++ b/src/StepBasic/StepBasic_CoordinatedUniversalTimeOffset.cdl
@@ -25,7 +25,7 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable CoordinatedUniversalTimeOffset;
+	Create returns CoordinatedUniversalTimeOffset;
 	---Purpose: Returns a CoordinatedUniversalTimeOffset
 
 	Init (me : mutable;
diff --git a/src/StepBasic/StepBasic_Date.cdl b/src/StepBasic/StepBasic_Date.cdl
index 0c89317b2e..44f0cb8ebd 100644
--- a/src/StepBasic/StepBasic_Date.cdl
+++ b/src/StepBasic/StepBasic_Date.cdl
@@ -23,7 +23,7 @@ uses
 	Integer from Standard
 is
 
-	Create returns mutable Date;
+	Create returns Date;
 	---Purpose: Returns a Date
 
 	Init (me : mutable;
diff --git a/src/StepBasic/StepBasic_DateAndTime.cdl b/src/StepBasic/StepBasic_DateAndTime.cdl
index 633aa4fc89..db9d1da0ca 100644
--- a/src/StepBasic/StepBasic_DateAndTime.cdl
+++ b/src/StepBasic/StepBasic_DateAndTime.cdl
@@ -24,19 +24,19 @@ uses
 	LocalTime from StepBasic
 is
 
-	Create returns mutable DateAndTime;
+	Create returns DateAndTime;
 	---Purpose: Returns a DateAndTime
 
 	Init (me : mutable;
-	      aDateComponent : mutable Date from StepBasic;
-	      aTimeComponent : mutable LocalTime from StepBasic) is virtual;
+	      aDateComponent : Date from StepBasic;
+	      aTimeComponent : LocalTime from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetDateComponent(me : mutable; aDateComponent : mutable Date);
-	DateComponent (me) returns mutable Date;
-	SetTimeComponent(me : mutable; aTimeComponent : mutable LocalTime);
-	TimeComponent (me) returns mutable LocalTime;
+	SetDateComponent(me : mutable; aDateComponent : Date);
+	DateComponent (me) returns Date;
+	SetTimeComponent(me : mutable; aTimeComponent : LocalTime);
+	TimeComponent (me) returns LocalTime;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_DateAndTimeAssignment.cdl b/src/StepBasic/StepBasic_DateAndTimeAssignment.cdl
index 0efedc537e..df20e27d46 100644
--- a/src/StepBasic/StepBasic_DateAndTimeAssignment.cdl
+++ b/src/StepBasic/StepBasic_DateAndTimeAssignment.cdl
@@ -25,15 +25,15 @@ uses
 is
 
 	Init (me : mutable;
-	      aAssignedDateAndTime : mutable DateAndTime from StepBasic;
-	      aRole : mutable DateTimeRole from StepBasic) is virtual;
+	      aAssignedDateAndTime : DateAndTime from StepBasic;
+	      aRole : DateTimeRole from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAssignedDateAndTime(me : mutable; aAssignedDateAndTime : mutable DateAndTime);
-	AssignedDateAndTime (me) returns mutable DateAndTime;
-	SetRole(me : mutable; aRole : mutable DateTimeRole);
-	Role (me) returns mutable DateTimeRole;
+	SetAssignedDateAndTime(me : mutable; aAssignedDateAndTime : DateAndTime);
+	AssignedDateAndTime (me) returns DateAndTime;
+	SetRole(me : mutable; aRole : DateTimeRole);
+	Role (me) returns DateTimeRole;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_DateAssignment.cdl b/src/StepBasic/StepBasic_DateAssignment.cdl
index 9d91711ce8..fe0df4af67 100644
--- a/src/StepBasic/StepBasic_DateAssignment.cdl
+++ b/src/StepBasic/StepBasic_DateAssignment.cdl
@@ -25,15 +25,15 @@ uses
 is
 
 	Init (me : mutable;
-	      aAssignedDate : mutable Date from StepBasic;
-	      aRole : mutable DateRole from StepBasic) is virtual;
+	      aAssignedDate : Date from StepBasic;
+	      aRole : DateRole from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAssignedDate(me : mutable; aAssignedDate : mutable Date);
-	AssignedDate (me) returns mutable Date;
-	SetRole(me : mutable; aRole : mutable DateRole);
-	Role (me) returns mutable DateRole;
+	SetAssignedDate(me : mutable; aAssignedDate : Date);
+	AssignedDate (me) returns Date;
+	SetRole(me : mutable; aRole : DateRole);
+	Role (me) returns DateRole;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_DateRole.cdl b/src/StepBasic/StepBasic_DateRole.cdl
index 85023aba9c..1925fefc0a 100644
--- a/src/StepBasic/StepBasic_DateRole.cdl
+++ b/src/StepBasic/StepBasic_DateRole.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable DateRole;
+	Create returns DateRole;
 	---Purpose: Returns a DateRole
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_DateTimeRole.cdl b/src/StepBasic/StepBasic_DateTimeRole.cdl
index a2734227d4..9bb08f9dfd 100644
--- a/src/StepBasic/StepBasic_DateTimeRole.cdl
+++ b/src/StepBasic/StepBasic_DateTimeRole.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable DateTimeRole;
+	Create returns DateTimeRole;
 	---Purpose: Returns a DateTimeRole
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_DerivedUnit.cdl b/src/StepBasic/StepBasic_DerivedUnit.cdl
index 3fb2128785..eaee0a3d9d 100644
--- a/src/StepBasic/StepBasic_DerivedUnit.cdl
+++ b/src/StepBasic/StepBasic_DerivedUnit.cdl
@@ -24,7 +24,7 @@ uses
 
 is
 
-    Create returns mutable DerivedUnit;
+    Create returns DerivedUnit;
 
     Init (me : mutable; elements : HArray1OfDerivedUnitElement from StepBasic);
 
diff --git a/src/StepBasic/StepBasic_DerivedUnitElement.cdl b/src/StepBasic/StepBasic_DerivedUnitElement.cdl
index 4e053e7fba..3aa3b68ef6 100644
--- a/src/StepBasic/StepBasic_DerivedUnitElement.cdl
+++ b/src/StepBasic/StepBasic_DerivedUnitElement.cdl
@@ -23,7 +23,7 @@ uses
 
 is
 
-    Create returns mutable DerivedUnitElement;
+    Create returns DerivedUnitElement;
 
     Init (me : mutable; aUnit : NamedUnit from StepBasic; aExponent : Real);
 
diff --git a/src/StepBasic/StepBasic_DesignContext.cdl b/src/StepBasic/StepBasic_DesignContext.cdl
index 229e382d60..f0611097bb 100644
--- a/src/StepBasic/StepBasic_DesignContext.cdl
+++ b/src/StepBasic/StepBasic_DesignContext.cdl
@@ -24,6 +24,6 @@ uses Integer
 
 is
 
-    Create returns mutable DesignContext;
+    Create returns DesignContext;
 
 end DesignContext;
diff --git a/src/StepBasic/StepBasic_DigitalDocument.cdl b/src/StepBasic/StepBasic_DigitalDocument.cdl
index 5a966ee477..9817694e96 100644
--- a/src/StepBasic/StepBasic_DigitalDocument.cdl
+++ b/src/StepBasic/StepBasic_DigitalDocument.cdl
@@ -21,6 +21,6 @@ uses
 
 is
 
-    Create returns mutable DigitalDocument;
+    Create returns DigitalDocument;
 
 end DigitalDocument;
diff --git a/src/StepBasic/StepBasic_DimensionalExponents.cdl b/src/StepBasic/StepBasic_DimensionalExponents.cdl
index bb10b0b949..74d1582633 100644
--- a/src/StepBasic/StepBasic_DimensionalExponents.cdl
+++ b/src/StepBasic/StepBasic_DimensionalExponents.cdl
@@ -23,7 +23,7 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable DimensionalExponents;
+	Create returns DimensionalExponents;
 	---Purpose: Returns a DimensionalExponents
 
 	Init (me : mutable;
diff --git a/src/StepBasic/StepBasic_DocumentRelationship.cdl b/src/StepBasic/StepBasic_DocumentRelationship.cdl
index aca853817c..567ad8c294 100644
--- a/src/StepBasic/StepBasic_DocumentRelationship.cdl
+++ b/src/StepBasic/StepBasic_DocumentRelationship.cdl
@@ -22,7 +22,7 @@ uses
 
 is
 
-    Create returns mutable DocumentRelationship;
+    Create returns DocumentRelationship;
 
     Init (me : mutable;
     	    aName : HAsciiString;
diff --git a/src/StepBasic/StepBasic_DocumentType.cdl b/src/StepBasic/StepBasic_DocumentType.cdl
index 23ef236f95..757477c592 100644
--- a/src/StepBasic/StepBasic_DocumentType.cdl
+++ b/src/StepBasic/StepBasic_DocumentType.cdl
@@ -21,7 +21,7 @@ uses
 
 is
 
-    Create returns mutable DocumentType;
+    Create returns DocumentType;
 
     Init (me : mutable; apdt : HAsciiString);
 
diff --git a/src/StepBasic/StepBasic_DocumentUsageConstraint.cdl b/src/StepBasic/StepBasic_DocumentUsageConstraint.cdl
index 5049381991..07035a31e2 100644
--- a/src/StepBasic/StepBasic_DocumentUsageConstraint.cdl
+++ b/src/StepBasic/StepBasic_DocumentUsageConstraint.cdl
@@ -22,7 +22,7 @@ uses
 
 is
 
-    Create returns mutable DocumentUsageConstraint;
+    Create returns DocumentUsageConstraint;
 
     Init (me : mutable;
     	  aSource : Document;
diff --git a/src/StepBasic/StepBasic_Effectivity.cdl b/src/StepBasic/StepBasic_Effectivity.cdl
index 1e19677d7f..84896407ce 100644
--- a/src/StepBasic/StepBasic_Effectivity.cdl
+++ b/src/StepBasic/StepBasic_Effectivity.cdl
@@ -21,7 +21,7 @@ uses
 
 is
 
-    Create returns mutable Effectivity;
+    Create returns Effectivity;
 
     Init (me : mutable; aid : HAsciiString);
 
diff --git a/src/StepBasic/StepBasic_LengthMeasureWithUnit.cdl b/src/StepBasic/StepBasic_LengthMeasureWithUnit.cdl
index c7486809fa..8bd228bfaf 100644
--- a/src/StepBasic/StepBasic_LengthMeasureWithUnit.cdl
+++ b/src/StepBasic/StepBasic_LengthMeasureWithUnit.cdl
@@ -24,7 +24,7 @@ uses
 	NamedUnit from StepBasic
 is
 
-	Create returns mutable LengthMeasureWithUnit;
+	Create returns LengthMeasureWithUnit;
 	---Purpose: Returns a LengthMeasureWithUnit
 
 
diff --git a/src/StepBasic/StepBasic_LengthUnit.cdl b/src/StepBasic/StepBasic_LengthUnit.cdl
index a0210313da..6588e961a4 100644
--- a/src/StepBasic/StepBasic_LengthUnit.cdl
+++ b/src/StepBasic/StepBasic_LengthUnit.cdl
@@ -23,7 +23,7 @@ uses
 	DimensionalExponents from StepBasic
 is
 
-	Create returns mutable LengthUnit;
+	Create returns LengthUnit;
 	---Purpose: Returns a LengthUnit
 
 
diff --git a/src/StepBasic/StepBasic_LocalTime.cdl b/src/StepBasic/StepBasic_LocalTime.cdl
index 9809d17698..99ea10f082 100644
--- a/src/StepBasic/StepBasic_LocalTime.cdl
+++ b/src/StepBasic/StepBasic_LocalTime.cdl
@@ -26,7 +26,7 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable LocalTime;
+	Create returns LocalTime;
 	---Purpose: Returns a LocalTime
 
 	Init (me : mutable;
@@ -35,7 +35,7 @@ is
 	      aMinuteComponent : Integer from Standard;
 	      hasAsecondComponent : Boolean from Standard;
 	      aSecondComponent : Real from Standard;
-	      aZone : mutable CoordinatedUniversalTimeOffset from StepBasic) is virtual;
+	      aZone : CoordinatedUniversalTimeOffset from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
@@ -49,8 +49,8 @@ is
 	UnSetSecondComponent (me:mutable);
 	SecondComponent (me) returns Real;
 	HasSecondComponent (me) returns Boolean;
-	SetZone(me : mutable; aZone : mutable CoordinatedUniversalTimeOffset);
-	Zone (me) returns mutable CoordinatedUniversalTimeOffset;
+	SetZone(me : mutable; aZone : CoordinatedUniversalTimeOffset);
+	Zone (me) returns CoordinatedUniversalTimeOffset;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_MassMeasureWithUnit.cdl b/src/StepBasic/StepBasic_MassMeasureWithUnit.cdl
index cc62946d2a..2fadfe21b3 100644
--- a/src/StepBasic/StepBasic_MassMeasureWithUnit.cdl
+++ b/src/StepBasic/StepBasic_MassMeasureWithUnit.cdl
@@ -23,7 +23,7 @@ uses
 	NamedUnit from StepBasic
 is
 
-	Create returns mutable MassMeasureWithUnit;
+	Create returns MassMeasureWithUnit;
 	---Purpose: Returns a MassMeasureWithUnit
 
 
diff --git a/src/StepBasic/StepBasic_MeasureValueMember.cdl b/src/StepBasic/StepBasic_MeasureValueMember.cdl
index 2946dac1da..b2b5c4d9b4 100644
--- a/src/StepBasic/StepBasic_MeasureValueMember.cdl
+++ b/src/StepBasic/StepBasic_MeasureValueMember.cdl
@@ -27,7 +27,7 @@ uses CString
 
 is
 
-    Create returns mutable MeasureValueMember;
+    Create returns MeasureValueMember;
     -- starts as case null (no name)
 
     HasName (me) returns Boolean  is redefined;
diff --git a/src/StepBasic/StepBasic_MeasureWithUnit.cdl b/src/StepBasic/StepBasic_MeasureWithUnit.cdl
index 66f2ee210b..d5011ede00 100644
--- a/src/StepBasic/StepBasic_MeasureWithUnit.cdl
+++ b/src/StepBasic/StepBasic_MeasureWithUnit.cdl
@@ -24,7 +24,7 @@ uses
 	Unit from StepBasic
 is
 
-	Create returns mutable MeasureWithUnit;
+	Create returns MeasureWithUnit;
 	---Purpose: Returns a MeasureWithUnit
 
 	Init (me : mutable;
diff --git a/src/StepBasic/StepBasic_MechanicalContext.cdl b/src/StepBasic/StepBasic_MechanicalContext.cdl
index 2010838bd0..5ccfc1de38 100644
--- a/src/StepBasic/StepBasic_MechanicalContext.cdl
+++ b/src/StepBasic/StepBasic_MechanicalContext.cdl
@@ -18,7 +18,7 @@ class MechanicalContext from StepBasic inherits ProductContext from StepBasic
 
 is
 
-	Create returns mutable MechanicalContext;
+	Create returns MechanicalContext;
 	---Purpose: Returns a MechanicalContext
 
 end MechanicalContext;
diff --git a/src/StepBasic/StepBasic_NamedUnit.cdl b/src/StepBasic/StepBasic_NamedUnit.cdl
index 15996297e6..516143ef7f 100644
--- a/src/StepBasic/StepBasic_NamedUnit.cdl
+++ b/src/StepBasic/StepBasic_NamedUnit.cdl
@@ -28,18 +28,18 @@ uses
 	DimensionalExponents from StepBasic
 is
 
-	Create returns mutable NamedUnit;
+	Create returns NamedUnit;
 	---Purpose: Returns a NamedUnit
 
 	Init (me : mutable;
-	      aDimensions : mutable DimensionalExponents from StepBasic) is virtual;
+	      aDimensions : DimensionalExponents from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetDimensions(me : mutable; aDimensions : mutable DimensionalExponents) 
+	SetDimensions(me : mutable; aDimensions : DimensionalExponents) 
     	is virtual;
 
-	Dimensions (me) returns mutable DimensionalExponents
+	Dimensions (me) returns DimensionalExponents
     	is virtual;
 
 fields
diff --git a/src/StepBasic/StepBasic_OrdinalDate.cdl b/src/StepBasic/StepBasic_OrdinalDate.cdl
index 562c1ac9a0..46be860347 100644
--- a/src/StepBasic/StepBasic_OrdinalDate.cdl
+++ b/src/StepBasic/StepBasic_OrdinalDate.cdl
@@ -23,7 +23,7 @@ uses
 	Integer from Standard
 is
 
-	Create returns mutable OrdinalDate;
+	Create returns OrdinalDate;
 	---Purpose: Returns a OrdinalDate
 
 
diff --git a/src/StepBasic/StepBasic_Organization.cdl b/src/StepBasic/StepBasic_Organization.cdl
index 826d2fac5a..fc4e9925cc 100644
--- a/src/StepBasic/StepBasic_Organization.cdl
+++ b/src/StepBasic/StepBasic_Organization.cdl
@@ -24,25 +24,25 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable Organization;
+	Create returns Organization;
 	---Purpose: Returns a Organization
 
 	Init (me : mutable;
 	      hasAid : Boolean from Standard;
-	      aId : mutable HAsciiString from TCollection;
-	      aName : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection) is virtual;
+	      aId : HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetId(me : mutable; aId : mutable HAsciiString);
+	SetId(me : mutable; aId : HAsciiString);
 	UnSetId (me:mutable);
-	Id (me) returns mutable HAsciiString;
+	Id (me) returns HAsciiString;
 	HasId (me) returns Boolean;
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_OrganizationAssignment.cdl b/src/StepBasic/StepBasic_OrganizationAssignment.cdl
index eea8858a5f..5c029bc612 100644
--- a/src/StepBasic/StepBasic_OrganizationAssignment.cdl
+++ b/src/StepBasic/StepBasic_OrganizationAssignment.cdl
@@ -25,15 +25,15 @@ uses
 is
 
 	Init (me : mutable;
-	      aAssignedOrganization : mutable Organization from StepBasic;
-	      aRole : mutable OrganizationRole from StepBasic) is virtual;
+	      aAssignedOrganization : Organization from StepBasic;
+	      aRole : OrganizationRole from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAssignedOrganization(me : mutable; aAssignedOrganization : mutable Organization);
-	AssignedOrganization (me) returns mutable Organization;
-	SetRole(me : mutable; aRole : mutable OrganizationRole);
-	Role (me) returns mutable OrganizationRole;
+	SetAssignedOrganization(me : mutable; aAssignedOrganization : Organization);
+	AssignedOrganization (me) returns Organization;
+	SetRole(me : mutable; aRole : OrganizationRole);
+	Role (me) returns OrganizationRole;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_OrganizationRole.cdl b/src/StepBasic/StepBasic_OrganizationRole.cdl
index 9b692526a0..e444cad4f3 100644
--- a/src/StepBasic/StepBasic_OrganizationRole.cdl
+++ b/src/StepBasic/StepBasic_OrganizationRole.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable OrganizationRole;
+	Create returns OrganizationRole;
 	---Purpose: Returns a OrganizationRole
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_OrganizationalAddress.cdl b/src/StepBasic/StepBasic_OrganizationalAddress.cdl
index 1e723546ad..f46b6aa143 100644
--- a/src/StepBasic/StepBasic_OrganizationalAddress.cdl
+++ b/src/StepBasic/StepBasic_OrganizationalAddress.cdl
@@ -25,72 +25,72 @@ uses
 	Organization from StepBasic
 is
 
-	Create returns mutable OrganizationalAddress;
+	Create returns OrganizationalAddress;
 	---Purpose: Returns a OrganizationalAddress
 
 
 	Init (me : mutable;
 	      hasAinternalLocation : Boolean from Standard;
-	      aInternalLocation : mutable HAsciiString from TCollection;
+	      aInternalLocation : HAsciiString from TCollection;
 	      hasAstreetNumber : Boolean from Standard;
-	      aStreetNumber : mutable HAsciiString from TCollection;
+	      aStreetNumber : HAsciiString from TCollection;
 	      hasAstreet : Boolean from Standard;
-	      aStreet : mutable HAsciiString from TCollection;
+	      aStreet : HAsciiString from TCollection;
 	      hasApostalBox : Boolean from Standard;
-	      aPostalBox : mutable HAsciiString from TCollection;
+	      aPostalBox : HAsciiString from TCollection;
 	      hasAtown : Boolean from Standard;
-	      aTown : mutable HAsciiString from TCollection;
+	      aTown : HAsciiString from TCollection;
 	      hasAregion : Boolean from Standard;
-	      aRegion : mutable HAsciiString from TCollection;
+	      aRegion : HAsciiString from TCollection;
 	      hasApostalCode : Boolean from Standard;
-	      aPostalCode : mutable HAsciiString from TCollection;
+	      aPostalCode : HAsciiString from TCollection;
 	      hasAcountry : Boolean from Standard;
-	      aCountry : mutable HAsciiString from TCollection;
+	      aCountry : HAsciiString from TCollection;
 	      hasAfacsimileNumber : Boolean from Standard;
-	      aFacsimileNumber : mutable HAsciiString from TCollection;
+	      aFacsimileNumber : HAsciiString from TCollection;
 	      hasAtelephoneNumber : Boolean from Standard;
-	      aTelephoneNumber : mutable HAsciiString from TCollection;
+	      aTelephoneNumber : HAsciiString from TCollection;
 	      hasAelectronicMailAddress : Boolean from Standard;
-	      aElectronicMailAddress : mutable HAsciiString from TCollection;
+	      aElectronicMailAddress : HAsciiString from TCollection;
 	      hasAtelexNumber : Boolean from Standard;
-	      aTelexNumber : mutable HAsciiString from TCollection) is redefined;
+	      aTelexNumber : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
 	      hasAinternalLocation : Boolean from Standard;
-	      aInternalLocation : mutable HAsciiString from TCollection;
+	      aInternalLocation : HAsciiString from TCollection;
 	      hasAstreetNumber : Boolean from Standard;
-	      aStreetNumber : mutable HAsciiString from TCollection;
+	      aStreetNumber : HAsciiString from TCollection;
 	      hasAstreet : Boolean from Standard;
-	      aStreet : mutable HAsciiString from TCollection;
+	      aStreet : HAsciiString from TCollection;
 	      hasApostalBox : Boolean from Standard;
-	      aPostalBox : mutable HAsciiString from TCollection;
+	      aPostalBox : HAsciiString from TCollection;
 	      hasAtown : Boolean from Standard;
-	      aTown : mutable HAsciiString from TCollection;
+	      aTown : HAsciiString from TCollection;
 	      hasAregion : Boolean from Standard;
-	      aRegion : mutable HAsciiString from TCollection;
+	      aRegion : HAsciiString from TCollection;
 	      hasApostalCode : Boolean from Standard;
-	      aPostalCode : mutable HAsciiString from TCollection;
+	      aPostalCode : HAsciiString from TCollection;
 	      hasAcountry : Boolean from Standard;
-	      aCountry : mutable HAsciiString from TCollection;
+	      aCountry : HAsciiString from TCollection;
 	      hasAfacsimileNumber : Boolean from Standard;
-	      aFacsimileNumber : mutable HAsciiString from TCollection;
+	      aFacsimileNumber : HAsciiString from TCollection;
 	      hasAtelephoneNumber : Boolean from Standard;
-	      aTelephoneNumber : mutable HAsciiString from TCollection;
+	      aTelephoneNumber : HAsciiString from TCollection;
 	      hasAelectronicMailAddress : Boolean from Standard;
-	      aElectronicMailAddress : mutable HAsciiString from TCollection;
+	      aElectronicMailAddress : HAsciiString from TCollection;
 	      hasAtelexNumber : Boolean from Standard;
-	      aTelexNumber : mutable HAsciiString from TCollection;
-	      aOrganizations : mutable HArray1OfOrganization from StepBasic;
-	      aDescription : mutable HAsciiString from TCollection) is virtual;
+	      aTelexNumber : HAsciiString from TCollection;
+	      aOrganizations : HArray1OfOrganization from StepBasic;
+	      aDescription : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetOrganizations(me : mutable; aOrganizations : mutable HArray1OfOrganization);
-	Organizations (me) returns mutable HArray1OfOrganization;
-	OrganizationsValue (me; num : Integer) returns mutable Organization;
+	SetOrganizations(me : mutable; aOrganizations : HArray1OfOrganization);
+	Organizations (me) returns HArray1OfOrganization;
+	OrganizationsValue (me; num : Integer) returns Organization;
 	NbOrganizations (me) returns Integer;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_Person.cdl b/src/StepBasic/StepBasic_Person.cdl
index e273824876..ba16a6ae92 100644
--- a/src/StepBasic/StepBasic_Person.cdl
+++ b/src/StepBasic/StepBasic_Person.cdl
@@ -25,51 +25,51 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable Person;
+	Create returns Person;
 	---Purpose: Returns a Person
 
 	Init (me : mutable;
-	      aId : mutable HAsciiString from TCollection;
+	      aId : HAsciiString from TCollection;
 	      hasAlastName : Boolean from Standard;
-	      aLastName : mutable HAsciiString from TCollection;
+	      aLastName : HAsciiString from TCollection;
 	      hasAfirstName : Boolean from Standard;
-	      aFirstName : mutable HAsciiString from TCollection;
+	      aFirstName : HAsciiString from TCollection;
 	      hasAmiddleNames : Boolean from Standard;
-	      aMiddleNames : mutable HArray1OfHAsciiString from Interface;
+	      aMiddleNames : HArray1OfHAsciiString from Interface;
 	      hasAprefixTitles : Boolean from Standard;
-	      aPrefixTitles : mutable HArray1OfHAsciiString from Interface;
+	      aPrefixTitles : HArray1OfHAsciiString from Interface;
 	      hasAsuffixTitles : Boolean from Standard;
-	      aSuffixTitles : mutable HArray1OfHAsciiString from Interface) is virtual;
+	      aSuffixTitles : HArray1OfHAsciiString from Interface) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetId(me : mutable; aId : mutable HAsciiString);
-	Id (me) returns mutable HAsciiString;
-	SetLastName(me : mutable; aLastName : mutable HAsciiString);
+	SetId(me : mutable; aId : HAsciiString);
+	Id (me) returns HAsciiString;
+	SetLastName(me : mutable; aLastName : HAsciiString);
 	UnSetLastName (me:mutable);
-	LastName (me) returns mutable HAsciiString;
+	LastName (me) returns HAsciiString;
 	HasLastName (me) returns Boolean;
-	SetFirstName(me : mutable; aFirstName : mutable HAsciiString);
+	SetFirstName(me : mutable; aFirstName : HAsciiString);
 	UnSetFirstName (me:mutable);
-	FirstName (me) returns mutable HAsciiString;
+	FirstName (me) returns HAsciiString;
 	HasFirstName (me) returns Boolean;
-	SetMiddleNames(me : mutable; aMiddleNames : mutable HArray1OfHAsciiString);
+	SetMiddleNames(me : mutable; aMiddleNames : HArray1OfHAsciiString);
 	UnSetMiddleNames (me:mutable);
-	MiddleNames (me) returns mutable HArray1OfHAsciiString;
+	MiddleNames (me) returns HArray1OfHAsciiString;
 	HasMiddleNames (me) returns Boolean;
-	MiddleNamesValue (me; num : Integer) returns mutable HAsciiString;
+	MiddleNamesValue (me; num : Integer) returns HAsciiString;
 	NbMiddleNames (me) returns Integer;
-	SetPrefixTitles(me : mutable; aPrefixTitles : mutable HArray1OfHAsciiString);
+	SetPrefixTitles(me : mutable; aPrefixTitles : HArray1OfHAsciiString);
 	UnSetPrefixTitles (me:mutable);
-	PrefixTitles (me) returns mutable HArray1OfHAsciiString;
+	PrefixTitles (me) returns HArray1OfHAsciiString;
 	HasPrefixTitles (me) returns Boolean;
-	PrefixTitlesValue (me; num : Integer) returns mutable HAsciiString;
+	PrefixTitlesValue (me; num : Integer) returns HAsciiString;
 	NbPrefixTitles (me) returns Integer;
-	SetSuffixTitles(me : mutable; aSuffixTitles : mutable HArray1OfHAsciiString);
+	SetSuffixTitles(me : mutable; aSuffixTitles : HArray1OfHAsciiString);
 	UnSetSuffixTitles (me:mutable);
-	SuffixTitles (me) returns mutable HArray1OfHAsciiString;
+	SuffixTitles (me) returns HArray1OfHAsciiString;
 	HasSuffixTitles (me) returns Boolean;
-	SuffixTitlesValue (me; num : Integer) returns mutable HAsciiString;
+	SuffixTitlesValue (me; num : Integer) returns HAsciiString;
 	NbSuffixTitles (me) returns Integer;
 
 fields
diff --git a/src/StepBasic/StepBasic_PersonAndOrganization.cdl b/src/StepBasic/StepBasic_PersonAndOrganization.cdl
index 19d8ef7243..96c3f57c97 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganization.cdl
+++ b/src/StepBasic/StepBasic_PersonAndOrganization.cdl
@@ -24,19 +24,19 @@ uses
 	Organization from StepBasic
 is
 
-	Create returns mutable PersonAndOrganization;
+	Create returns PersonAndOrganization;
 	---Purpose: Returns a PersonAndOrganization
 
 	Init (me : mutable;
-	      aThePerson : mutable Person from StepBasic;
-	      aTheOrganization : mutable Organization from StepBasic) is virtual;
+	      aThePerson : Person from StepBasic;
+	      aTheOrganization : Organization from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetThePerson(me : mutable; aThePerson : mutable Person);
-	ThePerson (me) returns mutable Person;
-	SetTheOrganization(me : mutable; aTheOrganization : mutable Organization);
-	TheOrganization (me) returns mutable Organization;
+	SetThePerson(me : mutable; aThePerson : Person);
+	ThePerson (me) returns Person;
+	SetTheOrganization(me : mutable; aTheOrganization : Organization);
+	TheOrganization (me) returns Organization;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.cdl b/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.cdl
index 63d2bf0ac6..a32ffb888e 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.cdl
+++ b/src/StepBasic/StepBasic_PersonAndOrganizationAssignment.cdl
@@ -25,15 +25,15 @@ uses
 is
 
 	Init (me : mutable;
-	      aAssignedPersonAndOrganization : mutable PersonAndOrganization from StepBasic;
-	      aRole : mutable PersonAndOrganizationRole from StepBasic) is virtual;
+	      aAssignedPersonAndOrganization : PersonAndOrganization from StepBasic;
+	      aRole : PersonAndOrganizationRole from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAssignedPersonAndOrganization(me : mutable; aAssignedPersonAndOrganization : mutable PersonAndOrganization);
-	AssignedPersonAndOrganization (me) returns mutable PersonAndOrganization;
-	SetRole(me : mutable; aRole : mutable PersonAndOrganizationRole);
-	Role (me) returns mutable PersonAndOrganizationRole;
+	SetAssignedPersonAndOrganization(me : mutable; aAssignedPersonAndOrganization : PersonAndOrganization);
+	AssignedPersonAndOrganization (me) returns PersonAndOrganization;
+	SetRole(me : mutable; aRole : PersonAndOrganizationRole);
+	Role (me) returns PersonAndOrganizationRole;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_PersonAndOrganizationRole.cdl b/src/StepBasic/StepBasic_PersonAndOrganizationRole.cdl
index eedf4d6cdf..b0d3cda23d 100644
--- a/src/StepBasic/StepBasic_PersonAndOrganizationRole.cdl
+++ b/src/StepBasic/StepBasic_PersonAndOrganizationRole.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PersonAndOrganizationRole;
+	Create returns PersonAndOrganizationRole;
 	---Purpose: Returns a PersonAndOrganizationRole
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_PersonalAddress.cdl b/src/StepBasic/StepBasic_PersonalAddress.cdl
index ac580077b1..7acac8561f 100644
--- a/src/StepBasic/StepBasic_PersonalAddress.cdl
+++ b/src/StepBasic/StepBasic_PersonalAddress.cdl
@@ -25,72 +25,72 @@ uses
 	Person from StepBasic
 is
 
-	Create returns mutable PersonalAddress;
+	Create returns PersonalAddress;
 	---Purpose: Returns a PersonalAddress
 
 
 	Init (me : mutable;
 	      hasAinternalLocation : Boolean from Standard;
-	      aInternalLocation : mutable HAsciiString from TCollection;
+	      aInternalLocation : HAsciiString from TCollection;
 	      hasAstreetNumber : Boolean from Standard;
-	      aStreetNumber : mutable HAsciiString from TCollection;
+	      aStreetNumber : HAsciiString from TCollection;
 	      hasAstreet : Boolean from Standard;
-	      aStreet : mutable HAsciiString from TCollection;
+	      aStreet : HAsciiString from TCollection;
 	      hasApostalBox : Boolean from Standard;
-	      aPostalBox : mutable HAsciiString from TCollection;
+	      aPostalBox : HAsciiString from TCollection;
 	      hasAtown : Boolean from Standard;
-	      aTown : mutable HAsciiString from TCollection;
+	      aTown : HAsciiString from TCollection;
 	      hasAregion : Boolean from Standard;
-	      aRegion : mutable HAsciiString from TCollection;
+	      aRegion : HAsciiString from TCollection;
 	      hasApostalCode : Boolean from Standard;
-	      aPostalCode : mutable HAsciiString from TCollection;
+	      aPostalCode : HAsciiString from TCollection;
 	      hasAcountry : Boolean from Standard;
-	      aCountry : mutable HAsciiString from TCollection;
+	      aCountry : HAsciiString from TCollection;
 	      hasAfacsimileNumber : Boolean from Standard;
-	      aFacsimileNumber : mutable HAsciiString from TCollection;
+	      aFacsimileNumber : HAsciiString from TCollection;
 	      hasAtelephoneNumber : Boolean from Standard;
-	      aTelephoneNumber : mutable HAsciiString from TCollection;
+	      aTelephoneNumber : HAsciiString from TCollection;
 	      hasAelectronicMailAddress : Boolean from Standard;
-	      aElectronicMailAddress : mutable HAsciiString from TCollection;
+	      aElectronicMailAddress : HAsciiString from TCollection;
 	      hasAtelexNumber : Boolean from Standard;
-	      aTelexNumber : mutable HAsciiString from TCollection) is redefined;
+	      aTelexNumber : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
 	      hasAinternalLocation : Boolean from Standard;
-	      aInternalLocation : mutable HAsciiString from TCollection;
+	      aInternalLocation : HAsciiString from TCollection;
 	      hasAstreetNumber : Boolean from Standard;
-	      aStreetNumber : mutable HAsciiString from TCollection;
+	      aStreetNumber : HAsciiString from TCollection;
 	      hasAstreet : Boolean from Standard;
-	      aStreet : mutable HAsciiString from TCollection;
+	      aStreet : HAsciiString from TCollection;
 	      hasApostalBox : Boolean from Standard;
-	      aPostalBox : mutable HAsciiString from TCollection;
+	      aPostalBox : HAsciiString from TCollection;
 	      hasAtown : Boolean from Standard;
-	      aTown : mutable HAsciiString from TCollection;
+	      aTown : HAsciiString from TCollection;
 	      hasAregion : Boolean from Standard;
-	      aRegion : mutable HAsciiString from TCollection;
+	      aRegion : HAsciiString from TCollection;
 	      hasApostalCode : Boolean from Standard;
-	      aPostalCode : mutable HAsciiString from TCollection;
+	      aPostalCode : HAsciiString from TCollection;
 	      hasAcountry : Boolean from Standard;
-	      aCountry : mutable HAsciiString from TCollection;
+	      aCountry : HAsciiString from TCollection;
 	      hasAfacsimileNumber : Boolean from Standard;
-	      aFacsimileNumber : mutable HAsciiString from TCollection;
+	      aFacsimileNumber : HAsciiString from TCollection;
 	      hasAtelephoneNumber : Boolean from Standard;
-	      aTelephoneNumber : mutable HAsciiString from TCollection;
+	      aTelephoneNumber : HAsciiString from TCollection;
 	      hasAelectronicMailAddress : Boolean from Standard;
-	      aElectronicMailAddress : mutable HAsciiString from TCollection;
+	      aElectronicMailAddress : HAsciiString from TCollection;
 	      hasAtelexNumber : Boolean from Standard;
-	      aTelexNumber : mutable HAsciiString from TCollection;
-	      aPeople : mutable HArray1OfPerson from StepBasic;
-	      aDescription : mutable HAsciiString from TCollection) is virtual;
+	      aTelexNumber : HAsciiString from TCollection;
+	      aPeople : HArray1OfPerson from StepBasic;
+	      aDescription : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPeople(me : mutable; aPeople : mutable HArray1OfPerson);
-	People (me) returns mutable HArray1OfPerson;
-	PeopleValue (me; num : Integer) returns mutable Person;
+	SetPeople(me : mutable; aPeople : HArray1OfPerson);
+	People (me) returns HArray1OfPerson;
+	PeopleValue (me; num : Integer) returns Person;
 	NbPeople (me) returns Integer;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cdl b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cdl
index baf1d56938..e6a9db56ca 100644
--- a/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cdl
+++ b/src/StepBasic/StepBasic_PlaneAngleMeasureWithUnit.cdl
@@ -24,7 +24,7 @@ uses
 	NamedUnit from StepBasic
 is
 
-	Create returns mutable PlaneAngleMeasureWithUnit;
+	Create returns PlaneAngleMeasureWithUnit;
 	---Purpose: Returns a PlaneAngleMeasureWithUnit
 
 
diff --git a/src/StepBasic/StepBasic_PlaneAngleUnit.cdl b/src/StepBasic/StepBasic_PlaneAngleUnit.cdl
index 1b990dee0e..ce1de6a3b1 100644
--- a/src/StepBasic/StepBasic_PlaneAngleUnit.cdl
+++ b/src/StepBasic/StepBasic_PlaneAngleUnit.cdl
@@ -23,7 +23,7 @@ uses
 	DimensionalExponents from StepBasic
 is
 
-	Create returns mutable PlaneAngleUnit;
+	Create returns PlaneAngleUnit;
 	---Purpose: Returns a PlaneAngleUnit
 
 
diff --git a/src/StepBasic/StepBasic_Product.cdl b/src/StepBasic/StepBasic_Product.cdl
index b5a5fd019c..c30e913a5f 100644
--- a/src/StepBasic/StepBasic_Product.cdl
+++ b/src/StepBasic/StepBasic_Product.cdl
@@ -25,26 +25,26 @@ uses
 	ProductContext from StepBasic
 is
 
-	Create returns mutable Product;
+	Create returns Product;
 	---Purpose: Returns a Product
 
 	Init (me : mutable;
-	      aId : mutable HAsciiString from TCollection;
-	      aName : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aFrameOfReference : mutable HArray1OfProductContext from StepBasic) is virtual;
+	      aId : HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aFrameOfReference : HArray1OfProductContext from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetId(me : mutable; aId : mutable HAsciiString);
-	Id (me) returns mutable HAsciiString;
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
-	SetFrameOfReference(me : mutable; aFrameOfReference : mutable HArray1OfProductContext);
-	FrameOfReference (me) returns mutable HArray1OfProductContext;
-	FrameOfReferenceValue (me; num : Integer) returns mutable ProductContext;
+	SetId(me : mutable; aId : HAsciiString);
+	Id (me) returns HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
+	SetFrameOfReference(me : mutable; aFrameOfReference : HArray1OfProductContext);
+	FrameOfReference (me) returns HArray1OfProductContext;
+	FrameOfReferenceValue (me; num : Integer) returns ProductContext;
 	NbFrameOfReference (me) returns Integer;
 
 fields
diff --git a/src/StepBasic/StepBasic_ProductCategory.cdl b/src/StepBasic/StepBasic_ProductCategory.cdl
index fa1915094e..2caad5158c 100644
--- a/src/StepBasic/StepBasic_ProductCategory.cdl
+++ b/src/StepBasic/StepBasic_ProductCategory.cdl
@@ -24,21 +24,21 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable ProductCategory;
+	Create returns ProductCategory;
 	---Purpose: Returns a ProductCategory
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      hasAdescription : Boolean from Standard;
-	      aDescription : mutable HAsciiString from TCollection) is virtual;
+	      aDescription : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
 	UnSetDescription (me:mutable);
-	Description (me) returns mutable HAsciiString;
+	Description (me) returns HAsciiString;
 	HasDescription (me) returns Boolean;
 
 fields
diff --git a/src/StepBasic/StepBasic_ProductContext.cdl b/src/StepBasic/StepBasic_ProductContext.cdl
index e94f696ebb..3d48f42baf 100644
--- a/src/StepBasic/StepBasic_ProductContext.cdl
+++ b/src/StepBasic/StepBasic_ProductContext.cdl
@@ -24,23 +24,23 @@ uses
 	ApplicationContext from StepBasic
 is
 
-	Create returns mutable ProductContext;
+	Create returns ProductContext;
 	---Purpose: Returns a ProductContext
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aFrameOfReference : mutable ApplicationContext from StepBasic) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aFrameOfReference : ApplicationContext from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aFrameOfReference : mutable ApplicationContext from StepBasic;
-	      aDisciplineType : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aFrameOfReference : ApplicationContext from StepBasic;
+	      aDisciplineType : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetDisciplineType(me : mutable; aDisciplineType : mutable HAsciiString);
-	DisciplineType (me) returns mutable HAsciiString;
+	SetDisciplineType(me : mutable; aDisciplineType : HAsciiString);
+	DisciplineType (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ProductDefinition.cdl b/src/StepBasic/StepBasic_ProductDefinition.cdl
index 82bd5db2d6..df9a0cbbb6 100644
--- a/src/StepBasic/StepBasic_ProductDefinition.cdl
+++ b/src/StepBasic/StepBasic_ProductDefinition.cdl
@@ -25,25 +25,25 @@ uses
 	ProductDefinitionContext from StepBasic
 is
 
-	Create returns mutable ProductDefinition;
+	Create returns ProductDefinition;
 	---Purpose: Returns a ProductDefinition
 
 	Init (me : mutable;
-	      aId : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aFormation : mutable ProductDefinitionFormation from StepBasic;
-	      aFrameOfReference : mutable ProductDefinitionContext from StepBasic) is virtual;
+	      aId : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aFormation : ProductDefinitionFormation from StepBasic;
+	      aFrameOfReference : ProductDefinitionContext from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetId(me : mutable; aId : mutable HAsciiString);
-	Id (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
-	SetFormation(me : mutable; aFormation : mutable ProductDefinitionFormation);
-	Formation (me) returns mutable ProductDefinitionFormation;
-	SetFrameOfReference(me : mutable; aFrameOfReference : mutable ProductDefinitionContext);
-	FrameOfReference (me) returns mutable ProductDefinitionContext;
+	SetId(me : mutable; aId : HAsciiString);
+	Id (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
+	SetFormation(me : mutable; aFormation : ProductDefinitionFormation);
+	Formation (me) returns ProductDefinitionFormation;
+	SetFrameOfReference(me : mutable; aFrameOfReference : ProductDefinitionContext);
+	FrameOfReference (me) returns ProductDefinitionContext;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionContext.cdl b/src/StepBasic/StepBasic_ProductDefinitionContext.cdl
index fba9657c11..ce452b8841 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionContext.cdl
+++ b/src/StepBasic/StepBasic_ProductDefinitionContext.cdl
@@ -24,23 +24,23 @@ uses
 	ApplicationContext from StepBasic
 is
 
-	Create returns mutable ProductDefinitionContext;
+	Create returns ProductDefinitionContext;
 	---Purpose: Returns a ProductDefinitionContext
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aFrameOfReference : mutable ApplicationContext from StepBasic) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aFrameOfReference : ApplicationContext from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aFrameOfReference : mutable ApplicationContext from StepBasic;
-	      aLifeCycleStage : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aFrameOfReference : ApplicationContext from StepBasic;
+	      aLifeCycleStage : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetLifeCycleStage(me : mutable; aLifeCycleStage : mutable HAsciiString);
-	LifeCycleStage (me) returns mutable HAsciiString;
+	SetLifeCycleStage(me : mutable; aLifeCycleStage : HAsciiString);
+	LifeCycleStage (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cdl b/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cdl
index 0aacaa7665..2f56a59cf0 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cdl
+++ b/src/StepBasic/StepBasic_ProductDefinitionEffectivity.cdl
@@ -22,7 +22,7 @@ uses
 
 is
 
-    Create returns mutable ProductDefinitionEffectivity;
+    Create returns ProductDefinitionEffectivity;
 
     Init (me : mutable;
     	  aId : HAsciiString;
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormation.cdl b/src/StepBasic/StepBasic_ProductDefinitionFormation.cdl
index 1d287bfee0..7de1858aba 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormation.cdl
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormation.cdl
@@ -24,22 +24,22 @@ uses
 	Product from StepBasic
 is
 
-	Create returns mutable ProductDefinitionFormation;
+	Create returns ProductDefinitionFormation;
 	---Purpose: Returns a ProductDefinitionFormation
 
 	Init (me : mutable;
-	      aId : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aOfProduct : mutable Product from StepBasic) is virtual;
+	      aId : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aOfProduct : Product from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetId(me : mutable; aId : mutable HAsciiString);
-	Id (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
-	SetOfProduct(me : mutable; aOfProduct : mutable Product);
-	OfProduct (me) returns mutable Product;
+	SetId(me : mutable; aId : HAsciiString);
+	Id (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
+	SetOfProduct(me : mutable; aOfProduct : Product);
+	OfProduct (me) returns Product;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cdl b/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cdl
index 5944f73d76..4c0cbadc6c 100644
--- a/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cdl
+++ b/src/StepBasic/StepBasic_ProductDefinitionFormationWithSpecifiedSource.cdl
@@ -25,19 +25,19 @@ uses
 	Product from StepBasic
 is
 
-	Create returns mutable ProductDefinitionFormationWithSpecifiedSource;
+	Create returns ProductDefinitionFormationWithSpecifiedSource;
 	---Purpose: Returns a ProductDefinitionFormationWithSpecifiedSource
 
 
 	Init (me : mutable;
-	      aId : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aOfProduct : mutable Product from StepBasic) is redefined;
+	      aId : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aOfProduct : Product from StepBasic) is redefined;
 
 	Init (me : mutable;
-	      aId : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aOfProduct : mutable Product from StepBasic;
+	      aId : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aOfProduct : Product from StepBasic;
 	      aMakeOrBuy : Source from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepBasic/StepBasic_ProductRelatedProductCategory.cdl b/src/StepBasic/StepBasic_ProductRelatedProductCategory.cdl
index dfb8181532..9400d9d8af 100644
--- a/src/StepBasic/StepBasic_ProductRelatedProductCategory.cdl
+++ b/src/StepBasic/StepBasic_ProductRelatedProductCategory.cdl
@@ -26,26 +26,26 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable ProductRelatedProductCategory;
+	Create returns ProductRelatedProductCategory;
 	---Purpose: Returns a ProductRelatedProductCategory
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      hasAdescription : Boolean from Standard;
-	      aDescription : mutable HAsciiString from TCollection) is redefined;
+	      aDescription : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      hasAdescription : Boolean from Standard;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aProducts : mutable HArray1OfProduct from StepBasic) is virtual;
+	      aDescription : HAsciiString from TCollection;
+	      aProducts : HArray1OfProduct from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetProducts(me : mutable; aProducts : mutable HArray1OfProduct);
-	Products (me) returns mutable HArray1OfProduct;
-	ProductsValue (me; num : Integer) returns mutable Product;
+	SetProducts(me : mutable; aProducts : HArray1OfProduct);
+	Products (me) returns HArray1OfProduct;
+	ProductsValue (me; num : Integer) returns Product;
 	NbProducts (me) returns Integer;
 
 fields
diff --git a/src/StepBasic/StepBasic_ProductType.cdl b/src/StepBasic/StepBasic_ProductType.cdl
index 1951114cd8..d6d5c6145a 100644
--- a/src/StepBasic/StepBasic_ProductType.cdl
+++ b/src/StepBasic/StepBasic_ProductType.cdl
@@ -25,7 +25,7 @@ uses
 	HArray1OfProduct from StepBasic
 is
 
-	Create returns mutable ProductType;
+	Create returns ProductType;
 	---Purpose: Returns a ProductType
 
 
diff --git a/src/StepBasic/StepBasic_RatioMeasureWithUnit.cdl b/src/StepBasic/StepBasic_RatioMeasureWithUnit.cdl
index f3aa3afb42..01b41feff5 100644
--- a/src/StepBasic/StepBasic_RatioMeasureWithUnit.cdl
+++ b/src/StepBasic/StepBasic_RatioMeasureWithUnit.cdl
@@ -24,7 +24,7 @@ uses
 	NamedUnit from StepBasic
 is
 
-	Create returns mutable RatioMeasureWithUnit;
+	Create returns RatioMeasureWithUnit;
 	---Purpose: Returns a RatioMeasureWithUnit
 
 
diff --git a/src/StepBasic/StepBasic_RatioUnit.cdl b/src/StepBasic/StepBasic_RatioUnit.cdl
index 05cafbebc5..bb8698c5a9 100644
--- a/src/StepBasic/StepBasic_RatioUnit.cdl
+++ b/src/StepBasic/StepBasic_RatioUnit.cdl
@@ -23,7 +23,7 @@ uses
 	DimensionalExponents from StepBasic
 is
 
-	Create returns mutable RatioUnit;
+	Create returns RatioUnit;
 	---Purpose: Returns a RatioUnit
 
 
diff --git a/src/StepBasic/StepBasic_SecurityClassification.cdl b/src/StepBasic/StepBasic_SecurityClassification.cdl
index f7ff6d8295..6ac60ec4ca 100644
--- a/src/StepBasic/StepBasic_SecurityClassification.cdl
+++ b/src/StepBasic/StepBasic_SecurityClassification.cdl
@@ -24,22 +24,22 @@ uses
 	SecurityClassificationLevel from StepBasic
 is
 
-	Create returns mutable SecurityClassification;
+	Create returns SecurityClassification;
 	---Purpose: Returns a SecurityClassification
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPurpose : mutable HAsciiString from TCollection;
-	      aSecurityLevel : mutable SecurityClassificationLevel from StepBasic) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aPurpose : HAsciiString from TCollection;
+	      aSecurityLevel : SecurityClassificationLevel from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetPurpose(me : mutable; aPurpose : mutable HAsciiString);
-	Purpose (me) returns mutable HAsciiString;
-	SetSecurityLevel(me : mutable; aSecurityLevel : mutable SecurityClassificationLevel);
-	SecurityLevel (me) returns mutable SecurityClassificationLevel;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetPurpose(me : mutable; aPurpose : HAsciiString);
+	Purpose (me) returns HAsciiString;
+	SetSecurityLevel(me : mutable; aSecurityLevel : SecurityClassificationLevel);
+	SecurityLevel (me) returns SecurityClassificationLevel;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SecurityClassificationAssignment.cdl b/src/StepBasic/StepBasic_SecurityClassificationAssignment.cdl
index f3093da531..6f8766978c 100644
--- a/src/StepBasic/StepBasic_SecurityClassificationAssignment.cdl
+++ b/src/StepBasic/StepBasic_SecurityClassificationAssignment.cdl
@@ -24,12 +24,12 @@ uses
 is
 
 	Init (me : mutable;
-	      aAssignedSecurityClassification : mutable SecurityClassification from StepBasic) is virtual;
+	      aAssignedSecurityClassification : SecurityClassification from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAssignedSecurityClassification(me : mutable; aAssignedSecurityClassification : mutable SecurityClassification);
-	AssignedSecurityClassification (me) returns mutable SecurityClassification;
+	SetAssignedSecurityClassification(me : mutable; aAssignedSecurityClassification : SecurityClassification);
+	AssignedSecurityClassification (me) returns SecurityClassification;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SecurityClassificationLevel.cdl b/src/StepBasic/StepBasic_SecurityClassificationLevel.cdl
index dc935c6c69..1ac6fa7f86 100644
--- a/src/StepBasic/StepBasic_SecurityClassificationLevel.cdl
+++ b/src/StepBasic/StepBasic_SecurityClassificationLevel.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable SecurityClassificationLevel;
+	Create returns SecurityClassificationLevel;
 	---Purpose: Returns a SecurityClassificationLevel
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnit.cdl b/src/StepBasic/StepBasic_SiUnit.cdl
index 2562ad467b..a81d1201f5 100644
--- a/src/StepBasic/StepBasic_SiUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnit.cdl
@@ -26,12 +26,12 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable SiUnit;
+	Create returns SiUnit;
 	---Purpose: Returns a SiUnit
 
 
 	Init (me : mutable;
-	      aDimensions : mutable DimensionalExponents from StepBasic) is redefined;
+	      aDimensions : DimensionalExponents from StepBasic) is redefined;
 
 	Init (me : mutable;
 	      hasAprefix : Boolean from Standard;
@@ -46,8 +46,8 @@ is
 	HasPrefix (me) returns Boolean;
 	SetName(me : mutable; aName : SiUnitName);
 	Name (me) returns SiUnitName;
-	SetDimensions(me : mutable; aDimensions : mutable DimensionalExponents) is redefined;
-	Dimensions (me) returns mutable DimensionalExponents is redefined;
+	SetDimensions(me : mutable; aDimensions : DimensionalExponents) is redefined;
+	Dimensions (me) returns DimensionalExponents is redefined;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndAreaUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndAreaUnit.cdl
index 394a0be11b..d4d03eda2b 100644
--- a/src/StepBasic/StepBasic_SiUnitAndAreaUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndAreaUnit.cdl
@@ -25,16 +25,16 @@ uses
 
 is
 
-    Create returns mutable SiUnitAndAreaUnit from StepBasic;
+    Create returns SiUnitAndAreaUnit from StepBasic;
     	---Purpose: Returns a SiUnitAndAreaUnit
     
-    SetAreaUnit(me: mutable; anAreaUnit: mutable AreaUnit from StepBasic);
+    SetAreaUnit(me: mutable; anAreaUnit: AreaUnit from StepBasic);
     
-    AreaUnit(me) returns mutable AreaUnit from StepBasic;
+    AreaUnit(me) returns AreaUnit from StepBasic;
     
-    SetDimensions(me : mutable; aDimensions : mutable DimensionalExponents) is redefined;
+    SetDimensions(me : mutable; aDimensions : DimensionalExponents) is redefined;
     
-    Dimensions(me) returns mutable DimensionalExponents is redefined;
+    Dimensions(me) returns DimensionalExponents is redefined;
     
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cdl
index 12642ca8b0..9abefbce38 100644
--- a/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndLengthUnit.cdl
@@ -28,10 +28,10 @@ uses
     
 is
 
-    Create returns mutable SiUnitAndLengthUnit;
+    Create returns SiUnitAndLengthUnit;
 	---Purpose: Returns a SiUnitAndLengthUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
     Init (me: mutable; hasAprefix: Boolean from Standard;
@@ -40,9 +40,9 @@ is
 
     -- Specific Methods for Field Data Access --
 
-    SetLengthUnit(me: mutable; aLengthUnit: mutable LengthUnit);
+    SetLengthUnit(me: mutable; aLengthUnit: LengthUnit);
     
-    LengthUnit (me) returns mutable LengthUnit;
+    LengthUnit (me) returns LengthUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndMassUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndMassUnit.cdl
index f21cee38e4..48b46e7532 100644
--- a/src/StepBasic/StepBasic_SiUnitAndMassUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndMassUnit.cdl
@@ -27,10 +27,10 @@ uses
     
 is
 
-    Create returns mutable SiUnitAndMassUnit;
+    Create returns SiUnitAndMassUnit;
 	---Purpose: Returns a SiUnitAndMassUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
     Init (me: mutable; hasAprefix: Boolean from Standard;
@@ -39,9 +39,9 @@ is
 
     -- Specific Methods for Field Data Access --
 
-    SetMassUnit(me: mutable; aMassUnit: mutable MassUnit);
+    SetMassUnit(me: mutable; aMassUnit: MassUnit);
     
-    MassUnit (me) returns mutable MassUnit;
+    MassUnit (me) returns MassUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cdl
index dfc5f94acd..7bb048c04c 100644
--- a/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndPlaneAngleUnit.cdl
@@ -27,10 +27,10 @@ uses
 
 is
 
-    Create returns mutable SiUnitAndPlaneAngleUnit;
+    Create returns SiUnitAndPlaneAngleUnit;
 	---Purpose: Returns a SiUnitAndPlaneAngleUnit
 
-    Init (me: mutable; aDimensions : mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions : DimensionalExponents from StepBasic)
     is redefined;
 
     Init (me: mutable; hasAprefix : Boolean from Standard;
@@ -39,9 +39,9 @@ is
 
     -- Specific Methods for Field Data Access --
 
-    SetPlaneAngleUnit(me: mutable; aPlaneAngleUnit: mutable PlaneAngleUnit);
+    SetPlaneAngleUnit(me: mutable; aPlaneAngleUnit: PlaneAngleUnit);
     
-    PlaneAngleUnit (me) returns mutable PlaneAngleUnit;
+    PlaneAngleUnit (me) returns PlaneAngleUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cdl
index 6885d9a468..60addc4850 100644
--- a/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndRatioUnit.cdl
@@ -27,10 +27,10 @@ uses
 
 is
 
-    Create returns mutable SiUnitAndRatioUnit;
+    Create returns SiUnitAndRatioUnit;
 	---Purpose: Returns a SiUnitAndRatioUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
     Init (me: mutable; hasAprefix: Boolean from Standard;
@@ -39,9 +39,9 @@ is
 
     -- Specific Methods for Field Data Access --
 
-    SetRatioUnit(me : mutable; aRatioUnit : mutable RatioUnit);
+    SetRatioUnit(me : mutable; aRatioUnit : RatioUnit);
     
-    RatioUnit (me) returns mutable RatioUnit;
+    RatioUnit (me) returns RatioUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cdl
index f9c7578ec1..5105700782 100644
--- a/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndSolidAngleUnit.cdl
@@ -27,10 +27,10 @@ uses
 
 is
 
-    Create returns mutable SiUnitAndSolidAngleUnit;
+    Create returns SiUnitAndSolidAngleUnit;
 	---Purpose: Returns a SiUnitAndSolidAngleUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
     Init (me: mutable; hasAprefix: Boolean from Standard;
@@ -39,9 +39,9 @@ is
 
     -- Specific Methods for Field Data Access --
 
-    SetSolidAngleUnit(me: mutable; aSolidAngleUnit: mutable SolidAngleUnit);
+    SetSolidAngleUnit(me: mutable; aSolidAngleUnit: SolidAngleUnit);
     
-    SolidAngleUnit (me) returns mutable SolidAngleUnit;
+    SolidAngleUnit (me) returns SolidAngleUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cdl
index 9ba58f455f..3d5905960f 100644
--- a/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndThermodynamicTemperatureUnit.cdl
@@ -26,10 +26,10 @@ uses
 
 is
 
-    Create returns mutable SiUnitAndThermodynamicTemperatureUnit;
+    Create returns SiUnitAndThermodynamicTemperatureUnit;
 	---Purpose: Returns a SiUnitAndThermodynamicTemperatureUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic)
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic)
     is redefined;
 
     Init (me: mutable; hasAprefix: Boolean from Standard;
@@ -38,9 +38,9 @@ is
 
     -- Specific Methods for Field Data Access --
 
-    SetThermodynamicTemperatureUnit(me: mutable; aThermodynamicTemperatureUnit: mutable ThermodynamicTemperatureUnit);
+    SetThermodynamicTemperatureUnit(me: mutable; aThermodynamicTemperatureUnit: ThermodynamicTemperatureUnit);
     
-    ThermodynamicTemperatureUnit (me) returns mutable ThermodynamicTemperatureUnit;
+    ThermodynamicTemperatureUnit (me) returns ThermodynamicTemperatureUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cdl
index b85a03d176..a2483c44f4 100644
--- a/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndTimeUnit.cdl
@@ -27,10 +27,10 @@ uses
 
 is
 
-    Create returns mutable SiUnitAndTimeUnit;
+    Create returns SiUnitAndTimeUnit;
 	---Purpose: Returns a SiUnitAndTimeUnit
 
-    Init (me: mutable; aDimensions: mutable DimensionalExponents from StepBasic) is redefined;
+    Init (me: mutable; aDimensions: DimensionalExponents from StepBasic) is redefined;
 
     
     Init (me: mutable; hasAprefix: Boolean from Standard;
@@ -39,9 +39,9 @@ is
 
     -- Specific Methods for Field Data Access --
 
-    SetTimeUnit(me: mutable; aTimeUnit: mutable TimeUnit);
+    SetTimeUnit(me: mutable; aTimeUnit: TimeUnit);
     
-    TimeUnit (me) returns mutable TimeUnit;
+    TimeUnit (me) returns TimeUnit;
 
 fields
 
diff --git a/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.cdl b/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.cdl
index df153782b8..3e63fc87b7 100644
--- a/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.cdl
+++ b/src/StepBasic/StepBasic_SiUnitAndVolumeUnit.cdl
@@ -25,16 +25,16 @@ uses
 
 is
 
-    Create returns mutable SiUnitAndVolumeUnit from StepBasic;
+    Create returns SiUnitAndVolumeUnit from StepBasic;
     	---Purpose: Returns a SiUnitAndVolumeUnit
     
-    SetVolumeUnit(me: mutable; aVolumeUnit: mutable VolumeUnit from StepBasic);
+    SetVolumeUnit(me: mutable; aVolumeUnit: VolumeUnit from StepBasic);
     
-    VolumeUnit(me) returns mutable VolumeUnit from StepBasic;
+    VolumeUnit(me) returns VolumeUnit from StepBasic;
     
-    SetDimensions(me : mutable; aDimensions : mutable DimensionalExponents) is redefined;
+    SetDimensions(me : mutable; aDimensions : DimensionalExponents) is redefined;
     
-    Dimensions(me) returns mutable DimensionalExponents is redefined;
+    Dimensions(me) returns DimensionalExponents is redefined;
     
 fields
 
diff --git a/src/StepBasic/StepBasic_SizeMember.cdl b/src/StepBasic/StepBasic_SizeMember.cdl
index 92bda6e7f6..5b101bc8a1 100644
--- a/src/StepBasic/StepBasic_SizeMember.cdl
+++ b/src/StepBasic/StepBasic_SizeMember.cdl
@@ -23,7 +23,7 @@ uses CString
 
 is
 
-    Create returns mutable SizeMember;
+    Create returns SizeMember;
 
     HasName (me) returns Boolean  is redefined;
     -- returns True
diff --git a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cdl b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cdl
index 90e8cd2750..222207f2ef 100644
--- a/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cdl
+++ b/src/StepBasic/StepBasic_SolidAngleMeasureWithUnit.cdl
@@ -24,7 +24,7 @@ uses
 	NamedUnit from StepBasic
 is
 
-	Create returns mutable SolidAngleMeasureWithUnit;
+	Create returns SolidAngleMeasureWithUnit;
 	---Purpose: Returns a SolidAngleMeasureWithUnit
 
 
diff --git a/src/StepBasic/StepBasic_SolidAngleUnit.cdl b/src/StepBasic/StepBasic_SolidAngleUnit.cdl
index ca03c8d5bf..1f0a8483c7 100644
--- a/src/StepBasic/StepBasic_SolidAngleUnit.cdl
+++ b/src/StepBasic/StepBasic_SolidAngleUnit.cdl
@@ -23,7 +23,7 @@ uses
 	DimensionalExponents from StepBasic
 is
 
-	Create returns mutable SolidAngleUnit;
+	Create returns SolidAngleUnit;
 	---Purpose: Returns a SolidAngleUnit
 
 
diff --git a/src/StepBasic/StepBasic_TimeMeasureWithUnit.cdl b/src/StepBasic/StepBasic_TimeMeasureWithUnit.cdl
index c0af2ef442..76c8cb10d4 100644
--- a/src/StepBasic/StepBasic_TimeMeasureWithUnit.cdl
+++ b/src/StepBasic/StepBasic_TimeMeasureWithUnit.cdl
@@ -24,7 +24,7 @@ uses
 	NamedUnit from StepBasic
 is
 
-	Create returns mutable TimeMeasureWithUnit;
+	Create returns TimeMeasureWithUnit;
 	---Purpose: Returns a TimeMeasureWithUnit
 
 
diff --git a/src/StepBasic/StepBasic_TimeUnit.cdl b/src/StepBasic/StepBasic_TimeUnit.cdl
index 757e4053ab..ff4772e40b 100644
--- a/src/StepBasic/StepBasic_TimeUnit.cdl
+++ b/src/StepBasic/StepBasic_TimeUnit.cdl
@@ -23,7 +23,7 @@ uses
 	DimensionalExponents from StepBasic
 is
 
-	Create returns mutable TimeUnit;
+	Create returns TimeUnit;
 	---Purpose: Returns a TimeUnit
 
 
diff --git a/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cdl b/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cdl
index a24fb3a764..589b73237c 100644
--- a/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cdl
+++ b/src/StepBasic/StepBasic_UncertaintyMeasureWithUnit.cdl
@@ -25,7 +25,7 @@ uses
 	Unit from StepBasic
 is
 
-	Create returns mutable UncertaintyMeasureWithUnit;
+	Create returns UncertaintyMeasureWithUnit;
 	---Purpose: Returns a UncertaintyMeasureWithUnit
 
 
diff --git a/src/StepBasic/StepBasic_VolumeUnit.cdl b/src/StepBasic/StepBasic_VolumeUnit.cdl
index 5ccb10445f..b920626e17 100644
--- a/src/StepBasic/StepBasic_VolumeUnit.cdl
+++ b/src/StepBasic/StepBasic_VolumeUnit.cdl
@@ -21,6 +21,6 @@ class VolumeUnit from StepBasic inherits NamedUnit from StepBasic
 
 is
 
-   Create returns mutable VolumeUnit from StepBasic;
+   Create returns VolumeUnit from StepBasic;
 
 end VolumeUnit;
diff --git a/src/StepBasic/StepBasic_WeekOfYearAndDayDate.cdl b/src/StepBasic/StepBasic_WeekOfYearAndDayDate.cdl
index 39629379c4..befb9af55f 100644
--- a/src/StepBasic/StepBasic_WeekOfYearAndDayDate.cdl
+++ b/src/StepBasic/StepBasic_WeekOfYearAndDayDate.cdl
@@ -24,7 +24,7 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable WeekOfYearAndDayDate;
+	Create returns WeekOfYearAndDayDate;
 	---Purpose: Returns a WeekOfYearAndDayDate
 
 
diff --git a/src/StepData/StepData_DefaultGeneral.cdl b/src/StepData/StepData_DefaultGeneral.cdl
index b5c4caef98..0c4a7f3cc0 100644
--- a/src/StepData/StepData_DefaultGeneral.cdl
+++ b/src/StepData/StepData_DefaultGeneral.cdl
@@ -24,7 +24,7 @@ uses OStream, Transient ,
 
 is
 
-    Create returns mutable DefaultGeneral;
+    Create returns DefaultGeneral;
     ---Purpose : Creates a Default General Module
 
     	--  Reconduction because limitation cdl  --
@@ -38,12 +38,12 @@ is
     	       ach : in out Check);
     ---Purpose : Specific Checking of an Entity <ent>
 
-    NewVoid (me; CN : Integer; entto : out mutable Transient)
+    NewVoid (me; CN : Integer; entto : out Transient)
     	returns Boolean;
     ---Purpose : Specific creation of a new void entity
 
     CopyCase (me; casenum : Integer;
-    	      entfrom : Transient; entto : mutable Transient;
+    	      entfrom : Transient; entto : Transient;
     	      TC : in out CopyTool);
     ---Purpose : Specific Copy ("Deep") from <entfrom> to <entto> (same type)
     --           by using a CopyTool which provides its working Map.
diff --git a/src/StepData/StepData_DescrGeneral.cdl b/src/StepData/StepData_DescrGeneral.cdl
index c41438ed33..1d9869510d 100644
--- a/src/StepData/StepData_DescrGeneral.cdl
+++ b/src/StepData/StepData_DescrGeneral.cdl
@@ -36,10 +36,10 @@ is
     CheckCase (me; CN : Integer; ent : Transient; shares : ShareTool;
     	ach : in out Check);
 
-    CopyCase (me; CN : Integer; entfrom : Transient; entto : mutable Transient;
+    CopyCase (me; CN : Integer; entfrom : Transient; entto : Transient;
     	TC : in out CopyTool);
 
-    NewVoid (me; CN : Integer; ent : out mutable Transient) returns Boolean;
+    NewVoid (me; CN : Integer; ent : out Transient) returns Boolean;
 
 fields
 
diff --git a/src/StepData/StepData_DescrProtocol.cdl b/src/StepData/StepData_DescrProtocol.cdl
index 0f2eaef469..85a67c1072 100644
--- a/src/StepData/StepData_DescrProtocol.cdl
+++ b/src/StepData/StepData_DescrProtocol.cdl
@@ -31,7 +31,7 @@ uses CString, AsciiString from TCollection
 
 is
 
-    Create returns mutable DescrProtocol;
+    Create returns DescrProtocol;
 
     SetSchemaName (me : mutable; name : CString);
     ---Purpose : Defines a specific Schema Name for this Protocol
diff --git a/src/StepData/StepData_DescrReadWrite.cdl b/src/StepData/StepData_DescrReadWrite.cdl
index 4cbeac2abc..445ab50dcc 100644
--- a/src/StepData/StepData_DescrReadWrite.cdl
+++ b/src/StepData/StepData_DescrReadWrite.cdl
@@ -43,7 +43,7 @@ is
         returns Boolean  is redefined;
 
     ReadStep (me; CN : Integer; data : StepReaderData; num : Integer;
-               ach : in out Check; ent : mutable Transient);
+               ach : in out Check; ent : Transient);
 
     WriteStep (me; CN : Integer; SW : in out StepWriter; ent : Transient);
 
diff --git a/src/StepData/StepData_Described.cdl b/src/StepData/StepData_Described.cdl
index 40680c1c90..eb2d25b3ad 100644
--- a/src/StepData/StepData_Described.cdl
+++ b/src/StepData/StepData_Described.cdl
@@ -42,7 +42,7 @@ is
     --           For a Simple Entity : own type or super type
     --           For a Complex Entity : one of the members
 
-    As (me; steptype : CString) returns mutable Simple  is deferred;
+    As (me; steptype : CString) returns Simple  is deferred;
     ---Purpose : Returns a Simple Entity which matches with a Type in <me> :
     --           For a Simple Entity : me if it matches, else a null handle
     --           For a Complex Entity : the member which matches, else null
diff --git a/src/StepData/StepData_ECDescr.cdl b/src/StepData/StepData_ECDescr.cdl
index b76c5569be..c20148d105 100644
--- a/src/StepData/StepData_ECDescr.cdl
+++ b/src/StepData/StepData_ECDescr.cdl
@@ -23,7 +23,7 @@ uses HSequenceOfAsciiString from TColStd, SequenceOfTransient from TColStd,
 
 is
 
-    Create returns mutable ECDescr;
+    Create returns ECDescr;
     ---Purpose : Creates an ECDescr, empty
 
     Add (me : mutable; member : ESDescr);
@@ -48,7 +48,7 @@ is
     IsComplex  (me) returns Boolean;
     ---Purpose : Returns True
 
-    NewEntity  (me) returns mutable Described;
+    NewEntity  (me) returns Described;
     ---Purpose : Creates a described entity (i.e. a complex one, made of one
     --           simple entity per member)
 
diff --git a/src/StepData/StepData_EDescr.cdl b/src/StepData/StepData_EDescr.cdl
index 623928dacd..e63ebe9aa0 100644
--- a/src/StepData/StepData_EDescr.cdl
+++ b/src/StepData/StepData_EDescr.cdl
@@ -30,7 +30,7 @@ is
     IsComplex  (me) returns Boolean  is deferred;
     ---Purpose : Tells if a EDescr is complex (ECDescr) or simple (ESDescr)
 
-    NewEntity  (me) returns mutable Described  is deferred;
+    NewEntity  (me) returns Described  is deferred;
     ---Purpose : Creates a described entity (i.e. a simple one)
 
 end EDescr;
diff --git a/src/StepData/StepData_ESDescr.cdl b/src/StepData/StepData_ESDescr.cdl
index 4162b015cb..36e7ebc782 100644
--- a/src/StepData/StepData_ESDescr.cdl
+++ b/src/StepData/StepData_ESDescr.cdl
@@ -25,7 +25,7 @@ uses CString, AsciiString from TCollection,
 
 is
 
-    Create (name : CString) returns mutable ESDescr;
+    Create (name : CString) returns ESDescr;
     ---Purpose : Creates an ESDescr with a type name
 
     SetNbFields (me : mutable; nb : Integer);
@@ -84,7 +84,7 @@ is
     IsComplex  (me) returns Boolean;
     ---Purpose : Returns False
 
-    NewEntity  (me) returns mutable Described;
+    NewEntity  (me) returns Described;
     ---Purpose : Creates a described entity (i.e. a simple one)
 
 fields
diff --git a/src/StepData/StepData_FileProtocol.cdl b/src/StepData/StepData_FileProtocol.cdl
index 6b89971a9c..31260ef2a2 100644
--- a/src/StepData/StepData_FileProtocol.cdl
+++ b/src/StepData/StepData_FileProtocol.cdl
@@ -29,7 +29,7 @@ uses Type, CString, SequenceOfTransient,
 
 is
 
-    Create returns mutable FileProtocol;
+    Create returns FileProtocol;
     ---Purpose : Creates an empty FileProtocol
 
     Add (me : mutable; protocol : Protocol from StepData);
diff --git a/src/StepData/StepData_FreeFormEntity.cdl b/src/StepData/StepData_FreeFormEntity.cdl
index 3556dfc33d..18afd3121c 100644
--- a/src/StepData/StepData_FreeFormEntity.cdl
+++ b/src/StepData/StepData_FreeFormEntity.cdl
@@ -28,7 +28,7 @@ uses CString, AsciiString from TCollection,
 
 is
 
-    Create returns mutable FreeFormEntity;
+    Create returns FreeFormEntity;
     ---Purpose : Creates a FreeFormEntity, with no field, no type
 
     SetStepType (me : mutable; typenam : CString);
@@ -61,7 +61,7 @@ is
     ---Purpose : Returns the list of types (one type for a simple entity),
     --           as is (non reordered)
 
-    Reorder (myclass; ent : in out mutable FreeFormEntity) returns Boolean;
+    Reorder (myclass; ent : in out FreeFormEntity) returns Boolean;
     ---Purpose : Reorders a Complex entity if required, i.e. if member types
     --           are not in alphabetic order
     --           Returns False if nothing done (order was OK or simple entity),
diff --git a/src/StepData/StepData_GeneralModule.cdl b/src/StepData/StepData_GeneralModule.cdl
index 7e2a51a998..3b97ad5063 100644
--- a/src/StepData/StepData_GeneralModule.cdl
+++ b/src/StepData/StepData_GeneralModule.cdl
@@ -36,14 +36,14 @@ is
     ---Purpose : Specific Checking of an Entity <ent>
 
     CopyCase (me; casenum : Integer;
-    	      entfrom : Transient; entto : mutable Transient;
+    	      entfrom : Transient; entto : Transient;
     	      TC : in out CopyTool)  is deferred;
     ---Purpose : Specific Copy ("Deep") from <entfrom> to <entto> (same type)
     --           by using a TransferControl which provides its working Map.
     --           Use method Transferred from TransferControl to work
 
 --    ImpliedCase (me; casenum : Integer;
---    	         entfrom : Transient; entto : mutable Transient;
+--    	         entfrom : Transient; entto : Transient;
 --    	         TC : CopyTool);
     ---Purpose : Specific Copying of Implied References
     --           A Default is provided which does nothing (must current case !)
diff --git a/src/StepData/StepData_HeaderTool.cdl b/src/StepData/StepData_HeaderTool.cdl
index 6df4c888b6..119113b133 100644
--- a/src/StepData/StepData_HeaderTool.cdl
+++ b/src/StepData/StepData_HeaderTool.cdl
@@ -49,7 +49,7 @@ is
 
     	--  Building a Protocol  --
 
-    Build (me : in out; protocol : mutable FileProtocol);
+    Build (me : in out; protocol : FileProtocol);
     ---Purpose : Fills a FileProtocol with the list of Protocols attached to
     --           the list of Schema Names. It can remain empty ...
 
diff --git a/src/StepData/StepData_Plex.cdl b/src/StepData/StepData_Plex.cdl
index ead024a38c..2c1892af0e 100644
--- a/src/StepData/StepData_Plex.cdl
+++ b/src/StepData/StepData_Plex.cdl
@@ -30,7 +30,7 @@ raises InterfaceMismatch
 
 is
 
-    Create (descr : ECDescr) returns mutable Plex;
+    Create (descr : ECDescr) returns Plex;
     ---Purpose : Creates a Plex (empty). The complete creation is made by the
     --           ECDescr itself, by calling Add
 
@@ -51,7 +51,7 @@ is
     --           For a Simple Entity : own type or super type
     --           For a Complex Entity : one of the members
 
-    As (me; steptype : CString) returns mutable Simple;
+    As (me; steptype : CString) returns Simple;
     ---Purpose : Returns a Simple Entity which matches with a Type in <me> :
     --           For a Simple Entity : me if it matches, else a null handle
     --           For a Complex Entity : the member which matches, else null
diff --git a/src/StepData/StepData_Protocol.cdl b/src/StepData/StepData_Protocol.cdl
index 5baca3a25e..9d166fae6c 100644
--- a/src/StepData/StepData_Protocol.cdl
+++ b/src/StepData/StepData_Protocol.cdl
@@ -31,7 +31,7 @@ uses CString, Type,
 
 is
 
-    Create returns mutable Protocol from StepData;
+    Create returns Protocol from StepData;
 
     NbResources (me) returns Integer;
     ---Purpose : Gives the count of Protocols used as Resource (can be zero)
@@ -59,13 +59,13 @@ is
 
     	-- --    General Services (defined at Norm level)    -- --
 
-    NewModel (me) returns mutable InterfaceModel;
+    NewModel (me) returns InterfaceModel;
     ---Purpose : Creates an empty Model for Step Norm
 
     IsSuitableModel (me; model : InterfaceModel)  returns Boolean;
     ---Purpose : Returns True if <model> is a Model of Step Norm
 
-    UnknownEntity (me) returns mutable Transient;
+    UnknownEntity (me) returns Transient;
     ---Purpose : Creates a new Unknown Entity for Step (UndefinedEntity)
 
     IsUnknownEntity (me; ent : Transient) returns Boolean;
diff --git a/src/StepData/StepData_ReadWriteModule.cdl b/src/StepData/StepData_ReadWriteModule.cdl
index dbe81baf0c..b54e58a8a1 100644
--- a/src/StepData/StepData_ReadWriteModule.cdl
+++ b/src/StepData/StepData_ReadWriteModule.cdl
@@ -91,12 +91,12 @@ is
     --           The default returns False. To be redefined as required.
 
     Read (me; CN : Integer; data : FileReaderData; num : Integer;
-    	ach : in out Check; ent : mutable Transient)
+    	ach : in out Check; ent : Transient)
     	raises DomainError;
     ---Purpose : General Read Function, calls ReadStep
 
     ReadStep (me; CN : Integer; data : StepReaderData; num : Integer;
-    	ach : in out Check; ent : mutable Transient)
+    	ach : in out Check; ent : Transient)
     	raises DomainError  is deferred;
     ---Purpose : Specific Read Function. Works with StepReaderData
 
diff --git a/src/StepData/StepData_SelectArrReal.cdl b/src/StepData/StepData_SelectArrReal.cdl
index 3a6ada6e3d..abbc7d9e79 100644
--- a/src/StepData/StepData_SelectArrReal.cdl
+++ b/src/StepData/StepData_SelectArrReal.cdl
@@ -25,7 +25,7 @@ uses
 
 is
 
-    Create returns mutable SelectArrReal;
+    Create returns SelectArrReal;
 
 --    HasName (me) returns Boolean  is redefined;
 
diff --git a/src/StepData/StepData_SelectInt.cdl b/src/StepData/StepData_SelectInt.cdl
index 8e1084c5b9..6bc4be29df 100644
--- a/src/StepData/StepData_SelectInt.cdl
+++ b/src/StepData/StepData_SelectInt.cdl
@@ -25,7 +25,7 @@ uses CString, Logical
 
 is
 
-    Create returns mutable SelectInt;
+    Create returns SelectInt;
 
     Kind (me) returns Integer  is redefined;
     --  possible kind for Int : integer boolean logical enum(without text)
diff --git a/src/StepData/StepData_SelectMember.cdl b/src/StepData/StepData_SelectMember.cdl
index 2aedf11bcf..64918d064d 100644
--- a/src/StepData/StepData_SelectMember.cdl
+++ b/src/StepData/StepData_SelectMember.cdl
@@ -37,7 +37,7 @@ uses CString, ParamType from Interface, Logical from StepData
 
 is
 
-    Create returns mutable SelectMember;
+    Create returns SelectMember;
     --  this constructor is useless, the class is empty
 
     HasName (me) returns Boolean  is virtual;
diff --git a/src/StepData/StepData_SelectNamed.cdl b/src/StepData/StepData_SelectNamed.cdl
index ed1dcadd3a..2ef88e71be 100644
--- a/src/StepData/StepData_SelectNamed.cdl
+++ b/src/StepData/StepData_SelectNamed.cdl
@@ -24,7 +24,7 @@ uses CString, Logical, AsciiString from TCollection,  Field from StepData
 
 is
 
-    Create  returns mutable SelectNamed;
+    Create  returns SelectNamed;
 
     HasName (me) returns Boolean  is redefined;
 
diff --git a/src/StepData/StepData_SelectReal.cdl b/src/StepData/StepData_SelectReal.cdl
index b7da34fccc..66c42c052b 100644
--- a/src/StepData/StepData_SelectReal.cdl
+++ b/src/StepData/StepData_SelectReal.cdl
@@ -25,7 +25,7 @@ uses CString, Logical
 
 is
 
-    Create returns mutable SelectReal;
+    Create returns SelectReal;
 
     Kind (me) returns Integer  is redefined;
     --  fixed kind : Real
diff --git a/src/StepData/StepData_Simple.cdl b/src/StepData/StepData_Simple.cdl
index 5188751492..5ad37d8031 100644
--- a/src/StepData/StepData_Simple.cdl
+++ b/src/StepData/StepData_Simple.cdl
@@ -28,7 +28,7 @@ raises InterfaceMismatch
 
 is
 
-    Create (descr : ESDescr) returns mutable Simple;
+    Create (descr : ESDescr) returns Simple;
     ---Purpose : Creates a Simple Entity
 
     ESDescr (me) returns ESDescr;
@@ -48,7 +48,7 @@ is
     --           For a Simple Entity : own type or super type
     --           For a Complex Entity : one of the members
 
-    As (me; steptype : CString) returns mutable Simple;
+    As (me; steptype : CString) returns Simple;
     ---Purpose : Returns a Simple Entity which matches with a Type in <me> :
     --           For a Simple Entity : me if it matches, else a null handle
     --           For a Complex Entity : the member which matches, else null
diff --git a/src/StepData/StepData_StepModel.cdl b/src/StepData/StepData_StepModel.cdl
index 1bb5713402..2dee14b32c 100644
--- a/src/StepData/StepData_StepModel.cdl
+++ b/src/StepData/StepData_StepModel.cdl
@@ -29,7 +29,7 @@ raises NoSuchObject
 
 is
 
-    Create returns mutable StepModel;
+    Create returns StepModel;
     ---Purpose: Creates an empty STEP model with an empty header.
     
     Entity (me; num : Integer) returns Transient;
@@ -39,7 +39,7 @@ is
     GetFromAnother (me : mutable; other : InterfaceModel);
     ---Purpose : gets header from another Model (uses Header Protocol)
 
-    NewEmptyModel (me) returns mutable InterfaceModel;
+    NewEmptyModel (me) returns InterfaceModel;
     ---Purpose : Returns a New Empty Model, same type as <me>, i.e. StepModel
 
     	-- --   Header management   -- --
@@ -50,7 +50,7 @@ is
     HasHeaderEntity(me; atype : any Type) returns Boolean;
     ---Purpose : says if a Header entity has a specifed type
 
-    HeaderEntity (me; atype : any Type) returns mutable Transient
+    HeaderEntity (me; atype : any Type) returns Transient
     ---Purpose : Returns Header entity with specified type, if there is
     	raises NoSuchObject;
     --           Error if no Header Entity matches <atype>
@@ -58,7 +58,7 @@ is
     ClearHeader (me : mutable);
     ---Purpose : Clears the Header
 
-    AddHeaderEntity (me : mutable; ent : mutable Transient);
+    AddHeaderEntity (me : mutable; ent : Transient);
     ---Purpose : Adds an Entity to the Header
 
     VerifyCheck (me; ach : in out Check) is redefined;
diff --git a/src/StepData/StepData_StepReaderData.cdl b/src/StepData/StepData_StepReaderData.cdl
index 23f45b2b78..2e02e0e6c1 100644
--- a/src/StepData/StepData_StepReaderData.cdl
+++ b/src/StepData/StepData_StepReaderData.cdl
@@ -36,7 +36,7 @@ is
 
     	-- --   File data storing and access (specific)   -- --
 
-    Create (nbheader,nbtotal,nbpar : Integer) returns mutable StepReaderData;
+    Create (nbheader,nbtotal,nbpar : Integer) returns StepReaderData;
     ---Purpose : creates StepReaderData correctly dimensionned (necessary at
     --           creation time, because it contains arrays)
     --           nbheader is nb of records for Header, nbtotal for Header+Data
@@ -143,7 +143,7 @@ is
     --           Else the kind to be recorded in the field
 
     ReadMember (me; num, nump : Integer; mess : CString; ach : in out Check;
-    	    	val : in out mutable SelectMember)  returns Boolean;
+    	    	val : in out SelectMember)  returns Boolean;
     ---Purpose : Reads parameter <nump> of record <num> into a SelectMember,
     --           self-sufficient (no Description needed)
     --           If <val> is already created, it will be filled, as possible
@@ -170,7 +170,7 @@ is
     ---Purpose : reads a list of fields controlled by an ESDescr
 
     ReadAny    (me; num, nump : Integer; mess : CString; ach : in out Check;
-    	    	descr : PDescr; val : in out mutable Transient) returns Boolean;
+    	    	descr : PDescr; val : in out Transient) returns Boolean;
     ---Purpose : Reads parameter <nump> of record <num> into a Transient Value
     --           according to the type of the parameter :
     --           Named for Integer,Boolean,Logical,Enum,Real : SelectNamed
@@ -208,7 +208,7 @@ is
     --           Return value and Check managed as by ReadXY (demands a Real)
 
     ReadEntity  (me; num, nump : Integer; mess : CString; ach : in out Check;
-    	    	 atype : Type; ent : out mutable Transient)
+    	    	 atype : Type; ent : out Transient)
     	returns Boolean  is static;
     ---Purpose : Reads parameter <nump> of record <num> as a single Entity.
     --           Return value and Check managed as by ReadReal (demands a
@@ -241,7 +241,7 @@ is
     --           Logical enum, i.e. text ".T.", ".F.", or ".U.")
 
     ReadString  (me; num, nump : Integer; mess : CString; ach : in out Check;
-    	    	 val : out mutable HAsciiString from TCollection)
+    	    	 val : out HAsciiString from TCollection)
     	    	     returns Boolean  is static;
     ---Purpose : reads parameter <nump> of record <num> as a String (text
     --           between quotes, quotes are removed by the Read operation)
diff --git a/src/StepData/StepData_StepReaderTool.cdl b/src/StepData/StepData_StepReaderTool.cdl
index dacc37e45e..69a59b4f00 100644
--- a/src/StepData/StepData_StepReaderTool.cdl
+++ b/src/StepData/StepData_StepReaderTool.cdl
@@ -29,7 +29,7 @@ is
 
     	-- --   File data storing and access (specific)   -- --
 
-    Create (reader : mutable StepReaderData; protocol : Protocol from StepData)
+    Create (reader : StepReaderData; protocol : Protocol from StepData)
     	returns StepReaderTool;
     ---Purpose : creates StepReaderTool to work with a StepReaderData according
     --           to a Step Protocol. Defines the ReaderLib at this time
@@ -44,7 +44,7 @@ is
     --           <optimize> given False allows to test some internal algorithms
     --           which are normally avoided (see also StepReaderData)
 
-    Prepare (me : in out; reco : mutable FileRecognizer;
+    Prepare (me : in out; reco : FileRecognizer;
     	    	    	  optimize : Boolean = Standard_True);
     ---Purpose : Bounds empty entities to records, works with a specific
     --           FileRecognizer, stored and later used in Recognize
@@ -52,7 +52,7 @@ is
     --           <optimize : same as above
 
     Recognize (me : in out; num : Integer;
-    	       ach : in out Check; ent : out mutable Transient)
+    	       ach : in out Check; ent : out Transient)
     	returns Boolean;
     ---Purpose : recognizes records, by asking either ReaderLib (default) or
     --           FileRecognizer (if defined) to do so. <ach> is to call
@@ -61,7 +61,7 @@ is
     	-- --   managing Header  -- --
     	--   Header is defined as a list of StepEntities (without ident)
 
-    PrepareHeader (me : in out; reco : mutable FileRecognizer);
+    PrepareHeader (me : in out; reco : FileRecognizer);
     ---Purpose : bounds empty entities and sub-lists to header records
     --           works like Prepare + SetEntityNumbers, but for header
     --           (N.B.: in Header, no Ident and no reference)
@@ -70,19 +70,19 @@ is
 
     	-- --   loading entities into the model   -- --
 
-    BeginRead (me : in out; amodel : mutable InterfaceModel);
+    BeginRead (me : in out; amodel : InterfaceModel);
     ---Purpose : fills model's header; that is, gives to it Header entities
     --           and commands their loading. Also fills StepModel's Global
     --           Check from StepReaderData's GlobalCheck
 
     AnalyseRecord (me : in out;
-        num : Integer; anent : mutable Transient; acheck : in out Check)
+        num : Integer; anent : Transient; acheck : in out Check)
 	    returns Boolean;
     ---Purpose : fills an entity, given record no; works by using a ReaderLib
     --           to load each entity, which must be a Transient
     --           Actually, returned value is True if no fail, False else
 
-    EndRead (me : in out; amodel : mutable InterfaceModel) is redefined;
+    EndRead (me : in out; amodel : InterfaceModel) is redefined;
     ---Purpose : Ends file reading after reading all the entities
     --           Here, it binds in the model, Idents to Entities (for checks)
 
diff --git a/src/StepData/StepData_UndefinedEntity.cdl b/src/StepData/StepData_UndefinedEntity.cdl
index deee1bfe93..6f0349d08b 100644
--- a/src/StepData/StepData_UndefinedEntity.cdl
+++ b/src/StepData/StepData_UndefinedEntity.cdl
@@ -28,27 +28,27 @@ uses AsciiString from TCollection, HAsciiString from TCollection,
 
 is
 
-    Create returns mutable UndefinedEntity;
+    Create returns UndefinedEntity;
     ---Purpose : creates an Unknown entity
 
-    Create (issub : Boolean) returns mutable UndefinedEntity;
+    Create (issub : Boolean) returns UndefinedEntity;
     ---Purpose : Creates a SubList of an Unknown entity : it is an Unknown
     --           Entity with no Type, but flagged as "SUB" if issub is True
 
-    UndefinedContent (me) returns mutable UndefinedContent;
+    UndefinedContent (me) returns UndefinedContent;
     ---Purpose : Returns the UndefinedContent which brings the Parameters
 
 
     IsSub (me) returns Boolean;
     ---Purpose : Returns True if an Unndefined Entity is SubPart of another one
 
-    Super (me) returns mutable UndefinedEntity;
+    Super (me) returns UndefinedEntity;
     ---Purpose : Returns the "super-entity" of a sub-part
 
     IsComplex (me) returns Boolean;
     ---Purpose : Returns True if <me> defines a Multiple Type Entity (see ANDOR)
 
-    Next (me) returns mutable UndefinedEntity;
+    Next (me) returns UndefinedEntity;
     ---Purpose : For a Multiple Type Entity, returns the Next "Componant"
     --           For more than two Types, iterative definition (Next->Next...)
     --           Returns a Null Handle for the end of the List
diff --git a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl
index 7ab7863ef6..cb95e2d7f3 100644
--- a/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl
+++ b/src/StepDimTol/StepDimTol_GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol.cdl
@@ -26,7 +26,7 @@ uses
     
 is
 
-    Create returns mutable GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol;
+    Create returns GeoTolAndGeoTolWthDatRefAndModGeoTolAndPosTol;
     
     Init (me: mutable; aName: HAsciiString from TCollection;
     		       aDescription: HAsciiString from TCollection;
@@ -38,15 +38,15 @@ is
 
     SetGeometricToleranceWithDatumReference(me: mutable; aGTWDR : GeometricToleranceWithDatumReference);
     
-    GetGeometricToleranceWithDatumReference(me) returns mutable GeometricToleranceWithDatumReference;
+    GetGeometricToleranceWithDatumReference(me) returns GeometricToleranceWithDatumReference;
     
     SetModifiedGeometricTolerance(me: mutable; aMGT : ModifiedGeometricTolerance);
     
-    GetModifiedGeometricTolerance(me) returns mutable ModifiedGeometricTolerance;
+    GetModifiedGeometricTolerance(me) returns ModifiedGeometricTolerance;
     
     SetPositionTolerance(me: mutable; aPT : PositionTolerance);
     
-    GetPositionTolerance(me) returns mutable PositionTolerance;
+    GetPositionTolerance(me) returns PositionTolerance;
     
 fields
 
diff --git a/src/StepGeom/StepGeom_Axis1Placement.cdl b/src/StepGeom/StepGeom_Axis1Placement.cdl
index e65c4facef..0ec7aa1dfb 100644
--- a/src/StepGeom/StepGeom_Axis1Placement.cdl
+++ b/src/StepGeom/StepGeom_Axis1Placement.cdl
@@ -26,25 +26,25 @@ uses
 	CartesianPoint from StepGeom
 is
 
-	Create returns mutable Axis1Placement;
+	Create returns Axis1Placement;
 	---Purpose: Returns a Axis1Placement
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLocation : mutable CartesianPoint from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aLocation : CartesianPoint from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLocation : mutable CartesianPoint from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aLocation : CartesianPoint from StepGeom;
 	      hasAaxis : Boolean from Standard;
-	      aAxis : mutable Direction from StepGeom) is virtual;
+	      aAxis : Direction from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAxis(me : mutable; aAxis : mutable Direction);
+	SetAxis(me : mutable; aAxis : Direction);
 	UnSetAxis (me:mutable);
-	Axis (me) returns mutable Direction;
+	Axis (me) returns Direction;
 	HasAxis (me) returns Boolean;
 
 fields
diff --git a/src/StepGeom/StepGeom_Axis2Placement2d.cdl b/src/StepGeom/StepGeom_Axis2Placement2d.cdl
index e38ef3adde..645bbfeea0 100644
--- a/src/StepGeom/StepGeom_Axis2Placement2d.cdl
+++ b/src/StepGeom/StepGeom_Axis2Placement2d.cdl
@@ -26,25 +26,25 @@ uses
 	CartesianPoint from StepGeom
 is
 
-	Create returns mutable Axis2Placement2d;
+	Create returns Axis2Placement2d;
 	---Purpose: Returns a Axis2Placement2d
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLocation : mutable CartesianPoint from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aLocation : CartesianPoint from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLocation : mutable CartesianPoint from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aLocation : CartesianPoint from StepGeom;
 	      hasArefDirection : Boolean from Standard;
-	      aRefDirection : mutable Direction from StepGeom) is virtual;
+	      aRefDirection : Direction from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetRefDirection(me : mutable; aRefDirection : mutable Direction);
+	SetRefDirection(me : mutable; aRefDirection : Direction);
 	UnSetRefDirection (me:mutable);
-	RefDirection (me) returns mutable Direction;
+	RefDirection (me) returns Direction;
 	HasRefDirection (me) returns Boolean;
 
 fields
diff --git a/src/StepGeom/StepGeom_Axis2Placement3d.cdl b/src/StepGeom/StepGeom_Axis2Placement3d.cdl
index 2748b57e17..0303b4d8d9 100644
--- a/src/StepGeom/StepGeom_Axis2Placement3d.cdl
+++ b/src/StepGeom/StepGeom_Axis2Placement3d.cdl
@@ -26,31 +26,31 @@ uses
 	CartesianPoint from StepGeom
 is
 
-	Create returns mutable Axis2Placement3d;
+	Create returns Axis2Placement3d;
 	---Purpose: Returns a Axis2Placement3d
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLocation : mutable CartesianPoint from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aLocation : CartesianPoint from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLocation : mutable CartesianPoint from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aLocation : CartesianPoint from StepGeom;
 	      hasAaxis : Boolean from Standard;
-	      aAxis : mutable Direction from StepGeom;
+	      aAxis : Direction from StepGeom;
 	      hasArefDirection : Boolean from Standard;
-	      aRefDirection : mutable Direction from StepGeom) is virtual;
+	      aRefDirection : Direction from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAxis(me : mutable; aAxis : mutable Direction);
+	SetAxis(me : mutable; aAxis : Direction);
 	UnSetAxis (me:mutable);
-	Axis (me) returns mutable Direction;
+	Axis (me) returns Direction;
 	HasAxis (me) returns Boolean;
-	SetRefDirection(me : mutable; aRefDirection : mutable Direction);
+	SetRefDirection(me : mutable; aRefDirection : Direction);
 	UnSetRefDirection (me:mutable);
-	RefDirection (me) returns mutable Direction;
+	RefDirection (me) returns Direction;
 	HasRefDirection (me) returns Boolean;
 
 fields
diff --git a/src/StepGeom/StepGeom_BSplineCurve.cdl b/src/StepGeom/StepGeom_BSplineCurve.cdl
index 8e03a88c45..3572678299 100644
--- a/src/StepGeom/StepGeom_BSplineCurve.cdl
+++ b/src/StepGeom/StepGeom_BSplineCurve.cdl
@@ -33,17 +33,17 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable BSplineCurve;
+	Create returns BSplineCurve;
 	---Purpose: Returns a BSplineCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is virtual;
@@ -52,9 +52,9 @@ is
 
 	SetDegree(me : mutable; aDegree : Integer);
 	Degree (me) returns Integer;
-	SetControlPointsList(me : mutable; aControlPointsList : mutable HArray1OfCartesianPoint);
-	ControlPointsList (me) returns mutable HArray1OfCartesianPoint;
-	ControlPointsListValue (me; num : Integer) returns mutable CartesianPoint;
+	SetControlPointsList(me : mutable; aControlPointsList : HArray1OfCartesianPoint);
+	ControlPointsList (me) returns HArray1OfCartesianPoint;
+	ControlPointsListValue (me; num : Integer) returns CartesianPoint;
 	NbControlPointsList (me) returns Integer;
 	SetCurveForm(me : mutable; aCurveForm : BSplineCurveForm);
 	CurveForm (me) returns BSplineCurveForm;
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnots.cdl b/src/StepGeom/StepGeom_BSplineCurveWithKnots.cdl
index c59de6f339..28dbf47162 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnots.cdl
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnots.cdl
@@ -31,37 +31,37 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable BSplineCurveWithKnots;
+	Create returns BSplineCurveWithKnots;
 	---Purpose: Returns a BSplineCurveWithKnots
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aKnotMultiplicities : mutable HArray1OfInteger from TColStd;
-	      aKnots : mutable HArray1OfReal from TColStd;
+	      aKnotMultiplicities : HArray1OfInteger from TColStd;
+	      aKnots : HArray1OfReal from TColStd;
 	      aKnotSpec : KnotType from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetKnotMultiplicities(me : mutable; aKnotMultiplicities : mutable HArray1OfInteger);
-	KnotMultiplicities (me) returns mutable HArray1OfInteger;
+	SetKnotMultiplicities(me : mutable; aKnotMultiplicities : HArray1OfInteger);
+	KnotMultiplicities (me) returns HArray1OfInteger;
 	KnotMultiplicitiesValue (me; num : Integer) returns Integer;
 	NbKnotMultiplicities (me) returns Integer;
-	SetKnots(me : mutable; aKnots : mutable HArray1OfReal);
-	Knots (me) returns mutable HArray1OfReal;
+	SetKnots(me : mutable; aKnots : HArray1OfReal);
+	Knots (me) returns HArray1OfReal;
 	KnotsValue (me; num : Integer) returns Real;
 	NbKnots (me) returns Integer;
 	SetKnotSpec(me : mutable; aKnotSpec : KnotType);
diff --git a/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.cdl b/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.cdl
index 7a3cb2984d..281d44c774 100644
--- a/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.cdl
+++ b/src/StepGeom/StepGeom_BSplineCurveWithKnotsAndRationalBSplineCurve.cdl
@@ -36,55 +36,55 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable BSplineCurveWithKnotsAndRationalBSplineCurve;
+	Create returns BSplineCurveWithKnotsAndRationalBSplineCurve;
 	---Purpose: Returns a BSplineCurveWithKnotsAndRationalBSplineCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aBSplineCurveWithKnots : mutable BSplineCurveWithKnots from StepGeom;
-	      aRationalBSplineCurve : mutable RationalBSplineCurve from StepGeom) is virtual;
+	      aBSplineCurveWithKnots : BSplineCurveWithKnots from StepGeom;
+	      aRationalBSplineCurve : RationalBSplineCurve from StepGeom) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aKnotMultiplicities : mutable HArray1OfInteger from TColStd;
-	      aKnots : mutable HArray1OfReal from TColStd;
+	      aKnotMultiplicities : HArray1OfInteger from TColStd;
+	      aKnots : HArray1OfReal from TColStd;
 	      aKnotSpec : KnotType from StepGeom;
-	      aWeightsData : mutable HArray1OfReal from TColStd) is virtual;
+	      aWeightsData : HArray1OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBSplineCurveWithKnots(me : mutable; aBSplineCurveWithKnots : mutable BSplineCurveWithKnots);
-	BSplineCurveWithKnots (me) returns mutable BSplineCurveWithKnots;
-	SetRationalBSplineCurve(me : mutable; aRationalBSplineCurve : mutable RationalBSplineCurve);
-	RationalBSplineCurve (me) returns mutable RationalBSplineCurve;
+	SetBSplineCurveWithKnots(me : mutable; aBSplineCurveWithKnots : BSplineCurveWithKnots);
+	BSplineCurveWithKnots (me) returns BSplineCurveWithKnots;
+	SetRationalBSplineCurve(me : mutable; aRationalBSplineCurve : RationalBSplineCurve);
+	RationalBSplineCurve (me) returns RationalBSplineCurve;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetKnotMultiplicities(me : mutable; aKnotMultiplicities : mutable HArray1OfInteger);
-	KnotMultiplicities (me) returns mutable HArray1OfInteger;
+	SetKnotMultiplicities(me : mutable; aKnotMultiplicities : HArray1OfInteger);
+	KnotMultiplicities (me) returns HArray1OfInteger;
 	KnotMultiplicitiesValue (me; num : Integer) returns Integer;
 	NbKnotMultiplicities (me) returns Integer;
-	SetKnots(me : mutable; aKnots : mutable HArray1OfReal);
-	Knots (me) returns mutable HArray1OfReal;
+	SetKnots(me : mutable; aKnots : HArray1OfReal);
+	Knots (me) returns HArray1OfReal;
 	KnotsValue (me; num : Integer) returns Real;
 	NbKnots (me) returns Integer;
 	SetKnotSpec(me : mutable; aKnotSpec : KnotType);
@@ -92,8 +92,8 @@ is
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray1OfReal);
-	WeightsData (me) returns mutable HArray1OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray1OfReal);
+	WeightsData (me) returns HArray1OfReal;
 	WeightsDataValue (me; num : Integer) returns Real;
 	NbWeightsData (me) returns Integer;
 
diff --git a/src/StepGeom/StepGeom_BSplineSurface.cdl b/src/StepGeom/StepGeom_BSplineSurface.cdl
index e9817f5c26..4d6b20595e 100644
--- a/src/StepGeom/StepGeom_BSplineSurface.cdl
+++ b/src/StepGeom/StepGeom_BSplineSurface.cdl
@@ -33,18 +33,18 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable BSplineSurface;
+	Create returns BSplineSurface;
 	---Purpose: Returns a BSplineSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
@@ -56,9 +56,9 @@ is
 	UDegree (me) returns Integer;
 	SetVDegree(me : mutable; aVDegree : Integer);
 	VDegree (me) returns Integer;
-	SetControlPointsList(me : mutable; aControlPointsList : mutable HArray2OfCartesianPoint);
-	ControlPointsList (me) returns mutable HArray2OfCartesianPoint;
-	ControlPointsListValue (me; num1 : Integer;  num2 : Integer) returns mutable CartesianPoint;
+	SetControlPointsList(me : mutable; aControlPointsList : HArray2OfCartesianPoint);
+	ControlPointsList (me) returns HArray2OfCartesianPoint;
+	ControlPointsListValue (me; num1 : Integer;  num2 : Integer) returns CartesianPoint;
 	NbControlPointsListI (me) returns Integer;
 	NbControlPointsListJ (me) returns Integer;
 	SetSurfaceForm(me : mutable; aSurfaceForm : BSplineSurfaceForm);
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cdl b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cdl
index 10f0cca307..228b7bd2da 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cdl
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnots.cdl
@@ -31,51 +31,51 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable BSplineSurfaceWithKnots;
+	Create returns BSplineSurfaceWithKnots;
 	---Purpose: Returns a BSplineSurfaceWithKnots
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aUMultiplicities : mutable HArray1OfInteger from TColStd;
-	      aVMultiplicities : mutable HArray1OfInteger from TColStd;
-	      aUKnots : mutable HArray1OfReal from TColStd;
-	      aVKnots : mutable HArray1OfReal from TColStd;
+	      aUMultiplicities : HArray1OfInteger from TColStd;
+	      aVMultiplicities : HArray1OfInteger from TColStd;
+	      aUKnots : HArray1OfReal from TColStd;
+	      aVKnots : HArray1OfReal from TColStd;
 	      aKnotSpec : KnotType from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetUMultiplicities(me : mutable; aUMultiplicities : mutable HArray1OfInteger);
-	UMultiplicities (me) returns mutable HArray1OfInteger;
+	SetUMultiplicities(me : mutable; aUMultiplicities : HArray1OfInteger);
+	UMultiplicities (me) returns HArray1OfInteger;
 	UMultiplicitiesValue (me; num : Integer) returns Integer;
 	NbUMultiplicities (me) returns Integer;
-	SetVMultiplicities(me : mutable; aVMultiplicities : mutable HArray1OfInteger);
-	VMultiplicities (me) returns mutable HArray1OfInteger;
+	SetVMultiplicities(me : mutable; aVMultiplicities : HArray1OfInteger);
+	VMultiplicities (me) returns HArray1OfInteger;
 	VMultiplicitiesValue (me; num : Integer) returns Integer;
 	NbVMultiplicities (me) returns Integer;
-	SetUKnots(me : mutable; aUKnots : mutable HArray1OfReal);
-	UKnots (me) returns mutable HArray1OfReal;
+	SetUKnots(me : mutable; aUKnots : HArray1OfReal);
+	UKnots (me) returns HArray1OfReal;
 	UKnotsValue (me; num : Integer) returns Real;
 	NbUKnots (me) returns Integer;
-	SetVKnots(me : mutable; aVKnots : mutable HArray1OfReal);
-	VKnots (me) returns mutable HArray1OfReal;
+	SetVKnots(me : mutable; aVKnots : HArray1OfReal);
+	VKnots (me) returns HArray1OfReal;
 	VKnotsValue (me; num : Integer) returns Real;
 	NbVKnots (me) returns Integer;
 	SetKnotSpec(me : mutable; aKnotSpec : KnotType);
diff --git a/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.cdl b/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.cdl
index 60519aab69..27452f98bb 100644
--- a/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.cdl
+++ b/src/StepGeom/StepGeom_BSplineSurfaceWithKnotsAndRationalBSplineSurface.cdl
@@ -36,71 +36,71 @@ uses
 	KnotType from StepGeom
 is
 
-	Create returns mutable BSplineSurfaceWithKnotsAndRationalBSplineSurface;
+	Create returns BSplineSurfaceWithKnotsAndRationalBSplineSurface;
 	---Purpose: Returns a BSplineSurfaceWithKnotsAndRationalBSplineSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aBSplineSurfaceWithKnots : mutable BSplineSurfaceWithKnots from StepGeom;
-	      aRationalBSplineSurface : mutable RationalBSplineSurface from StepGeom) is virtual;
+	      aBSplineSurfaceWithKnots : BSplineSurfaceWithKnots from StepGeom;
+	      aRationalBSplineSurface : RationalBSplineSurface from StepGeom) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aUMultiplicities : mutable HArray1OfInteger from TColStd;
-	      aVMultiplicities : mutable HArray1OfInteger from TColStd;
-	      aUKnots : mutable HArray1OfReal from TColStd;
-	      aVKnots : mutable HArray1OfReal from TColStd;
+	      aUMultiplicities : HArray1OfInteger from TColStd;
+	      aVMultiplicities : HArray1OfInteger from TColStd;
+	      aUKnots : HArray1OfReal from TColStd;
+	      aVKnots : HArray1OfReal from TColStd;
 	      aKnotSpec : KnotType from StepGeom;
-	      aWeightsData : mutable HArray2OfReal from TColStd) is virtual;
+	      aWeightsData : HArray2OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBSplineSurfaceWithKnots(me : mutable; aBSplineSurfaceWithKnots : mutable BSplineSurfaceWithKnots);
-	BSplineSurfaceWithKnots (me) returns mutable BSplineSurfaceWithKnots;
-	SetRationalBSplineSurface(me : mutable; aRationalBSplineSurface : mutable RationalBSplineSurface);
-	RationalBSplineSurface (me) returns mutable RationalBSplineSurface;
+	SetBSplineSurfaceWithKnots(me : mutable; aBSplineSurfaceWithKnots : BSplineSurfaceWithKnots);
+	BSplineSurfaceWithKnots (me) returns BSplineSurfaceWithKnots;
+	SetRationalBSplineSurface(me : mutable; aRationalBSplineSurface : RationalBSplineSurface);
+	RationalBSplineSurface (me) returns RationalBSplineSurface;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetUMultiplicities(me : mutable; aUMultiplicities : mutable HArray1OfInteger);
-	UMultiplicities (me) returns mutable HArray1OfInteger;
+	SetUMultiplicities(me : mutable; aUMultiplicities : HArray1OfInteger);
+	UMultiplicities (me) returns HArray1OfInteger;
 	UMultiplicitiesValue (me; num : Integer) returns Integer;
 	NbUMultiplicities (me) returns Integer;
-	SetVMultiplicities(me : mutable; aVMultiplicities : mutable HArray1OfInteger);
-	VMultiplicities (me) returns mutable HArray1OfInteger;
+	SetVMultiplicities(me : mutable; aVMultiplicities : HArray1OfInteger);
+	VMultiplicities (me) returns HArray1OfInteger;
 	VMultiplicitiesValue (me; num : Integer) returns Integer;
 	NbVMultiplicities (me) returns Integer;
-	SetUKnots(me : mutable; aUKnots : mutable HArray1OfReal);
-	UKnots (me) returns mutable HArray1OfReal;
+	SetUKnots(me : mutable; aUKnots : HArray1OfReal);
+	UKnots (me) returns HArray1OfReal;
 	UKnotsValue (me; num : Integer) returns Real;
 	NbUKnots (me) returns Integer;
-	SetVKnots(me : mutable; aVKnots : mutable HArray1OfReal);
-	VKnots (me) returns mutable HArray1OfReal;
+	SetVKnots(me : mutable; aVKnots : HArray1OfReal);
+	VKnots (me) returns HArray1OfReal;
 	VKnotsValue (me; num : Integer) returns Real;
 	NbVKnots (me) returns Integer;
 	SetKnotSpec(me : mutable; aKnotSpec : KnotType);
@@ -108,8 +108,8 @@ is
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray2OfReal);
-	WeightsData (me) returns mutable HArray2OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray2OfReal);
+	WeightsData (me) returns HArray2OfReal;
 	WeightsDataValue (me; num1 : Integer;  num2 : Integer) returns Real;
 	NbWeightsDataI (me) returns Integer;
 	NbWeightsDataJ (me) returns Integer;
diff --git a/src/StepGeom/StepGeom_BezierCurve.cdl b/src/StepGeom/StepGeom_BezierCurve.cdl
index ae50b35489..4ef05b119b 100644
--- a/src/StepGeom/StepGeom_BezierCurve.cdl
+++ b/src/StepGeom/StepGeom_BezierCurve.cdl
@@ -27,7 +27,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable BezierCurve;
+	Create returns BezierCurve;
 	---Purpose: Returns a BezierCurve
 
 
diff --git a/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.cdl b/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.cdl
index f55f89315d..d32df8c977 100644
--- a/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.cdl
+++ b/src/StepGeom/StepGeom_BezierCurveAndRationalBSplineCurve.cdl
@@ -34,51 +34,51 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable BezierCurveAndRationalBSplineCurve;
+	Create returns BezierCurveAndRationalBSplineCurve;
 	---Purpose: Returns a BezierCurveAndRationalBSplineCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aBezierCurve : mutable BezierCurve from StepGeom;
-	      aRationalBSplineCurve : mutable RationalBSplineCurve from StepGeom) is virtual;
+	      aBezierCurve : BezierCurve from StepGeom;
+	      aRationalBSplineCurve : RationalBSplineCurve from StepGeom) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aWeightsData : mutable HArray1OfReal from TColStd) is virtual;
+	      aWeightsData : HArray1OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBezierCurve(me : mutable; aBezierCurve : mutable BezierCurve);
-	BezierCurve (me) returns mutable BezierCurve;
-	SetRationalBSplineCurve(me : mutable; aRationalBSplineCurve : mutable RationalBSplineCurve);
-	RationalBSplineCurve (me) returns mutable RationalBSplineCurve;
+	SetBezierCurve(me : mutable; aBezierCurve : BezierCurve);
+	BezierCurve (me) returns BezierCurve;
+	SetRationalBSplineCurve(me : mutable; aRationalBSplineCurve : RationalBSplineCurve);
+	RationalBSplineCurve (me) returns RationalBSplineCurve;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray1OfReal);
-	WeightsData (me) returns mutable HArray1OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray1OfReal);
+	WeightsData (me) returns HArray1OfReal;
 	WeightsDataValue (me; num : Integer) returns Real;
 	NbWeightsData (me) returns Integer;
 
diff --git a/src/StepGeom/StepGeom_BezierSurface.cdl b/src/StepGeom/StepGeom_BezierSurface.cdl
index 6878dca685..9fd794a936 100644
--- a/src/StepGeom/StepGeom_BezierSurface.cdl
+++ b/src/StepGeom/StepGeom_BezierSurface.cdl
@@ -27,7 +27,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable BezierSurface;
+	Create returns BezierSurface;
 	---Purpose: Returns a BezierSurface
 
 
diff --git a/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.cdl b/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.cdl
index b15a3fea20..9042910f86 100644
--- a/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.cdl
+++ b/src/StepGeom/StepGeom_BezierSurfaceAndRationalBSplineSurface.cdl
@@ -34,57 +34,57 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable BezierSurfaceAndRationalBSplineSurface;
+	Create returns BezierSurfaceAndRationalBSplineSurface;
 	---Purpose: Returns a BezierSurfaceAndRationalBSplineSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aBezierSurface : mutable BezierSurface from StepGeom;
-	      aRationalBSplineSurface : mutable RationalBSplineSurface from StepGeom) is virtual;
+	      aBezierSurface : BezierSurface from StepGeom;
+	      aRationalBSplineSurface : RationalBSplineSurface from StepGeom) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aWeightsData : mutable HArray2OfReal from TColStd) is virtual;
+	      aWeightsData : HArray2OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBezierSurface(me : mutable; aBezierSurface : mutable BezierSurface);
-	BezierSurface (me) returns mutable BezierSurface;
-	SetRationalBSplineSurface(me : mutable; aRationalBSplineSurface : mutable RationalBSplineSurface);
-	RationalBSplineSurface (me) returns mutable RationalBSplineSurface;
+	SetBezierSurface(me : mutable; aBezierSurface : BezierSurface);
+	BezierSurface (me) returns BezierSurface;
+	SetRationalBSplineSurface(me : mutable; aRationalBSplineSurface : RationalBSplineSurface);
+	RationalBSplineSurface (me) returns RationalBSplineSurface;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray2OfReal);
-	WeightsData (me) returns mutable HArray2OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray2OfReal);
+	WeightsData (me) returns HArray2OfReal;
 	WeightsDataValue (me; num1 : Integer;  num2 : Integer) returns Real;
 	NbWeightsDataI (me) returns Integer;
 	NbWeightsDataJ (me) returns Integer;
diff --git a/src/StepGeom/StepGeom_BoundaryCurve.cdl b/src/StepGeom/StepGeom_BoundaryCurve.cdl
index 0fedeaf02e..f54cea92e1 100644
--- a/src/StepGeom/StepGeom_BoundaryCurve.cdl
+++ b/src/StepGeom/StepGeom_BoundaryCurve.cdl
@@ -25,7 +25,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable BoundaryCurve;
+	Create returns BoundaryCurve;
 	---Purpose: Returns a BoundaryCurve
 
 
diff --git a/src/StepGeom/StepGeom_BoundedCurve.cdl b/src/StepGeom/StepGeom_BoundedCurve.cdl
index bc31f23b25..cfafbcadd6 100644
--- a/src/StepGeom/StepGeom_BoundedCurve.cdl
+++ b/src/StepGeom/StepGeom_BoundedCurve.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable BoundedCurve;
+	Create returns BoundedCurve;
 	---Purpose: Returns a BoundedCurve
 
 
diff --git a/src/StepGeom/StepGeom_BoundedSurface.cdl b/src/StepGeom/StepGeom_BoundedSurface.cdl
index 5cc27a8232..295c02bb4f 100644
--- a/src/StepGeom/StepGeom_BoundedSurface.cdl
+++ b/src/StepGeom/StepGeom_BoundedSurface.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable BoundedSurface;
+	Create returns BoundedSurface;
 	---Purpose: Returns a BoundedSurface
 
 
diff --git a/src/StepGeom/StepGeom_CartesianPoint.cdl b/src/StepGeom/StepGeom_CartesianPoint.cdl
index 40b4ac7ac4..4328c182e2 100644
--- a/src/StepGeom/StepGeom_CartesianPoint.cdl
+++ b/src/StepGeom/StepGeom_CartesianPoint.cdl
@@ -25,29 +25,29 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CartesianPoint;
+	Create returns CartesianPoint;
 	---Purpose: Returns a CartesianPoint
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCoordinates : mutable HArray1OfReal from TColStd) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aCoordinates : HArray1OfReal from TColStd) is virtual;
 
     	Init2D (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      X,Y : Real);
 
     	Init3D (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      X,Y,Z : Real);
 
 	-- Specific Methods for Field Data Access --
 
-	SetCoordinates(me : mutable; aCoordinates : mutable HArray1OfReal);
-	Coordinates (me) returns mutable HArray1OfReal;
+	SetCoordinates(me : mutable; aCoordinates : HArray1OfReal);
+	Coordinates (me) returns HArray1OfReal;
 	CoordinatesValue (me; num : Integer) returns Real;
 	NbCoordinates (me) returns Integer;
 
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator.cdl b/src/StepGeom/StepGeom_CartesianTransformationOperator.cdl
index dd0ffd047d..4d4975b70e 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator.cdl
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator.cdl
@@ -30,35 +30,35 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CartesianTransformationOperator;
+	Create returns CartesianTransformationOperator;
 	---Purpose: Returns a CartesianTransformationOperator
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      hasAaxis1 : Boolean from Standard;
-	      aAxis1 : mutable Direction from StepGeom;
+	      aAxis1 : Direction from StepGeom;
 	      hasAaxis2 : Boolean from Standard;
-	      aAxis2 : mutable Direction from StepGeom;
-	      aLocalOrigin : mutable CartesianPoint from StepGeom;
+	      aAxis2 : Direction from StepGeom;
+	      aLocalOrigin : CartesianPoint from StepGeom;
 	      hasAscale : Boolean from Standard;
 	      aScale : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAxis1(me : mutable; aAxis1 : mutable Direction);
+	SetAxis1(me : mutable; aAxis1 : Direction);
 	UnSetAxis1 (me:mutable);
-	Axis1 (me) returns mutable Direction;
+	Axis1 (me) returns Direction;
 	HasAxis1 (me) returns Boolean;
-	SetAxis2(me : mutable; aAxis2 : mutable Direction);
+	SetAxis2(me : mutable; aAxis2 : Direction);
 	UnSetAxis2 (me:mutable);
-	Axis2 (me) returns mutable Direction;
+	Axis2 (me) returns Direction;
 	HasAxis2 (me) returns Boolean;
-	SetLocalOrigin(me : mutable; aLocalOrigin : mutable CartesianPoint);
-	LocalOrigin (me) returns mutable CartesianPoint;
+	SetLocalOrigin(me : mutable; aLocalOrigin : CartesianPoint);
+	LocalOrigin (me) returns CartesianPoint;
 	SetScale(me : mutable; aScale : Real);
 	UnSetScale (me:mutable);
 	Scale (me) returns Real;
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator2d.cdl b/src/StepGeom/StepGeom_CartesianTransformationOperator2d.cdl
index ed37be0999..ed05a56908 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator2d.cdl
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator2d.cdl
@@ -24,6 +24,6 @@ uses Boolean
 
 is
 
-    Create returns mutable CartesianTransformationOperator2d from StepGeom;
+    Create returns CartesianTransformationOperator2d from StepGeom;
 
 end CartesianTransformationOperator2d;
diff --git a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cdl b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cdl
index 5653f754e4..2cfa49c5a3 100644
--- a/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cdl
+++ b/src/StepGeom/StepGeom_CartesianTransformationOperator3d.cdl
@@ -27,37 +27,37 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable CartesianTransformationOperator3d;
+	Create returns CartesianTransformationOperator3d;
 	---Purpose: Returns a CartesianTransformationOperator3d
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      hasAaxis1 : Boolean from Standard;
-	      aAxis1 : mutable Direction from StepGeom;
+	      aAxis1 : Direction from StepGeom;
 	      hasAaxis2 : Boolean from Standard;
-	      aAxis2 : mutable Direction from StepGeom;
-	      aLocalOrigin : mutable CartesianPoint from StepGeom;
+	      aAxis2 : Direction from StepGeom;
+	      aLocalOrigin : CartesianPoint from StepGeom;
 	      hasAscale : Boolean from Standard;
 	      aScale : Real from Standard) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      hasAaxis1 : Boolean from Standard;
-	      aAxis1 : mutable Direction from StepGeom;
+	      aAxis1 : Direction from StepGeom;
 	      hasAaxis2 : Boolean from Standard;
-	      aAxis2 : mutable Direction from StepGeom;
-	      aLocalOrigin : mutable CartesianPoint from StepGeom;
+	      aAxis2 : Direction from StepGeom;
+	      aLocalOrigin : CartesianPoint from StepGeom;
 	      hasAscale : Boolean from Standard;
 	      aScale : Real from Standard;
 	      hasAaxis3 : Boolean from Standard;
-	      aAxis3 : mutable Direction from StepGeom) is virtual;
+	      aAxis3 : Direction from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAxis3(me : mutable; aAxis3 : mutable Direction);
+	SetAxis3(me : mutable; aAxis3 : Direction);
 	UnSetAxis3 (me:mutable);
-	Axis3 (me) returns mutable Direction;
+	Axis3 (me) returns Direction;
 	HasAxis3 (me) returns Boolean;
 
 fields
diff --git a/src/StepGeom/StepGeom_Circle.cdl b/src/StepGeom/StepGeom_Circle.cdl
index 7f838c9b4a..d9904c3e41 100644
--- a/src/StepGeom/StepGeom_Circle.cdl
+++ b/src/StepGeom/StepGeom_Circle.cdl
@@ -25,16 +25,16 @@ uses
 	Axis2Placement from StepGeom
 is
 
-	Create returns mutable Circle;
+	Create returns Circle;
 	---Purpose: Returns a Circle
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom;
 	      aRadius : Real from Standard) is virtual;
 
diff --git a/src/StepGeom/StepGeom_CompositeCurve.cdl b/src/StepGeom/StepGeom_CompositeCurve.cdl
index fe1bbb72a0..a3e674c3eb 100644
--- a/src/StepGeom/StepGeom_CompositeCurve.cdl
+++ b/src/StepGeom/StepGeom_CompositeCurve.cdl
@@ -26,23 +26,23 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CompositeCurve;
+	Create returns CompositeCurve;
 	---Purpose: Returns a CompositeCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSegments : mutable HArray1OfCompositeCurveSegment from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aSegments : HArray1OfCompositeCurveSegment from StepGeom;
 	      aSelfIntersect : Logical from StepData) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetSegments(me : mutable; aSegments : mutable HArray1OfCompositeCurveSegment);
-	Segments (me) returns mutable HArray1OfCompositeCurveSegment;
-	SegmentsValue (me; num : Integer) returns mutable CompositeCurveSegment;
+	SetSegments(me : mutable; aSegments : HArray1OfCompositeCurveSegment);
+	Segments (me) returns HArray1OfCompositeCurveSegment;
+	SegmentsValue (me; num : Integer) returns CompositeCurveSegment;
 	NbSegments (me) returns Integer;
 	SetSelfIntersect(me : mutable; aSelfIntersect : Logical);
 	SelfIntersect (me) returns Logical;
diff --git a/src/StepGeom/StepGeom_CompositeCurveOnSurface.cdl b/src/StepGeom/StepGeom_CompositeCurveOnSurface.cdl
index dc4ffcf870..9e535ae662 100644
--- a/src/StepGeom/StepGeom_CompositeCurveOnSurface.cdl
+++ b/src/StepGeom/StepGeom_CompositeCurveOnSurface.cdl
@@ -25,7 +25,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable CompositeCurveOnSurface;
+	Create returns CompositeCurveOnSurface;
 	---Purpose: Returns a CompositeCurveOnSurface
 
 
diff --git a/src/StepGeom/StepGeom_CompositeCurveSegment.cdl b/src/StepGeom/StepGeom_CompositeCurveSegment.cdl
index d034dba4ec..106c3eeb40 100644
--- a/src/StepGeom/StepGeom_CompositeCurveSegment.cdl
+++ b/src/StepGeom/StepGeom_CompositeCurveSegment.cdl
@@ -25,13 +25,13 @@ uses
 	Curve from StepGeom
 is
 
-	Create returns mutable CompositeCurveSegment;
+	Create returns CompositeCurveSegment;
 	---Purpose: Returns a CompositeCurveSegment
 
 	Init (me : mutable;
 	      aTransition : TransitionCode from StepGeom;
 	      aSameSense : Boolean from Standard;
-	      aParentCurve : mutable Curve from StepGeom) is virtual;
+	      aParentCurve : Curve from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
@@ -39,8 +39,8 @@ is
 	Transition (me) returns TransitionCode;
 	SetSameSense(me : mutable; aSameSense : Boolean);
 	SameSense (me) returns Boolean;
-	SetParentCurve(me : mutable; aParentCurve : mutable Curve);
-	ParentCurve (me) returns mutable Curve;
+	SetParentCurve(me : mutable; aParentCurve : Curve);
+	ParentCurve (me) returns Curve;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_Conic.cdl b/src/StepGeom/StepGeom_Conic.cdl
index e682561c0c..5389ebb84c 100644
--- a/src/StepGeom/StepGeom_Conic.cdl
+++ b/src/StepGeom/StepGeom_Conic.cdl
@@ -24,15 +24,15 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Conic;
+	Create returns Conic;
 	---Purpose: Returns a Conic
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepGeom/StepGeom_ConicalSurface.cdl b/src/StepGeom/StepGeom_ConicalSurface.cdl
index 9339166ceb..871aeb8088 100644
--- a/src/StepGeom/StepGeom_ConicalSurface.cdl
+++ b/src/StepGeom/StepGeom_ConicalSurface.cdl
@@ -25,17 +25,17 @@ uses
 	Axis2Placement3d from StepGeom
 is
 
-	Create returns mutable ConicalSurface;
+	Create returns ConicalSurface;
 	---Purpose: Returns a ConicalSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom;
 	      aRadius : Real from Standard;
 	      aSemiAngle : Real from Standard) is virtual;
 
diff --git a/src/StepGeom/StepGeom_Curve.cdl b/src/StepGeom/StepGeom_Curve.cdl
index da2796b6d3..b4949e96fd 100644
--- a/src/StepGeom/StepGeom_Curve.cdl
+++ b/src/StepGeom/StepGeom_Curve.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Curve;
+	Create returns Curve;
 	---Purpose: Returns a Curve
 
 
diff --git a/src/StepGeom/StepGeom_CurveReplica.cdl b/src/StepGeom/StepGeom_CurveReplica.cdl
index d3c4bfbe00..2ce37f75da 100644
--- a/src/StepGeom/StepGeom_CurveReplica.cdl
+++ b/src/StepGeom/StepGeom_CurveReplica.cdl
@@ -24,24 +24,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CurveReplica;
+	Create returns CurveReplica;
 	---Purpose: Returns a CurveReplica
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aParentCurve : mutable Curve from StepGeom;
-	      aTransformation : mutable CartesianTransformationOperator from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aParentCurve : Curve from StepGeom;
+	      aTransformation : CartesianTransformationOperator from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetParentCurve(me : mutable; aParentCurve : mutable Curve);
-	ParentCurve (me) returns mutable Curve;
-	SetTransformation(me : mutable; aTransformation : mutable CartesianTransformationOperator);
-	Transformation (me) returns mutable CartesianTransformationOperator;
+	SetParentCurve(me : mutable; aParentCurve : Curve);
+	ParentCurve (me) returns Curve;
+	SetTransformation(me : mutable; aTransformation : CartesianTransformationOperator);
+	Transformation (me) returns CartesianTransformationOperator;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_CylindricalSurface.cdl b/src/StepGeom/StepGeom_CylindricalSurface.cdl
index 19a4fac33f..104d302f3c 100644
--- a/src/StepGeom/StepGeom_CylindricalSurface.cdl
+++ b/src/StepGeom/StepGeom_CylindricalSurface.cdl
@@ -25,17 +25,17 @@ uses
 	Axis2Placement3d from StepGeom
 is
 
-	Create returns mutable CylindricalSurface;
+	Create returns CylindricalSurface;
 	---Purpose: Returns a CylindricalSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom;
 	      aRadius : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepGeom/StepGeom_DegeneratePcurve.cdl b/src/StepGeom/StepGeom_DegeneratePcurve.cdl
index 7b8d931a64..5d7790326b 100644
--- a/src/StepGeom/StepGeom_DegeneratePcurve.cdl
+++ b/src/StepGeom/StepGeom_DegeneratePcurve.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable DegeneratePcurve;
+	Create returns DegeneratePcurve;
 	---Purpose: Returns a DegeneratePcurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisSurface : mutable Surface from StepGeom;
-	      aReferenceToCurve : mutable DefinitionalRepresentation from StepRepr) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aBasisSurface : Surface from StepGeom;
+	      aReferenceToCurve : DefinitionalRepresentation from StepRepr) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBasisSurface(me : mutable; aBasisSurface : mutable Surface);
-	BasisSurface (me) returns mutable Surface;
-	SetReferenceToCurve(me : mutable; aReferenceToCurve : mutable DefinitionalRepresentation);
-	ReferenceToCurve (me) returns mutable DefinitionalRepresentation;
+	SetBasisSurface(me : mutable; aBasisSurface : Surface);
+	BasisSurface (me) returns Surface;
+	SetReferenceToCurve(me : mutable; aReferenceToCurve : DefinitionalRepresentation);
+	ReferenceToCurve (me) returns DefinitionalRepresentation;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_DegenerateToroidalSurface.cdl b/src/StepGeom/StepGeom_DegenerateToroidalSurface.cdl
index 294d1c606a..3bebd9781f 100644
--- a/src/StepGeom/StepGeom_DegenerateToroidalSurface.cdl
+++ b/src/StepGeom/StepGeom_DegenerateToroidalSurface.cdl
@@ -26,19 +26,19 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable DegenerateToroidalSurface;
+	Create returns DegenerateToroidalSurface;
 	---Purpose: Returns a DegenerateToroidalSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom;
 	      aMajorRadius : Real from Standard;
 	      aMinorRadius : Real from Standard) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom;
 	      aMajorRadius : Real from Standard;
 	      aMinorRadius : Real from Standard;
 	      aSelectOuter : Boolean from Standard) is virtual;
diff --git a/src/StepGeom/StepGeom_Direction.cdl b/src/StepGeom/StepGeom_Direction.cdl
index 030926c870..cea464d6ec 100644
--- a/src/StepGeom/StepGeom_Direction.cdl
+++ b/src/StepGeom/StepGeom_Direction.cdl
@@ -25,21 +25,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Direction;
+	Create returns Direction;
 	---Purpose: Returns a Direction
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aDirectionRatios : mutable HArray1OfReal from TColStd) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aDirectionRatios : HArray1OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetDirectionRatios(me : mutable; aDirectionRatios : mutable HArray1OfReal);
-	DirectionRatios (me) returns mutable HArray1OfReal;
+	SetDirectionRatios(me : mutable; aDirectionRatios : HArray1OfReal);
+	DirectionRatios (me) returns HArray1OfReal;
 	DirectionRatiosValue (me; num : Integer) returns Real;
 	NbDirectionRatios (me) returns Integer;
 
diff --git a/src/StepGeom/StepGeom_ElementarySurface.cdl b/src/StepGeom/StepGeom_ElementarySurface.cdl
index 7baf2a9585..ce725c01fe 100644
--- a/src/StepGeom/StepGeom_ElementarySurface.cdl
+++ b/src/StepGeom/StepGeom_ElementarySurface.cdl
@@ -24,21 +24,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ElementarySurface;
+	Create returns ElementarySurface;
 	---Purpose: Returns a ElementarySurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPosition(me : mutable; aPosition : mutable Axis2Placement3d);
-	Position (me) returns mutable Axis2Placement3d;
+	SetPosition(me : mutable; aPosition : Axis2Placement3d);
+	Position (me) returns Axis2Placement3d;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_Ellipse.cdl b/src/StepGeom/StepGeom_Ellipse.cdl
index c1c99df435..56f9fbf880 100644
--- a/src/StepGeom/StepGeom_Ellipse.cdl
+++ b/src/StepGeom/StepGeom_Ellipse.cdl
@@ -25,16 +25,16 @@ uses
 	Axis2Placement from StepGeom
 is
 
-	Create returns mutable Ellipse;
+	Create returns Ellipse;
 	---Purpose: Returns a Ellipse
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom;
 	      aSemiAxis1 : Real from Standard;
 	      aSemiAxis2 : Real from Standard) is virtual;
diff --git a/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cdl b/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cdl
index b0cdf5076e..b1e890509c 100644
--- a/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cdl
+++ b/src/StepGeom/StepGeom_EvaluatedDegeneratePcurve.cdl
@@ -26,25 +26,25 @@ uses
 	DefinitionalRepresentation from StepRepr
 is
 
-	Create returns mutable EvaluatedDegeneratePcurve;
+	Create returns EvaluatedDegeneratePcurve;
 	---Purpose: Returns a EvaluatedDegeneratePcurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisSurface : mutable Surface from StepGeom;
-	      aReferenceToCurve : mutable DefinitionalRepresentation from StepRepr) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aBasisSurface : Surface from StepGeom;
+	      aReferenceToCurve : DefinitionalRepresentation from StepRepr) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisSurface : mutable Surface from StepGeom;
-	      aReferenceToCurve : mutable DefinitionalRepresentation from StepRepr;
-	      aEquivalentPoint : mutable CartesianPoint from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aBasisSurface : Surface from StepGeom;
+	      aReferenceToCurve : DefinitionalRepresentation from StepRepr;
+	      aEquivalentPoint : CartesianPoint from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetEquivalentPoint(me : mutable; aEquivalentPoint : mutable CartesianPoint);
-	EquivalentPoint (me) returns mutable CartesianPoint;
+	SetEquivalentPoint(me : mutable; aEquivalentPoint : CartesianPoint);
+	EquivalentPoint (me) returns CartesianPoint;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl b/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl
index c301e67789..3e12d15201 100644
--- a/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl
+++ b/src/StepGeom/StepGeom_GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx.cdl
@@ -40,26 +40,26 @@ uses
 
 is
 
-    Create returns mutable GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx;
+    Create returns GeomRepContextAndGlobUnitAssCtxAndGlobUncertaintyAssCtx;
     
     Init (me : mutable;
-          aContextIdentifier : mutable HAsciiString from TCollection;
-          aContextType : mutable HAsciiString from TCollection) is redefined;
+          aContextIdentifier : HAsciiString from TCollection;
+          aContextType : HAsciiString from TCollection) is redefined;
 
     Init(me : mutable;
-         aContextIdentifier            : mutable HAsciiString                     from TCollection;
-	 aContextType                  : mutable HAsciiString                     from TCollection;
-	 aGeometricRepresentationCtx   : mutable GeometricRepresentationContext   from StepGeom;
-	 aGlobalUnitAssignedCtx        : mutable GlobalUnitAssignedContext        from StepRepr;
-    	 aGlobalUncertaintyAssignedCtx : mutable GlobalUncertaintyAssignedContext from StepRepr)
+         aContextIdentifier            : HAsciiString                     from TCollection;
+	 aContextType                  : HAsciiString                     from TCollection;
+	 aGeometricRepresentationCtx   : GeometricRepresentationContext   from StepGeom;
+	 aGlobalUnitAssignedCtx        : GlobalUnitAssignedContext        from StepRepr;
+    	 aGlobalUncertaintyAssignedCtx : GlobalUncertaintyAssignedContext from StepRepr)
     is virtual;
 
     Init(me : mutable;
-	 aContextIdentifier        : mutable HAsciiString                        from TCollection;
-	 aContextType              : mutable HAsciiString                        from TCollection;
+	 aContextIdentifier        : HAsciiString                        from TCollection;
+	 aContextType              : HAsciiString                        from TCollection;
 	 aCoordinateSpaceDimension : Integer                                     from Standard;
-	 aUnits                    : mutable HArray1OfNamedUnit                  from StepBasic;
-	 anUncertainty             : mutable HArray1OfUncertaintyMeasureWithUnit from StepBasic) 
+	 aUnits                    : HArray1OfNamedUnit                  from StepBasic;
+	 anUncertainty             : HArray1OfUncertaintyMeasureWithUnit from StepBasic) 
     is virtual;
 
     -- ====================================== --
@@ -68,17 +68,17 @@ is
 
     SetGeometricRepresentationContext
     	(me : mutable; 
-    	 aGeometricRepresentationContext : mutable GeometricRepresentationContext);
+    	 aGeometricRepresentationContext : GeometricRepresentationContext);
 
     GeometricRepresentationContext (me) 
-    returns mutable GeometricRepresentationContext;
+    returns GeometricRepresentationContext;
 
     SetGlobalUnitAssignedContext
     	(me : mutable; 
-    	 aGlobalUnitAssignedContext : mutable GlobalUnitAssignedContext);
+    	 aGlobalUnitAssignedContext : GlobalUnitAssignedContext);
 
     GlobalUnitAssignedContext (me) 
-    returns mutable GlobalUnitAssignedContext;
+    returns GlobalUnitAssignedContext;
 
     SetGlobalUncertaintyAssignedContext
     	(me : mutable;
@@ -98,18 +98,18 @@ is
     -- Specific Methods for ANDOR Field Data Access GlobalUnitAssignedContext --
     -- ====================================================================== --
 
-    SetUnits(me : mutable; aUnits : mutable HArray1OfNamedUnit);
-    Units (me) returns mutable HArray1OfNamedUnit;
-    UnitsValue (me; num : Integer) returns mutable NamedUnit;
+    SetUnits(me : mutable; aUnits : HArray1OfNamedUnit);
+    Units (me) returns HArray1OfNamedUnit;
+    UnitsValue (me; num : Integer) returns NamedUnit;
     NbUnits (me) returns Integer;
 	
     -- ============================================================================= --
     -- Specific Methods for ANDOR Field Data Access GlobalUncertaintyAssignedContext --
     -- ============================================================================= --
 
-    SetUncertainty(me : mutable; aUncertainty : mutable HArray1OfUncertaintyMeasureWithUnit);
-    Uncertainty (me) returns mutable HArray1OfUncertaintyMeasureWithUnit;
-    UncertaintyValue (me; num : Integer) returns mutable UncertaintyMeasureWithUnit;
+    SetUncertainty(me : mutable; aUncertainty : HArray1OfUncertaintyMeasureWithUnit);
+    Uncertainty (me) returns HArray1OfUncertaintyMeasureWithUnit;
+    UncertaintyValue (me; num : Integer) returns UncertaintyMeasureWithUnit;
     NbUncertainty (me) returns Integer;
 
 fields
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContext.cdl b/src/StepGeom/StepGeom_GeometricRepresentationContext.cdl
index d86e9607ac..62681b572d 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContext.cdl
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContext.cdl
@@ -24,17 +24,17 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable GeometricRepresentationContext;
+	Create returns GeometricRepresentationContext;
 	---Purpose: Returns a GeometricRepresentationContext
 
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection) is redefined;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection;
 	      aCoordinateSpaceDimension : Integer from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cdl b/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cdl
index 433223b09e..cb0a4fb845 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cdl
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContextAndGlobalUnitAssignedContext.cdl
@@ -31,32 +31,32 @@ uses
 	NamedUnit from StepBasic
 is
 
-	Create returns mutable GeometricRepresentationContextAndGlobalUnitAssignedContext;
+	Create returns GeometricRepresentationContextAndGlobalUnitAssignedContext;
 	---Purpose: Returns a GeometricRepresentationContextAndGlobalUnitAssignedContext
 
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection) is redefined;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection;
-	      aGeometricRepresentationContext : mutable GeometricRepresentationContext from StepGeom;
-	      aGlobalUnitAssignedContext : mutable GlobalUnitAssignedContext from StepRepr) is virtual;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection;
+	      aGeometricRepresentationContext : GeometricRepresentationContext from StepGeom;
+	      aGlobalUnitAssignedContext : GlobalUnitAssignedContext from StepRepr) is virtual;
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection;
 	      aCoordinateSpaceDimension : Integer from Standard;
-	      aUnits : mutable HArray1OfNamedUnit from StepBasic) is virtual;
+	      aUnits : HArray1OfNamedUnit from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetGeometricRepresentationContext(me : mutable; aGeometricRepresentationContext : mutable GeometricRepresentationContext);
-	GeometricRepresentationContext (me) returns mutable GeometricRepresentationContext;
-	SetGlobalUnitAssignedContext(me : mutable; aGlobalUnitAssignedContext : mutable GlobalUnitAssignedContext);
-	GlobalUnitAssignedContext (me) returns mutable GlobalUnitAssignedContext;
+	SetGeometricRepresentationContext(me : mutable; aGeometricRepresentationContext : GeometricRepresentationContext);
+	GeometricRepresentationContext (me) returns GeometricRepresentationContext;
+	SetGlobalUnitAssignedContext(me : mutable; aGlobalUnitAssignedContext : GlobalUnitAssignedContext);
+	GlobalUnitAssignedContext (me) returns GlobalUnitAssignedContext;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
@@ -65,9 +65,9 @@ is
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetUnits(me : mutable; aUnits : mutable HArray1OfNamedUnit);
-	Units (me) returns mutable HArray1OfNamedUnit;
-	UnitsValue (me; num : Integer) returns mutable NamedUnit;
+	SetUnits(me : mutable; aUnits : HArray1OfNamedUnit);
+	Units (me) returns HArray1OfNamedUnit;
+	UnitsValue (me; num : Integer) returns NamedUnit;
 	NbUnits (me) returns Integer;
 
 fields
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.cdl b/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.cdl
index a192da0edd..b549542c2f 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.cdl
+++ b/src/StepGeom/StepGeom_GeometricRepresentationContextAndParametricRepresentationContext.cdl
@@ -32,31 +32,31 @@ uses
 
 is
 
-	Create returns mutable GeometricRepresentationContextAndParametricRepresentationContext;
+	Create returns GeometricRepresentationContextAndParametricRepresentationContext;
 	---Purpose: empty constructor
 
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection) is redefined;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection;
-	      aGeometricRepresentationContext : mutable GeometricRepresentationContext from StepGeom;
-	      aParametricRepresentationContext : mutable ParametricRepresentationContext from StepRepr) is virtual;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection;
+	      aGeometricRepresentationContext : GeometricRepresentationContext from StepGeom;
+	      aParametricRepresentationContext : ParametricRepresentationContext from StepRepr) is virtual;
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection;
 	      aCoordinateSpaceDimension : Integer from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetGeometricRepresentationContext(me : mutable; aGeometricRepresentationContext : mutable GeometricRepresentationContext);
-	GeometricRepresentationContext (me) returns mutable GeometricRepresentationContext;
-	SetParametricRepresentationContext(me : mutable; aParametricRepresentationContext : mutable ParametricRepresentationContext);
-	ParametricRepresentationContext (me) returns mutable ParametricRepresentationContext;
+	SetGeometricRepresentationContext(me : mutable; aGeometricRepresentationContext : GeometricRepresentationContext);
+	GeometricRepresentationContext (me) returns GeometricRepresentationContext;
+	SetParametricRepresentationContext(me : mutable; aParametricRepresentationContext : ParametricRepresentationContext);
+	ParametricRepresentationContext (me) returns ParametricRepresentationContext;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
diff --git a/src/StepGeom/StepGeom_GeometricRepresentationItem.cdl b/src/StepGeom/StepGeom_GeometricRepresentationItem.cdl
index 21610c59dd..079885f871 100644
--- a/src/StepGeom/StepGeom_GeometricRepresentationItem.cdl
+++ b/src/StepGeom/StepGeom_GeometricRepresentationItem.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable GeometricRepresentationItem;
+	Create returns GeometricRepresentationItem;
 	---Purpose: Returns a GeometricRepresentationItem
 
 
diff --git a/src/StepGeom/StepGeom_Hyperbola.cdl b/src/StepGeom/StepGeom_Hyperbola.cdl
index 1c2c409eb1..17d177cd7c 100644
--- a/src/StepGeom/StepGeom_Hyperbola.cdl
+++ b/src/StepGeom/StepGeom_Hyperbola.cdl
@@ -25,16 +25,16 @@ uses
 	Axis2Placement from StepGeom
 is
 
-	Create returns mutable Hyperbola;
+	Create returns Hyperbola;
 	---Purpose: Returns a Hyperbola
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom;
 	      aSemiAxis : Real from Standard;
 	      aSemiImagAxis : Real from Standard) is virtual;
diff --git a/src/StepGeom/StepGeom_IntersectionCurve.cdl b/src/StepGeom/StepGeom_IntersectionCurve.cdl
index 72aeb313fd..abaeee00df 100644
--- a/src/StepGeom/StepGeom_IntersectionCurve.cdl
+++ b/src/StepGeom/StepGeom_IntersectionCurve.cdl
@@ -26,7 +26,7 @@ uses
 	PreferredSurfaceCurveRepresentation from StepGeom
 is
 
-	Create returns mutable IntersectionCurve;
+	Create returns IntersectionCurve;
 	---Purpose: Returns a IntersectionCurve
 
 
diff --git a/src/StepGeom/StepGeom_Line.cdl b/src/StepGeom/StepGeom_Line.cdl
index 4d29c7a6b1..9a286a8c07 100644
--- a/src/StepGeom/StepGeom_Line.cdl
+++ b/src/StepGeom/StepGeom_Line.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Line;
+	Create returns Line;
 	---Purpose: Returns a Line
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPnt : mutable CartesianPoint from StepGeom;
-	      aDir : mutable Vector from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aPnt : CartesianPoint from StepGeom;
+	      aDir : Vector from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPnt(me : mutable; aPnt : mutable CartesianPoint);
-	Pnt (me) returns mutable CartesianPoint;
-	SetDir(me : mutable; aDir : mutable Vector);
-	Dir (me) returns mutable Vector;
+	SetPnt(me : mutable; aPnt : CartesianPoint);
+	Pnt (me) returns CartesianPoint;
+	SetDir(me : mutable; aDir : Vector);
+	Dir (me) returns Vector;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_OffsetCurve3d.cdl b/src/StepGeom/StepGeom_OffsetCurve3d.cdl
index f05e96fbb5..147b859019 100644
--- a/src/StepGeom/StepGeom_OffsetCurve3d.cdl
+++ b/src/StepGeom/StepGeom_OffsetCurve3d.cdl
@@ -26,30 +26,30 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable OffsetCurve3d;
+	Create returns OffsetCurve3d;
 	---Purpose: Returns a OffsetCurve3d
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisCurve : mutable Curve from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBasisCurve : Curve from StepGeom;
 	      aDistance : Real from Standard;
 	      aSelfIntersect : Logical from StepData;
-	      aRefDirection : mutable Direction from StepGeom) is virtual;
+	      aRefDirection : Direction from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBasisCurve(me : mutable; aBasisCurve : mutable Curve);
-	BasisCurve (me) returns mutable Curve;
+	SetBasisCurve(me : mutable; aBasisCurve : Curve);
+	BasisCurve (me) returns Curve;
 	SetDistance(me : mutable; aDistance : Real);
 	Distance (me) returns Real;
 	SetSelfIntersect(me : mutable; aSelfIntersect : Logical);
 	SelfIntersect (me) returns Logical;
-	SetRefDirection(me : mutable; aRefDirection : mutable Direction);
-	RefDirection (me) returns mutable Direction;
+	SetRefDirection(me : mutable; aRefDirection : Direction);
+	RefDirection (me) returns Direction;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_OffsetSurface.cdl b/src/StepGeom/StepGeom_OffsetSurface.cdl
index 1da197fbcb..87caff02d6 100644
--- a/src/StepGeom/StepGeom_OffsetSurface.cdl
+++ b/src/StepGeom/StepGeom_OffsetSurface.cdl
@@ -25,23 +25,23 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable OffsetSurface;
+	Create returns OffsetSurface;
 	---Purpose: Returns a OffsetSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisSurface : mutable Surface from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBasisSurface : Surface from StepGeom;
 	      aDistance : Real from Standard;
 	      aSelfIntersect : Logical from StepData) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBasisSurface(me : mutable; aBasisSurface : mutable Surface);
-	BasisSurface (me) returns mutable Surface;
+	SetBasisSurface(me : mutable; aBasisSurface : Surface);
+	BasisSurface (me) returns Surface;
 	SetDistance(me : mutable; aDistance : Real);
 	Distance (me) returns Real;
 	SetSelfIntersect(me : mutable; aSelfIntersect : Logical);
diff --git a/src/StepGeom/StepGeom_OuterBoundaryCurve.cdl b/src/StepGeom/StepGeom_OuterBoundaryCurve.cdl
index a5af1627ef..2a24ba38af 100644
--- a/src/StepGeom/StepGeom_OuterBoundaryCurve.cdl
+++ b/src/StepGeom/StepGeom_OuterBoundaryCurve.cdl
@@ -25,7 +25,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable OuterBoundaryCurve;
+	Create returns OuterBoundaryCurve;
 	---Purpose: Returns a OuterBoundaryCurve
 
 
diff --git a/src/StepGeom/StepGeom_Parabola.cdl b/src/StepGeom/StepGeom_Parabola.cdl
index db0ba64d0a..0fb94fae9a 100644
--- a/src/StepGeom/StepGeom_Parabola.cdl
+++ b/src/StepGeom/StepGeom_Parabola.cdl
@@ -25,16 +25,16 @@ uses
 	Axis2Placement from StepGeom
 is
 
-	Create returns mutable Parabola;
+	Create returns Parabola;
 	---Purpose: Returns a Parabola
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aPosition : Axis2Placement from StepGeom;
 	      aFocalDist : Real from Standard) is virtual;
 
diff --git a/src/StepGeom/StepGeom_Pcurve.cdl b/src/StepGeom/StepGeom_Pcurve.cdl
index 46abe10090..49efd697d1 100644
--- a/src/StepGeom/StepGeom_Pcurve.cdl
+++ b/src/StepGeom/StepGeom_Pcurve.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Pcurve;
+	Create returns Pcurve;
 	---Purpose: Returns a Pcurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisSurface : mutable Surface from StepGeom;
-	      aReferenceToCurve : mutable DefinitionalRepresentation from StepRepr) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aBasisSurface : Surface from StepGeom;
+	      aReferenceToCurve : DefinitionalRepresentation from StepRepr) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBasisSurface(me : mutable; aBasisSurface : mutable Surface);
-	BasisSurface (me) returns mutable Surface;
-	SetReferenceToCurve(me : mutable; aReferenceToCurve : mutable DefinitionalRepresentation);
-	ReferenceToCurve (me) returns mutable DefinitionalRepresentation;
+	SetBasisSurface(me : mutable; aBasisSurface : Surface);
+	BasisSurface (me) returns Surface;
+	SetReferenceToCurve(me : mutable; aReferenceToCurve : DefinitionalRepresentation);
+	ReferenceToCurve (me) returns DefinitionalRepresentation;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_Placement.cdl b/src/StepGeom/StepGeom_Placement.cdl
index fe4f08c024..5e5dc1c3ff 100644
--- a/src/StepGeom/StepGeom_Placement.cdl
+++ b/src/StepGeom/StepGeom_Placement.cdl
@@ -24,21 +24,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Placement;
+	Create returns Placement;
 	---Purpose: Returns a Placement
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLocation : mutable CartesianPoint from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aLocation : CartesianPoint from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetLocation(me : mutable; aLocation : mutable CartesianPoint);
-	Location (me) returns mutable CartesianPoint;
+	SetLocation(me : mutable; aLocation : CartesianPoint);
+	Location (me) returns CartesianPoint;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_Plane.cdl b/src/StepGeom/StepGeom_Plane.cdl
index e0ee80c5ae..3dc542e895 100644
--- a/src/StepGeom/StepGeom_Plane.cdl
+++ b/src/StepGeom/StepGeom_Plane.cdl
@@ -24,7 +24,7 @@ uses
 	Axis2Placement3d from StepGeom
 is
 
-	Create returns mutable Plane;
+	Create returns Plane;
 	---Purpose: Returns a Plane
 
 
diff --git a/src/StepGeom/StepGeom_Point.cdl b/src/StepGeom/StepGeom_Point.cdl
index afd2a83018..e91e22cd9f 100644
--- a/src/StepGeom/StepGeom_Point.cdl
+++ b/src/StepGeom/StepGeom_Point.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Point;
+	Create returns Point;
 	---Purpose: Returns a Point
 
 
diff --git a/src/StepGeom/StepGeom_PointOnCurve.cdl b/src/StepGeom/StepGeom_PointOnCurve.cdl
index c025b38584..57cdd3c4ee 100644
--- a/src/StepGeom/StepGeom_PointOnCurve.cdl
+++ b/src/StepGeom/StepGeom_PointOnCurve.cdl
@@ -25,22 +25,22 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PointOnCurve;
+	Create returns PointOnCurve;
 	---Purpose: Returns a PointOnCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisCurve : mutable Curve from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBasisCurve : Curve from StepGeom;
 	      aPointParameter : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBasisCurve(me : mutable; aBasisCurve : mutable Curve);
-	BasisCurve (me) returns mutable Curve;
+	SetBasisCurve(me : mutable; aBasisCurve : Curve);
+	BasisCurve (me) returns Curve;
 	SetPointParameter(me : mutable; aPointParameter : Real);
 	PointParameter (me) returns Real;
 
diff --git a/src/StepGeom/StepGeom_PointOnSurface.cdl b/src/StepGeom/StepGeom_PointOnSurface.cdl
index 6b4aaaa3af..cb2d7d01a7 100644
--- a/src/StepGeom/StepGeom_PointOnSurface.cdl
+++ b/src/StepGeom/StepGeom_PointOnSurface.cdl
@@ -25,23 +25,23 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PointOnSurface;
+	Create returns PointOnSurface;
 	---Purpose: Returns a PointOnSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisSurface : mutable Surface from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBasisSurface : Surface from StepGeom;
 	      aPointParameterU : Real from Standard;
 	      aPointParameterV : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBasisSurface(me : mutable; aBasisSurface : mutable Surface);
-	BasisSurface (me) returns mutable Surface;
+	SetBasisSurface(me : mutable; aBasisSurface : Surface);
+	BasisSurface (me) returns Surface;
 	SetPointParameterU(me : mutable; aPointParameterU : Real);
 	PointParameterU (me) returns Real;
 	SetPointParameterV(me : mutable; aPointParameterV : Real);
diff --git a/src/StepGeom/StepGeom_PointReplica.cdl b/src/StepGeom/StepGeom_PointReplica.cdl
index 35d288ddda..b7f04b4893 100644
--- a/src/StepGeom/StepGeom_PointReplica.cdl
+++ b/src/StepGeom/StepGeom_PointReplica.cdl
@@ -24,24 +24,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PointReplica;
+	Create returns PointReplica;
 	---Purpose: Returns a PointReplica
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aParentPt : mutable Point from StepGeom;
-	      aTransformation : mutable CartesianTransformationOperator from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aParentPt : Point from StepGeom;
+	      aTransformation : CartesianTransformationOperator from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetParentPt(me : mutable; aParentPt : mutable Point);
-	ParentPt (me) returns mutable Point;
-	SetTransformation(me : mutable; aTransformation : mutable CartesianTransformationOperator);
-	Transformation (me) returns mutable CartesianTransformationOperator;
+	SetParentPt(me : mutable; aParentPt : Point);
+	ParentPt (me) returns Point;
+	SetTransformation(me : mutable; aTransformation : CartesianTransformationOperator);
+	Transformation (me) returns CartesianTransformationOperator;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_Polyline.cdl b/src/StepGeom/StepGeom_Polyline.cdl
index dd217b8b1e..47bf656fd7 100644
--- a/src/StepGeom/StepGeom_Polyline.cdl
+++ b/src/StepGeom/StepGeom_Polyline.cdl
@@ -25,22 +25,22 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Polyline;
+	Create returns Polyline;
 	---Purpose: Returns a Polyline
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPoints : mutable HArray1OfCartesianPoint from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aPoints : HArray1OfCartesianPoint from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPoints(me : mutable; aPoints : mutable HArray1OfCartesianPoint);
-	Points (me) returns mutable HArray1OfCartesianPoint;
-	PointsValue (me; num : Integer) returns mutable CartesianPoint;
+	SetPoints(me : mutable; aPoints : HArray1OfCartesianPoint);
+	Points (me) returns HArray1OfCartesianPoint;
+	PointsValue (me; num : Integer) returns CartesianPoint;
 	NbPoints (me) returns Integer;
 
 fields
diff --git a/src/StepGeom/StepGeom_QuasiUniformCurve.cdl b/src/StepGeom/StepGeom_QuasiUniformCurve.cdl
index 879cb21118..137fa3953c 100644
--- a/src/StepGeom/StepGeom_QuasiUniformCurve.cdl
+++ b/src/StepGeom/StepGeom_QuasiUniformCurve.cdl
@@ -27,7 +27,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable QuasiUniformCurve;
+	Create returns QuasiUniformCurve;
 	---Purpose: Returns a QuasiUniformCurve
 
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.cdl b/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.cdl
index 9f95d7ca52..d495a48e23 100644
--- a/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.cdl
+++ b/src/StepGeom/StepGeom_QuasiUniformCurveAndRationalBSplineCurve.cdl
@@ -34,51 +34,51 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable QuasiUniformCurveAndRationalBSplineCurve;
+	Create returns QuasiUniformCurveAndRationalBSplineCurve;
 	---Purpose: Returns a QuasiUniformCurveAndRationalBSplineCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aQuasiUniformCurve : mutable QuasiUniformCurve from StepGeom;
-	      aRationalBSplineCurve : mutable RationalBSplineCurve from StepGeom) is virtual;
+	      aQuasiUniformCurve : QuasiUniformCurve from StepGeom;
+	      aRationalBSplineCurve : RationalBSplineCurve from StepGeom) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aWeightsData : mutable HArray1OfReal from TColStd) is virtual;
+	      aWeightsData : HArray1OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetQuasiUniformCurve(me : mutable; aQuasiUniformCurve : mutable QuasiUniformCurve);
-	QuasiUniformCurve (me) returns mutable QuasiUniformCurve;
-	SetRationalBSplineCurve(me : mutable; aRationalBSplineCurve : mutable RationalBSplineCurve);
-	RationalBSplineCurve (me) returns mutable RationalBSplineCurve;
+	SetQuasiUniformCurve(me : mutable; aQuasiUniformCurve : QuasiUniformCurve);
+	QuasiUniformCurve (me) returns QuasiUniformCurve;
+	SetRationalBSplineCurve(me : mutable; aRationalBSplineCurve : RationalBSplineCurve);
+	RationalBSplineCurve (me) returns RationalBSplineCurve;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray1OfReal);
-	WeightsData (me) returns mutable HArray1OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray1OfReal);
+	WeightsData (me) returns HArray1OfReal;
 	WeightsDataValue (me; num : Integer) returns Real;
 	NbWeightsData (me) returns Integer;
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformSurface.cdl b/src/StepGeom/StepGeom_QuasiUniformSurface.cdl
index 1f19068b13..712537ce95 100644
--- a/src/StepGeom/StepGeom_QuasiUniformSurface.cdl
+++ b/src/StepGeom/StepGeom_QuasiUniformSurface.cdl
@@ -27,7 +27,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable QuasiUniformSurface;
+	Create returns QuasiUniformSurface;
 	---Purpose: Returns a QuasiUniformSurface
 
 
diff --git a/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.cdl b/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.cdl
index 0e0109ca67..de6a9d1389 100644
--- a/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.cdl
+++ b/src/StepGeom/StepGeom_QuasiUniformSurfaceAndRationalBSplineSurface.cdl
@@ -34,57 +34,57 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable QuasiUniformSurfaceAndRationalBSplineSurface;
+	Create returns QuasiUniformSurfaceAndRationalBSplineSurface;
 	---Purpose: Returns a QuasiUniformSurfaceAndRationalBSplineSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aQuasiUniformSurface : mutable QuasiUniformSurface from StepGeom;
-	      aRationalBSplineSurface : mutable RationalBSplineSurface from StepGeom) is virtual;
+	      aQuasiUniformSurface : QuasiUniformSurface from StepGeom;
+	      aRationalBSplineSurface : RationalBSplineSurface from StepGeom) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aWeightsData : mutable HArray2OfReal from TColStd) is virtual;
+	      aWeightsData : HArray2OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetQuasiUniformSurface(me : mutable; aQuasiUniformSurface : mutable QuasiUniformSurface);
-	QuasiUniformSurface (me) returns mutable QuasiUniformSurface;
-	SetRationalBSplineSurface(me : mutable; aRationalBSplineSurface : mutable RationalBSplineSurface);
-	RationalBSplineSurface (me) returns mutable RationalBSplineSurface;
+	SetQuasiUniformSurface(me : mutable; aQuasiUniformSurface : QuasiUniformSurface);
+	QuasiUniformSurface (me) returns QuasiUniformSurface;
+	SetRationalBSplineSurface(me : mutable; aRationalBSplineSurface : RationalBSplineSurface);
+	RationalBSplineSurface (me) returns RationalBSplineSurface;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray2OfReal);
-	WeightsData (me) returns mutable HArray2OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray2OfReal);
+	WeightsData (me) returns HArray2OfReal;
 	WeightsDataValue (me; num1 : Integer;  num2 : Integer) returns Real;
 	NbWeightsDataI (me) returns Integer;
 	NbWeightsDataJ (me) returns Integer;
diff --git a/src/StepGeom/StepGeom_RationalBSplineCurve.cdl b/src/StepGeom/StepGeom_RationalBSplineCurve.cdl
index 709fc0a9a0..626217dd70 100644
--- a/src/StepGeom/StepGeom_RationalBSplineCurve.cdl
+++ b/src/StepGeom/StepGeom_RationalBSplineCurve.cdl
@@ -29,31 +29,31 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable RationalBSplineCurve;
+	Create returns RationalBSplineCurve;
 	---Purpose: Returns a RationalBSplineCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aWeightsData : mutable HArray1OfReal from TColStd) is virtual;
+	      aWeightsData : HArray1OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray1OfReal);
-	WeightsData (me) returns mutable HArray1OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray1OfReal);
+	WeightsData (me) returns HArray1OfReal;
 	WeightsDataValue (me; num : Integer) returns Real;
 	NbWeightsData (me) returns Integer;
 
diff --git a/src/StepGeom/StepGeom_RationalBSplineSurface.cdl b/src/StepGeom/StepGeom_RationalBSplineSurface.cdl
index 0523425b16..4c684f9044 100644
--- a/src/StepGeom/StepGeom_RationalBSplineSurface.cdl
+++ b/src/StepGeom/StepGeom_RationalBSplineSurface.cdl
@@ -29,35 +29,35 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable RationalBSplineSurface;
+	Create returns RationalBSplineSurface;
 	---Purpose: Returns a RationalBSplineSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aWeightsData : mutable HArray2OfReal from TColStd) is virtual;
+	      aWeightsData : HArray2OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray2OfReal);
-	WeightsData (me) returns mutable HArray2OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray2OfReal);
+	WeightsData (me) returns HArray2OfReal;
 	WeightsDataValue (me; num1 : Integer;  num2 : Integer) returns Real;
 	NbWeightsDataI (me) returns Integer;
 	NbWeightsDataJ (me) returns Integer;
diff --git a/src/StepGeom/StepGeom_RectangularCompositeSurface.cdl b/src/StepGeom/StepGeom_RectangularCompositeSurface.cdl
index e77a8b31cc..14091393a7 100644
--- a/src/StepGeom/StepGeom_RectangularCompositeSurface.cdl
+++ b/src/StepGeom/StepGeom_RectangularCompositeSurface.cdl
@@ -25,22 +25,22 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable RectangularCompositeSurface;
+	Create returns RectangularCompositeSurface;
 	---Purpose: Returns a RectangularCompositeSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSegments : mutable HArray2OfSurfacePatch from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aSegments : HArray2OfSurfacePatch from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetSegments(me : mutable; aSegments : mutable HArray2OfSurfacePatch);
-	Segments (me) returns mutable HArray2OfSurfacePatch;
-	SegmentsValue (me; num1 : Integer;  num2 : Integer) returns mutable SurfacePatch;
+	SetSegments(me : mutable; aSegments : HArray2OfSurfacePatch);
+	Segments (me) returns HArray2OfSurfacePatch;
+	SegmentsValue (me; num1 : Integer;  num2 : Integer) returns SurfacePatch;
 	NbSegmentsI (me) returns Integer;
 	NbSegmentsJ (me) returns Integer;
 
diff --git a/src/StepGeom/StepGeom_RectangularTrimmedSurface.cdl b/src/StepGeom/StepGeom_RectangularTrimmedSurface.cdl
index d3c96a134c..a3fc0a388e 100644
--- a/src/StepGeom/StepGeom_RectangularTrimmedSurface.cdl
+++ b/src/StepGeom/StepGeom_RectangularTrimmedSurface.cdl
@@ -26,16 +26,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable RectangularTrimmedSurface;
+	Create returns RectangularTrimmedSurface;
 	---Purpose: Returns a RectangularTrimmedSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisSurface : mutable Surface from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBasisSurface : Surface from StepGeom;
 	      aU1 : Real from Standard;
 	      aU2 : Real from Standard;
 	      aV1 : Real from Standard;
@@ -45,8 +45,8 @@ is
 
 	-- Specific Methods for Field Data Access --
 
-	SetBasisSurface(me : mutable; aBasisSurface : mutable Surface);
-	BasisSurface (me) returns mutable Surface;
+	SetBasisSurface(me : mutable; aBasisSurface : Surface);
+	BasisSurface (me) returns Surface;
 	SetU1(me : mutable; aU1 : Real);
 	U1 (me) returns Real;
 	SetU2(me : mutable; aU2 : Real);
diff --git a/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.cdl b/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.cdl
index 4bb680986f..4fa792f491 100644
--- a/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.cdl
+++ b/src/StepGeom/StepGeom_ReparametrisedCompositeCurveSegment.cdl
@@ -26,19 +26,19 @@ uses
 	Curve from StepGeom
 is
 
-	Create returns mutable ReparametrisedCompositeCurveSegment;
+	Create returns ReparametrisedCompositeCurveSegment;
 	---Purpose: Returns a ReparametrisedCompositeCurveSegment
 
 
 	Init (me : mutable;
 	      aTransition : TransitionCode from StepGeom;
 	      aSameSense : Boolean from Standard;
-	      aParentCurve : mutable Curve from StepGeom) is redefined;
+	      aParentCurve : Curve from StepGeom) is redefined;
 
 	Init (me : mutable;
 	      aTransition : TransitionCode from StepGeom;
 	      aSameSense : Boolean from Standard;
-	      aParentCurve : mutable Curve from StepGeom;
+	      aParentCurve : Curve from StepGeom;
 	      aParamLength : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepGeom/StepGeom_SeamCurve.cdl b/src/StepGeom/StepGeom_SeamCurve.cdl
index df3b66f4b5..51c4bf0f4e 100644
--- a/src/StepGeom/StepGeom_SeamCurve.cdl
+++ b/src/StepGeom/StepGeom_SeamCurve.cdl
@@ -26,7 +26,7 @@ uses
 	PreferredSurfaceCurveRepresentation from StepGeom
 is
 
-	Create returns mutable SeamCurve;
+	Create returns SeamCurve;
 	---Purpose: Returns a SeamCurve
 
 
diff --git a/src/StepGeom/StepGeom_SphericalSurface.cdl b/src/StepGeom/StepGeom_SphericalSurface.cdl
index f27174000f..6d259f583c 100644
--- a/src/StepGeom/StepGeom_SphericalSurface.cdl
+++ b/src/StepGeom/StepGeom_SphericalSurface.cdl
@@ -25,17 +25,17 @@ uses
 	Axis2Placement3d from StepGeom
 is
 
-	Create returns mutable SphericalSurface;
+	Create returns SphericalSurface;
 	---Purpose: Returns a SphericalSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom;
 	      aRadius : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepGeom/StepGeom_Surface.cdl b/src/StepGeom/StepGeom_Surface.cdl
index 72c1809d0c..c5d69c7c52 100644
--- a/src/StepGeom/StepGeom_Surface.cdl
+++ b/src/StepGeom/StepGeom_Surface.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Surface;
+	Create returns Surface;
 	---Purpose: Returns a Surface
 
 
diff --git a/src/StepGeom/StepGeom_SurfaceCurve.cdl b/src/StepGeom/StepGeom_SurfaceCurve.cdl
index 3100e93c63..07f8496325 100644
--- a/src/StepGeom/StepGeom_SurfaceCurve.cdl
+++ b/src/StepGeom/StepGeom_SurfaceCurve.cdl
@@ -26,25 +26,25 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable SurfaceCurve;
+	Create returns SurfaceCurve;
 	---Purpose: Returns a SurfaceCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCurve3d : mutable Curve from StepGeom;
-	      aAssociatedGeometry : mutable HArray1OfPcurveOrSurface from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aCurve3d : Curve from StepGeom;
+	      aAssociatedGeometry : HArray1OfPcurveOrSurface from StepGeom;
 	      aMasterRepresentation : PreferredSurfaceCurveRepresentation from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetCurve3d(me : mutable; aCurve3d : mutable Curve);
-	Curve3d (me) returns mutable Curve;
-	SetAssociatedGeometry(me : mutable; aAssociatedGeometry : mutable HArray1OfPcurveOrSurface);
-	AssociatedGeometry (me) returns mutable HArray1OfPcurveOrSurface;
+	SetCurve3d(me : mutable; aCurve3d : Curve);
+	Curve3d (me) returns Curve;
+	SetAssociatedGeometry(me : mutable; aAssociatedGeometry : HArray1OfPcurveOrSurface);
+	AssociatedGeometry (me) returns HArray1OfPcurveOrSurface;
 	AssociatedGeometryValue (me; num : Integer) returns PcurveOrSurface;
 	NbAssociatedGeometry (me) returns Integer;
 	SetMasterRepresentation(me : mutable; aMasterRepresentation : PreferredSurfaceCurveRepresentation);
diff --git a/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cdl b/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cdl
index 6782171cf3..78eff0df56 100644
--- a/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cdl
+++ b/src/StepGeom/StepGeom_SurfaceCurveAndBoundedCurve.cdl
@@ -26,10 +26,10 @@ uses
 
 is
 
-    Create returns mutable SurfaceCurveAndBoundedCurve;
+    Create returns SurfaceCurveAndBoundedCurve;
 	---Purpose: creates empty object
 
-    BoundedCurve (me: mutable) returns mutable BoundedCurve from StepGeom;
+    BoundedCurve (me: mutable) returns BoundedCurve from StepGeom;
         ---Purpose: returns field BoundedCurve
 	---C++: return &
 
diff --git a/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cdl b/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cdl
index e93b9c6ade..31b5d2e653 100644
--- a/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cdl
+++ b/src/StepGeom/StepGeom_SurfaceOfLinearExtrusion.cdl
@@ -25,23 +25,23 @@ uses
 	Curve from StepGeom
 is
 
-	Create returns mutable SurfaceOfLinearExtrusion;
+	Create returns SurfaceOfLinearExtrusion;
 	---Purpose: Returns a SurfaceOfLinearExtrusion
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptCurve : mutable Curve from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aSweptCurve : Curve from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptCurve : mutable Curve from StepGeom;
-	      aExtrusionAxis : mutable Vector from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aSweptCurve : Curve from StepGeom;
+	      aExtrusionAxis : Vector from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetExtrusionAxis(me : mutable; aExtrusionAxis : mutable Vector);
-	ExtrusionAxis (me) returns mutable Vector;
+	SetExtrusionAxis(me : mutable; aExtrusionAxis : Vector);
+	ExtrusionAxis (me) returns Vector;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_SurfaceOfRevolution.cdl b/src/StepGeom/StepGeom_SurfaceOfRevolution.cdl
index 19e47fe10d..e659e96eda 100644
--- a/src/StepGeom/StepGeom_SurfaceOfRevolution.cdl
+++ b/src/StepGeom/StepGeom_SurfaceOfRevolution.cdl
@@ -25,23 +25,23 @@ uses
 	Curve from StepGeom
 is
 
-	Create returns mutable SurfaceOfRevolution;
+	Create returns SurfaceOfRevolution;
 	---Purpose: Returns a SurfaceOfRevolution
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptCurve : mutable Curve from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aSweptCurve : Curve from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptCurve : mutable Curve from StepGeom;
-	      aAxisPosition : mutable Axis1Placement from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aSweptCurve : Curve from StepGeom;
+	      aAxisPosition : Axis1Placement from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAxisPosition(me : mutable; aAxisPosition : mutable Axis1Placement);
-	AxisPosition (me) returns mutable Axis1Placement;
+	SetAxisPosition(me : mutable; aAxisPosition : Axis1Placement);
+	AxisPosition (me) returns Axis1Placement;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_SurfacePatch.cdl b/src/StepGeom/StepGeom_SurfacePatch.cdl
index 74a6234234..28aed35966 100644
--- a/src/StepGeom/StepGeom_SurfacePatch.cdl
+++ b/src/StepGeom/StepGeom_SurfacePatch.cdl
@@ -25,11 +25,11 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable SurfacePatch;
+	Create returns SurfacePatch;
 	---Purpose: Returns a SurfacePatch
 
 	Init (me : mutable;
-	      aParentSurface : mutable BoundedSurface from StepGeom;
+	      aParentSurface : BoundedSurface from StepGeom;
 	      aUTransition : TransitionCode from StepGeom;
 	      aVTransition : TransitionCode from StepGeom;
 	      aUSense : Boolean from Standard;
@@ -37,8 +37,8 @@ is
 
 	-- Specific Methods for Field Data Access --
 
-	SetParentSurface(me : mutable; aParentSurface : mutable BoundedSurface);
-	ParentSurface (me) returns mutable BoundedSurface;
+	SetParentSurface(me : mutable; aParentSurface : BoundedSurface);
+	ParentSurface (me) returns BoundedSurface;
 	SetUTransition(me : mutable; aUTransition : TransitionCode);
 	UTransition (me) returns TransitionCode;
 	SetVTransition(me : mutable; aVTransition : TransitionCode);
diff --git a/src/StepGeom/StepGeom_SurfaceReplica.cdl b/src/StepGeom/StepGeom_SurfaceReplica.cdl
index 0adad2e82f..e6fc5cfb37 100644
--- a/src/StepGeom/StepGeom_SurfaceReplica.cdl
+++ b/src/StepGeom/StepGeom_SurfaceReplica.cdl
@@ -24,24 +24,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable SurfaceReplica;
+	Create returns SurfaceReplica;
 	---Purpose: Returns a SurfaceReplica
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aParentSurface : mutable Surface from StepGeom;
-	      aTransformation : mutable CartesianTransformationOperator3d from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aParentSurface : Surface from StepGeom;
+	      aTransformation : CartesianTransformationOperator3d from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetParentSurface(me : mutable; aParentSurface : mutable Surface);
-	ParentSurface (me) returns mutable Surface;
-	SetTransformation(me : mutable; aTransformation : mutable CartesianTransformationOperator3d);
-	Transformation (me) returns mutable CartesianTransformationOperator3d;
+	SetParentSurface(me : mutable; aParentSurface : Surface);
+	ParentSurface (me) returns Surface;
+	SetTransformation(me : mutable; aTransformation : CartesianTransformationOperator3d);
+	Transformation (me) returns CartesianTransformationOperator3d;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_SweptSurface.cdl b/src/StepGeom/StepGeom_SweptSurface.cdl
index 443e7fe3d8..176d5ab0f5 100644
--- a/src/StepGeom/StepGeom_SweptSurface.cdl
+++ b/src/StepGeom/StepGeom_SweptSurface.cdl
@@ -24,21 +24,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable SweptSurface;
+	Create returns SweptSurface;
 	---Purpose: Returns a SweptSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptCurve : mutable Curve from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aSweptCurve : Curve from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetSweptCurve(me : mutable; aSweptCurve : mutable Curve);
-	SweptCurve (me) returns mutable Curve;
+	SetSweptCurve(me : mutable; aSweptCurve : Curve);
+	SweptCurve (me) returns Curve;
 
 fields
 
diff --git a/src/StepGeom/StepGeom_ToroidalSurface.cdl b/src/StepGeom/StepGeom_ToroidalSurface.cdl
index 8bbcd8bb47..27bb72ebf6 100644
--- a/src/StepGeom/StepGeom_ToroidalSurface.cdl
+++ b/src/StepGeom/StepGeom_ToroidalSurface.cdl
@@ -25,17 +25,17 @@ uses
 	Axis2Placement3d from StepGeom
 is
 
-	Create returns mutable ToroidalSurface;
+	Create returns ToroidalSurface;
 	---Purpose: Returns a ToroidalSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom;
 	      aMajorRadius : Real from Standard;
 	      aMinorRadius : Real from Standard) is virtual;
 
diff --git a/src/StepGeom/StepGeom_TrimmedCurve.cdl b/src/StepGeom/StepGeom_TrimmedCurve.cdl
index c4f8739025..2dd89b6f5f 100644
--- a/src/StepGeom/StepGeom_TrimmedCurve.cdl
+++ b/src/StepGeom/StepGeom_TrimmedCurve.cdl
@@ -28,31 +28,31 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable TrimmedCurve;
+	Create returns TrimmedCurve;
 	---Purpose: Returns a TrimmedCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBasisCurve : mutable Curve from StepGeom;
-	      aTrim1 : mutable HArray1OfTrimmingSelect from StepGeom;
-	      aTrim2 : mutable HArray1OfTrimmingSelect from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBasisCurve : Curve from StepGeom;
+	      aTrim1 : HArray1OfTrimmingSelect from StepGeom;
+	      aTrim2 : HArray1OfTrimmingSelect from StepGeom;
 	      aSenseAgreement : Boolean from Standard;
 	      aMasterRepresentation : TrimmingPreference from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBasisCurve(me : mutable; aBasisCurve : mutable Curve);
-	BasisCurve (me) returns mutable Curve;
-	SetTrim1(me : mutable; aTrim1 : mutable HArray1OfTrimmingSelect);
-	Trim1 (me) returns mutable HArray1OfTrimmingSelect;
+	SetBasisCurve(me : mutable; aBasisCurve : Curve);
+	BasisCurve (me) returns Curve;
+	SetTrim1(me : mutable; aTrim1 : HArray1OfTrimmingSelect);
+	Trim1 (me) returns HArray1OfTrimmingSelect;
 	Trim1Value (me; num : Integer) returns TrimmingSelect;
 	NbTrim1 (me) returns Integer;
-	SetTrim2(me : mutable; aTrim2 : mutable HArray1OfTrimmingSelect);
-	Trim2 (me) returns mutable HArray1OfTrimmingSelect;
+	SetTrim2(me : mutable; aTrim2 : HArray1OfTrimmingSelect);
+	Trim2 (me) returns HArray1OfTrimmingSelect;
 	Trim2Value (me; num : Integer) returns TrimmingSelect;
 	NbTrim2 (me) returns Integer;
 	SetSenseAgreement(me : mutable; aSenseAgreement : Boolean);
diff --git a/src/StepGeom/StepGeom_TrimmingMember.cdl b/src/StepGeom/StepGeom_TrimmingMember.cdl
index c3d3f38e3f..37163bc3f9 100644
--- a/src/StepGeom/StepGeom_TrimmingMember.cdl
+++ b/src/StepGeom/StepGeom_TrimmingMember.cdl
@@ -23,7 +23,7 @@ uses CString
 
 is
 
-    Create returns mutable TrimmingMember;
+    Create returns TrimmingMember;
 
     HasName (me) returns Boolean  is redefined;
     -- returns True
diff --git a/src/StepGeom/StepGeom_UniformCurve.cdl b/src/StepGeom/StepGeom_UniformCurve.cdl
index 0f65ad5978..24995b1e55 100644
--- a/src/StepGeom/StepGeom_UniformCurve.cdl
+++ b/src/StepGeom/StepGeom_UniformCurve.cdl
@@ -27,7 +27,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable UniformCurve;
+	Create returns UniformCurve;
 	---Purpose: Returns a UniformCurve
 
 
diff --git a/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.cdl b/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.cdl
index d5610706e2..a8946f95fd 100644
--- a/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.cdl
+++ b/src/StepGeom/StepGeom_UniformCurveAndRationalBSplineCurve.cdl
@@ -34,48 +34,48 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable UniformCurveAndRationalBSplineCurve;
+	Create returns UniformCurveAndRationalBSplineCurve;
 	---Purpose: Returns a UniformCurveAndRationalBSplineCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aUniformCurve : mutable UniformCurve from StepGeom;
-	      aRationalBSplineCurve : mutable RationalBSplineCurve from StepGeom) is virtual;
+	      aUniformCurve : UniformCurve from StepGeom;
+	      aRationalBSplineCurve : RationalBSplineCurve from StepGeom) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray1OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray1OfCartesianPoint from StepGeom;
 	      aCurveForm : BSplineCurveForm from StepGeom;
 	      aClosedCurve : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aWeightsData : mutable HArray1OfReal from TColStd) is virtual;
+	      aWeightsData : HArray1OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetUniformCurve(me : mutable; aUniformCurve : mutable UniformCurve);
-	UniformCurve (me) returns mutable UniformCurve;
-	SetRationalBSplineCurve(me : mutable; aRationalBSplineCurve : mutable RationalBSplineCurve);
-	RationalBSplineCurve (me) returns mutable RationalBSplineCurve;
+	SetUniformCurve(me : mutable; aUniformCurve : UniformCurve);
+	UniformCurve (me) returns UniformCurve;
+	SetRationalBSplineCurve(me : mutable; aRationalBSplineCurve : RationalBSplineCurve);
+	RationalBSplineCurve (me) returns RationalBSplineCurve;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray1OfReal);
-	WeightsData (me) returns mutable HArray1OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray1OfReal);
+	WeightsData (me) returns HArray1OfReal;
 	WeightsDataValue (me; num : Integer) returns Real;
 	NbWeightsData (me) returns Integer;
 
diff --git a/src/StepGeom/StepGeom_UniformSurface.cdl b/src/StepGeom/StepGeom_UniformSurface.cdl
index 7abe390833..2451913492 100644
--- a/src/StepGeom/StepGeom_UniformSurface.cdl
+++ b/src/StepGeom/StepGeom_UniformSurface.cdl
@@ -27,7 +27,7 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable UniformSurface;
+	Create returns UniformSurface;
 	---Purpose: Returns a UniformSurface
 
 
diff --git a/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.cdl b/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.cdl
index 3c0ab8ab44..5f9cabec30 100644
--- a/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.cdl
+++ b/src/StepGeom/StepGeom_UniformSurfaceAndRationalBSplineSurface.cdl
@@ -34,54 +34,54 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable UniformSurfaceAndRationalBSplineSurface;
+	Create returns UniformSurfaceAndRationalBSplineSurface;
 	---Purpose: Returns a UniformSurfaceAndRationalBSplineSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aUniformSurface : mutable UniformSurface from StepGeom;
-	      aRationalBSplineSurface : mutable RationalBSplineSurface from StepGeom) is virtual;
+	      aUniformSurface : UniformSurface from StepGeom;
+	      aRationalBSplineSurface : RationalBSplineSurface from StepGeom) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aUDegree : Integer from Standard;
 	      aVDegree : Integer from Standard;
-	      aControlPointsList : mutable HArray2OfCartesianPoint from StepGeom;
+	      aControlPointsList : HArray2OfCartesianPoint from StepGeom;
 	      aSurfaceForm : BSplineSurfaceForm from StepGeom;
 	      aUClosed : Logical from StepData;
 	      aVClosed : Logical from StepData;
 	      aSelfIntersect : Logical from StepData;
-	      aWeightsData : mutable HArray2OfReal from TColStd) is virtual;
+	      aWeightsData : HArray2OfReal from TColStd) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetUniformSurface(me : mutable; aUniformSurface : mutable UniformSurface);
-	UniformSurface (me) returns mutable UniformSurface;
-	SetRationalBSplineSurface(me : mutable; aRationalBSplineSurface : mutable RationalBSplineSurface);
-	RationalBSplineSurface (me) returns mutable RationalBSplineSurface;
+	SetUniformSurface(me : mutable; aUniformSurface : UniformSurface);
+	UniformSurface (me) returns UniformSurface;
+	SetRationalBSplineSurface(me : mutable; aRationalBSplineSurface : RationalBSplineSurface);
+	RationalBSplineSurface (me) returns RationalBSplineSurface;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetWeightsData(me : mutable; aWeightsData : mutable HArray2OfReal);
-	WeightsData (me) returns mutable HArray2OfReal;
+	SetWeightsData(me : mutable; aWeightsData : HArray2OfReal);
+	WeightsData (me) returns HArray2OfReal;
 	WeightsDataValue (me; num1 : Integer;  num2 : Integer) returns Real;
 	NbWeightsDataI (me) returns Integer;
 	NbWeightsDataJ (me) returns Integer;
diff --git a/src/StepGeom/StepGeom_Vector.cdl b/src/StepGeom/StepGeom_Vector.cdl
index 844acda6bf..f6ab7b3e2d 100644
--- a/src/StepGeom/StepGeom_Vector.cdl
+++ b/src/StepGeom/StepGeom_Vector.cdl
@@ -25,22 +25,22 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Vector;
+	Create returns Vector;
 	---Purpose: Returns a Vector
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aOrientation : mutable Direction from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aOrientation : Direction from StepGeom;
 	      aMagnitude : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetOrientation(me : mutable; aOrientation : mutable Direction);
-	Orientation (me) returns mutable Direction;
+	SetOrientation(me : mutable; aOrientation : Direction);
+	Orientation (me) returns Direction;
 	SetMagnitude(me : mutable; aMagnitude : Real);
 	Magnitude (me) returns Real;
 
diff --git a/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cdl b/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cdl
index cec6a70e3c..8db462a45e 100644
--- a/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cdl
+++ b/src/StepRepr/StepRepr_AssemblyComponentUsageSubstitute.cdl
@@ -22,7 +22,7 @@ uses
 
 is
 
-    Create returns mutable AssemblyComponentUsageSubstitute;
+    Create returns AssemblyComponentUsageSubstitute;
 
     Init (me : mutable;
     	  aName : HAsciiString;
diff --git a/src/StepRepr/StepRepr_CompositeShapeAspect.cdl b/src/StepRepr/StepRepr_CompositeShapeAspect.cdl
index 9ca8268343..da670ef18b 100644
--- a/src/StepRepr/StepRepr_CompositeShapeAspect.cdl
+++ b/src/StepRepr/StepRepr_CompositeShapeAspect.cdl
@@ -22,6 +22,6 @@ uses
 
 is
 
-    Create returns mutable CompositeShapeAspect;
+    Create returns CompositeShapeAspect;
 
 end CompositeShapeAspect;
diff --git a/src/StepRepr/StepRepr_CompoundRepresentationItem.cdl b/src/StepRepr/StepRepr_CompoundRepresentationItem.cdl
index f515d38b34..002272f4fe 100644
--- a/src/StepRepr/StepRepr_CompoundRepresentationItem.cdl
+++ b/src/StepRepr/StepRepr_CompoundRepresentationItem.cdl
@@ -27,7 +27,7 @@ is
     Create returns CompoundRepresentationItem;
 
     Init (me : mutable;
-             aName : mutable HAsciiString from TCollection;
+             aName : HAsciiString from TCollection;
 	     item_element : HArray1OfRepresentationItem from StepRepr);
 
     ItemElement (me) returns HArray1OfRepresentationItem from StepRepr;
diff --git a/src/StepRepr/StepRepr_DefinitionalRepresentation.cdl b/src/StepRepr/StepRepr_DefinitionalRepresentation.cdl
index eb77eb8bee..a8d0dfd37a 100644
--- a/src/StepRepr/StepRepr_DefinitionalRepresentation.cdl
+++ b/src/StepRepr/StepRepr_DefinitionalRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable DefinitionalRepresentation;
+	Create returns DefinitionalRepresentation;
 	---Purpose: Returns a DefinitionalRepresentation
 
 
diff --git a/src/StepRepr/StepRepr_DerivedShapeAspect.cdl b/src/StepRepr/StepRepr_DerivedShapeAspect.cdl
index b36e679c58..72ec0f570d 100644
--- a/src/StepRepr/StepRepr_DerivedShapeAspect.cdl
+++ b/src/StepRepr/StepRepr_DerivedShapeAspect.cdl
@@ -22,6 +22,6 @@ uses
 
 is
 
-    Create returns mutable DerivedShapeAspect;
+    Create returns DerivedShapeAspect;
 
 end DerivedShapeAspect;
diff --git a/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cdl b/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cdl
index 141a4e2eed..7958538859 100644
--- a/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cdl
+++ b/src/StepRepr/StepRepr_DescriptiveRepresentationItem.cdl
@@ -23,21 +23,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable DescriptiveRepresentationItem;
+	Create returns DescriptiveRepresentationItem;
 	---Purpose: Returns a DescriptiveRepresentationItem
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_Extension.cdl b/src/StepRepr/StepRepr_Extension.cdl
index f32d137e84..f5dd60af9c 100644
--- a/src/StepRepr/StepRepr_Extension.cdl
+++ b/src/StepRepr/StepRepr_Extension.cdl
@@ -22,6 +22,6 @@ uses
 
 is
 
-    Create returns mutable Extension;
+    Create returns Extension;
 
 end Extension;
diff --git a/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.cdl b/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.cdl
index 75a6bbe210..424d214d10 100644
--- a/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.cdl
+++ b/src/StepRepr/StepRepr_ExternallyDefinedRepresentation.cdl
@@ -21,6 +21,6 @@ uses
 
 is
 
-    Create returns mutable ExternallyDefinedRepresentation;
+    Create returns ExternallyDefinedRepresentation;
 
 end ExternallyDefinedRepresentation;
diff --git a/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cdl b/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cdl
index e151e2020d..31192e30a5 100644
--- a/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cdl
+++ b/src/StepRepr/StepRepr_FunctionallyDefinedTransformation.cdl
@@ -23,19 +23,19 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable FunctionallyDefinedTransformation;
+	Create returns FunctionallyDefinedTransformation;
 	---Purpose: Returns a FunctionallyDefinedTransformation
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cdl b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cdl
index 2b16976468..26805dcf23 100644
--- a/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cdl
+++ b/src/StepRepr/StepRepr_GlobalUncertaintyAssignedContext.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable GlobalUncertaintyAssignedContext;
+	Create returns GlobalUncertaintyAssignedContext;
 	---Purpose: Returns a GlobalUncertaintyAssignedContext
 
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection) is redefined;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection;
-	      aUncertainty : mutable HArray1OfUncertaintyMeasureWithUnit from StepBasic) is virtual;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection;
+	      aUncertainty : HArray1OfUncertaintyMeasureWithUnit from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetUncertainty(me : mutable; aUncertainty : mutable HArray1OfUncertaintyMeasureWithUnit);
-	Uncertainty (me) returns mutable HArray1OfUncertaintyMeasureWithUnit;
-	UncertaintyValue (me; num : Integer) returns mutable UncertaintyMeasureWithUnit;
+	SetUncertainty(me : mutable; aUncertainty : HArray1OfUncertaintyMeasureWithUnit);
+	Uncertainty (me) returns HArray1OfUncertaintyMeasureWithUnit;
+	UncertaintyValue (me; num : Integer) returns UncertaintyMeasureWithUnit;
 	NbUncertainty (me) returns Integer;
 
 fields
diff --git a/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cdl b/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cdl
index 9af5389ae2..03305b5069 100644
--- a/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cdl
+++ b/src/StepRepr/StepRepr_GlobalUnitAssignedContext.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable GlobalUnitAssignedContext;
+	Create returns GlobalUnitAssignedContext;
 	---Purpose: Returns a GlobalUnitAssignedContext
 
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection) is redefined;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection;
-	      aUnits : mutable HArray1OfNamedUnit from StepBasic) is virtual;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection;
+	      aUnits : HArray1OfNamedUnit from StepBasic) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetUnits(me : mutable; aUnits : mutable HArray1OfNamedUnit);
-	Units (me) returns mutable HArray1OfNamedUnit;
-	UnitsValue (me; num : Integer) returns mutable NamedUnit;
+	SetUnits(me : mutable; aUnits : HArray1OfNamedUnit);
+	Units (me) returns HArray1OfNamedUnit;
+	UnitsValue (me; num : Integer) returns NamedUnit;
 	NbUnits (me) returns Integer;
 
 fields
diff --git a/src/StepRepr/StepRepr_ItemDefinedTransformation.cdl b/src/StepRepr/StepRepr_ItemDefinedTransformation.cdl
index 9336d28091..c1a54d0688 100644
--- a/src/StepRepr/StepRepr_ItemDefinedTransformation.cdl
+++ b/src/StepRepr/StepRepr_ItemDefinedTransformation.cdl
@@ -24,7 +24,7 @@ uses
 
 is
 
-    Create returns mutable ItemDefinedTransformation;
+    Create returns ItemDefinedTransformation;
 
     Init (me : mutable;
     	  aName : HAsciiString from TCollection;
diff --git a/src/StepRepr/StepRepr_MappedItem.cdl b/src/StepRepr/StepRepr_MappedItem.cdl
index 38481a3674..76fd73b62b 100644
--- a/src/StepRepr/StepRepr_MappedItem.cdl
+++ b/src/StepRepr/StepRepr_MappedItem.cdl
@@ -24,24 +24,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable MappedItem;
+	Create returns MappedItem;
 	---Purpose: Returns a MappedItem
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aMappingSource : mutable RepresentationMap from StepRepr;
-	      aMappingTarget : mutable RepresentationItem from StepRepr) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aMappingSource : RepresentationMap from StepRepr;
+	      aMappingTarget : RepresentationItem from StepRepr) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetMappingSource(me : mutable; aMappingSource : mutable RepresentationMap);
-	MappingSource (me) returns mutable RepresentationMap;
-	SetMappingTarget(me : mutable; aMappingTarget : mutable RepresentationItem);
-	MappingTarget (me) returns mutable RepresentationItem;
+	SetMappingSource(me : mutable; aMappingSource : RepresentationMap);
+	MappingSource (me) returns RepresentationMap;
+	SetMappingTarget(me : mutable; aMappingTarget : RepresentationItem);
+	MappingTarget (me) returns RepresentationItem;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_MaterialDesignation.cdl b/src/StepRepr/StepRepr_MaterialDesignation.cdl
index 19c55f714a..d6d9b3441f 100644
--- a/src/StepRepr/StepRepr_MaterialDesignation.cdl
+++ b/src/StepRepr/StepRepr_MaterialDesignation.cdl
@@ -25,17 +25,17 @@ uses
 
 is
 
-    Create returns mutable MaterialDesignation;
+    Create returns MaterialDesignation;
 
     Init (me : mutable;
-    	  aName : mutable HAsciiString from TCollection;
+    	  aName : HAsciiString from TCollection;
 	  aOfDefinition : CharacterizedDefinition);
 
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
     	SetOfDefinition (me : mutable; aOfDefinition : CharacterizedDefinition);
 	OfDefinition (me) returns CharacterizedDefinition;
 
diff --git a/src/StepRepr/StepRepr_MeasureRepresentationItem.cdl b/src/StepRepr/StepRepr_MeasureRepresentationItem.cdl
index b26da16c3a..bef7568f4e 100644
--- a/src/StepRepr/StepRepr_MeasureRepresentationItem.cdl
+++ b/src/StepRepr/StepRepr_MeasureRepresentationItem.cdl
@@ -28,11 +28,11 @@ uses
     MeasureValueMember from StepBasic
     
 is
-    Create returns mutable MeasureRepresentationItem;
+    Create returns MeasureRepresentationItem;
         ---Purpose: Creates empty object
     
     Init (me : mutable;
-	  aName : mutable HAsciiString from TCollection;
+	  aName : HAsciiString from TCollection;
 	  aValueComponent : MeasureValueMember from StepBasic;
 	  aUnitComponent : Unit from StepBasic);
         ---Purpose: Init all fields
diff --git a/src/StepRepr/StepRepr_ParametricRepresentationContext.cdl b/src/StepRepr/StepRepr_ParametricRepresentationContext.cdl
index d8dc5d6adc..0a2ec5636e 100644
--- a/src/StepRepr/StepRepr_ParametricRepresentationContext.cdl
+++ b/src/StepRepr/StepRepr_ParametricRepresentationContext.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ParametricRepresentationContext;
+	Create returns ParametricRepresentationContext;
 	---Purpose: Returns a ParametricRepresentationContext
 
 
diff --git a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cdl b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cdl
index cbaff34d99..6cadf73af1 100644
--- a/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cdl
+++ b/src/StepRepr/StepRepr_PromissoryUsageOccurrence.cdl
@@ -21,6 +21,6 @@ uses
 
 is
 
-    Create returns mutable PromissoryUsageOccurrence;
+    Create returns PromissoryUsageOccurrence;
 
 end PromissoryUsageOccurrence;
diff --git a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.cdl b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.cdl
index 3c0fa11817..74ad45a8c9 100644
--- a/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.cdl
+++ b/src/StepRepr/StepRepr_ReprItemAndLengthMeasureWithUnit.cdl
@@ -22,21 +22,21 @@ uses
 
 is
 
-    Create returns mutable ReprItemAndLengthMeasureWithUnit;
+    Create returns ReprItemAndLengthMeasureWithUnit;
     
-    Init(me: mutable; aMWU: mutable MeasureWithUnit; aRI : RepresentationItem);
+    Init(me: mutable; aMWU: MeasureWithUnit; aRI : RepresentationItem);
 
-    SetLengthMeasureWithUnit(me: mutable; aLMWU: mutable LengthMeasureWithUnit);
+    SetLengthMeasureWithUnit(me: mutable; aLMWU: LengthMeasureWithUnit);
     
-    GetLengthMeasureWithUnit(me) returns mutable LengthMeasureWithUnit;
+    GetLengthMeasureWithUnit(me) returns LengthMeasureWithUnit;
 
-    GetMeasureRepresentationItem(me) returns mutable MeasureRepresentationItem;
+    GetMeasureRepresentationItem(me) returns MeasureRepresentationItem;
 
-    SetMeasureWithUnit(me: mutable; aMWU: mutable MeasureWithUnit);
+    SetMeasureWithUnit(me: mutable; aMWU: MeasureWithUnit);
     
-    GetMeasureWithUnit(me) returns mutable MeasureWithUnit;
+    GetMeasureWithUnit(me) returns MeasureWithUnit;
 
-    GetRepresentationItem(me) returns mutable RepresentationItem;
+    GetRepresentationItem(me) returns RepresentationItem;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_Representation.cdl b/src/StepRepr/StepRepr_Representation.cdl
index 889478c121..39c47acad2 100644
--- a/src/StepRepr/StepRepr_Representation.cdl
+++ b/src/StepRepr/StepRepr_Representation.cdl
@@ -26,24 +26,24 @@ uses
 	RepresentationItem from StepRepr
 is
 
-	Create returns mutable Representation;
+	Create returns Representation;
 	---Purpose: Returns a Representation
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aItems : mutable HArray1OfRepresentationItem from StepRepr;
-	      aContextOfItems : mutable RepresentationContext from StepRepr) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aItems : HArray1OfRepresentationItem from StepRepr;
+	      aContextOfItems : RepresentationContext from StepRepr) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetItems(me : mutable; aItems : mutable HArray1OfRepresentationItem);
-	Items (me) returns mutable HArray1OfRepresentationItem;
-	ItemsValue (me; num : Integer) returns mutable RepresentationItem;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetItems(me : mutable; aItems : HArray1OfRepresentationItem);
+	Items (me) returns HArray1OfRepresentationItem;
+	ItemsValue (me; num : Integer) returns RepresentationItem;
 	NbItems (me) returns Integer;
-	SetContextOfItems(me : mutable; aContextOfItems : mutable RepresentationContext);
-	ContextOfItems (me) returns mutable RepresentationContext;
+	SetContextOfItems(me : mutable; aContextOfItems : RepresentationContext);
+	ContextOfItems (me) returns RepresentationContext;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_RepresentationContext.cdl b/src/StepRepr/StepRepr_RepresentationContext.cdl
index 758c9c929d..90caeb7445 100644
--- a/src/StepRepr/StepRepr_RepresentationContext.cdl
+++ b/src/StepRepr/StepRepr_RepresentationContext.cdl
@@ -23,19 +23,19 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable RepresentationContext;
+	Create returns RepresentationContext;
 	---Purpose: Returns a RepresentationContext
 
 	Init (me : mutable;
-	      aContextIdentifier : mutable HAsciiString from TCollection;
-	      aContextType : mutable HAsciiString from TCollection) is virtual;
+	      aContextIdentifier : HAsciiString from TCollection;
+	      aContextType : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetContextIdentifier(me : mutable; aContextIdentifier : mutable HAsciiString);
-	ContextIdentifier (me) returns mutable HAsciiString;
-	SetContextType(me : mutable; aContextType : mutable HAsciiString);
-	ContextType (me) returns mutable HAsciiString;
+	SetContextIdentifier(me : mutable; aContextIdentifier : HAsciiString);
+	ContextIdentifier (me) returns HAsciiString;
+	SetContextType(me : mutable; aContextType : HAsciiString);
+	ContextType (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_RepresentationItem.cdl b/src/StepRepr/StepRepr_RepresentationItem.cdl
index 4322ecd036..c818ae12e5 100644
--- a/src/StepRepr/StepRepr_RepresentationItem.cdl
+++ b/src/StepRepr/StepRepr_RepresentationItem.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable RepresentationItem;
+	Create returns RepresentationItem;
 	---Purpose: Returns a RepresentationItem
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_RepresentationMap.cdl b/src/StepRepr/StepRepr_RepresentationMap.cdl
index 1ecc6fb014..e9ec8f014d 100644
--- a/src/StepRepr/StepRepr_RepresentationMap.cdl
+++ b/src/StepRepr/StepRepr_RepresentationMap.cdl
@@ -24,19 +24,19 @@ uses
 	Representation from StepRepr
 is
 
-	Create returns mutable RepresentationMap;
+	Create returns RepresentationMap;
 	---Purpose: Returns a RepresentationMap
 
 	Init (me : mutable;
-	      aMappingOrigin : mutable RepresentationItem from StepRepr;
-	      aMappedRepresentation : mutable Representation from StepRepr) is virtual;
+	      aMappingOrigin : RepresentationItem from StepRepr;
+	      aMappedRepresentation : Representation from StepRepr) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetMappingOrigin(me : mutable; aMappingOrigin : mutable RepresentationItem);
-	MappingOrigin (me) returns mutable RepresentationItem;
-	SetMappedRepresentation(me : mutable; aMappedRepresentation : mutable Representation);
-	MappedRepresentation (me) returns mutable Representation;
+	SetMappingOrigin(me : mutable; aMappingOrigin : RepresentationItem);
+	MappingOrigin (me) returns RepresentationItem;
+	SetMappedRepresentation(me : mutable; aMappedRepresentation : Representation);
+	MappedRepresentation (me) returns Representation;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_RepresentationRelationship.cdl b/src/StepRepr/StepRepr_RepresentationRelationship.cdl
index 300bd63923..ebdc5f523d 100644
--- a/src/StepRepr/StepRepr_RepresentationRelationship.cdl
+++ b/src/StepRepr/StepRepr_RepresentationRelationship.cdl
@@ -24,25 +24,25 @@ uses
 	Representation from StepRepr
 is
 
-	Create returns mutable RepresentationRelationship;
+	Create returns RepresentationRelationship;
 	---Purpose: Returns a RepresentationRelationship
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aRep1 : mutable Representation from StepRepr;
-	      aRep2 : mutable Representation from StepRepr) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aRep1 : Representation from StepRepr;
+	      aRep2 : Representation from StepRepr) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
-	SetRep1(me : mutable; aRep1 : mutable Representation);
-	Rep1 (me) returns mutable Representation;
-	SetRep2(me : mutable; aRep2 : mutable Representation);
-	Rep2 (me) returns mutable Representation;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
+	SetRep1(me : mutable; aRep1 : Representation);
+	Rep1 (me) returns Representation;
+	SetRep2(me : mutable; aRep2 : Representation);
+	Rep2 (me) returns Representation;
 
 fields
 
diff --git a/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cdl b/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cdl
index 9ea3d91bf4..b8a4ffbddd 100644
--- a/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cdl
+++ b/src/StepRepr/StepRepr_RepresentationRelationshipWithTransformation.cdl
@@ -28,13 +28,13 @@ uses
 
 is
 
-    Create returns mutable RepresentationRelationshipWithTransformation;
+    Create returns RepresentationRelationshipWithTransformation;
 
     Init (me : mutable;
-              aName : mutable HAsciiString from TCollection;
-              aDescription : mutable HAsciiString from TCollection;
-              aRep1 : mutable Representation from StepRepr;
-              aRep2 : mutable Representation from StepRepr;
+              aName : HAsciiString from TCollection;
+              aDescription : HAsciiString from TCollection;
+              aRep1 : Representation from StepRepr;
+              aRep2 : Representation from StepRepr;
 	      aTransf : Transformation);
 
     TransformationOperator (me) returns Transformation;
diff --git a/src/StepRepr/StepRepr_ShapeAspect.cdl b/src/StepRepr/StepRepr_ShapeAspect.cdl
index 03d53041fc..2302720db8 100644
--- a/src/StepRepr/StepRepr_ShapeAspect.cdl
+++ b/src/StepRepr/StepRepr_ShapeAspect.cdl
@@ -25,23 +25,23 @@ uses
 	Logical from StepData
 is
 
-	Create returns mutable ShapeAspect;
+	Create returns ShapeAspect;
 	---Purpose: Returns a ShapeAspect
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aOfShape : mutable ProductDefinitionShape from StepRepr;
+	      aName : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aOfShape : ProductDefinitionShape from StepRepr;
 	      aProductDefinitional : Logical from StepData) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
-	SetOfShape(me : mutable; aOfShape : mutable ProductDefinitionShape);
-	OfShape (me) returns mutable ProductDefinitionShape;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
+	SetOfShape(me : mutable; aOfShape : ProductDefinitionShape);
+	OfShape (me) returns ProductDefinitionShape;
 	SetProductDefinitional(me : mutable; aProductDefinitional : Logical);
 	ProductDefinitional (me) returns Logical;
 
diff --git a/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.cdl b/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.cdl
index cb384448f4..79015489f1 100644
--- a/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.cdl
+++ b/src/StepRepr/StepRepr_ShapeAspectDerivingRelationship.cdl
@@ -23,6 +23,6 @@ uses
 
 is
 
-    Create returns mutable ShapeAspectDerivingRelationship;
+    Create returns ShapeAspectDerivingRelationship;
 
 end ShapeAspectDerivingRelationship;
diff --git a/src/StepRepr/StepRepr_ShapeRepresentationRelationship.cdl b/src/StepRepr/StepRepr_ShapeRepresentationRelationship.cdl
index ca20676f12..97ee23562e 100644
--- a/src/StepRepr/StepRepr_ShapeRepresentationRelationship.cdl
+++ b/src/StepRepr/StepRepr_ShapeRepresentationRelationship.cdl
@@ -21,6 +21,6 @@ uses
 
 is
 
-    Create returns mutable ShapeRepresentationRelationship;
+    Create returns ShapeRepresentationRelationship;
 
 end ShapeRepresentationRelationship;
diff --git a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cdl b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cdl
index 8c25d94af9..15144d23bd 100644
--- a/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cdl
+++ b/src/StepRepr/StepRepr_ShapeRepresentationRelationshipWithTransformation.cdl
@@ -22,6 +22,6 @@ uses
 
 is
 
-    Create returns mutable ShapeRepresentationRelationshipWithTransformation;
+    Create returns ShapeRepresentationRelationshipWithTransformation;
 
 end ShapeRepresentationRelationshipWithTransformation;
diff --git a/src/StepRepr/StepRepr_SuppliedPartRelationship.cdl b/src/StepRepr/StepRepr_SuppliedPartRelationship.cdl
index 20f27226a9..714b8e669c 100644
--- a/src/StepRepr/StepRepr_SuppliedPartRelationship.cdl
+++ b/src/StepRepr/StepRepr_SuppliedPartRelationship.cdl
@@ -22,6 +22,6 @@ uses
 
 is
 
-    Create returns mutable SuppliedPartRelationship;
+    Create returns SuppliedPartRelationship;
 
 end SuppliedPartRelationship;
diff --git a/src/StepRepr/StepRepr_ValueRange.cdl b/src/StepRepr/StepRepr_ValueRange.cdl
index 1888c0b0b1..c8b1f859b6 100644
--- a/src/StepRepr/StepRepr_ValueRange.cdl
+++ b/src/StepRepr/StepRepr_ValueRange.cdl
@@ -22,6 +22,6 @@ uses
 
 is
 
-    Create returns mutable ValueRange;
+    Create returns ValueRange;
 
 end ValueRange;
diff --git a/src/StepSelect/StepSelect_Activator.cdl b/src/StepSelect/StepSelect_Activator.cdl
index 71bc48a081..8a385e16ef 100644
--- a/src/StepSelect/StepSelect_Activator.cdl
+++ b/src/StepSelect/StepSelect_Activator.cdl
@@ -23,10 +23,10 @@ uses CString, SessionPilot, ReturnStatus
 
 is
 
-    Create returns mutable Activator from StepSelect;
+    Create returns Activator from StepSelect;
 
 
-    Do   (me : mutable; number : Integer; pilot : mutable SessionPilot)
+    Do   (me : mutable; number : Integer; pilot : SessionPilot)
     	returns ReturnStatus;
     ---Purpose : Executes a Command Line for StepSelect
 
diff --git a/src/StepSelect/StepSelect_FloatFormat.cdl b/src/StepSelect/StepSelect_FloatFormat.cdl
index a3d842f063..e2523a3921 100644
--- a/src/StepSelect/StepSelect_FloatFormat.cdl
+++ b/src/StepSelect/StepSelect_FloatFormat.cdl
@@ -26,7 +26,7 @@ uses CString, AsciiString from TCollection, HSequenceOfInteger from TColStd,
 
 is
 
-    Create returns mutable FloatFormat;
+    Create returns FloatFormat;
     ---Purpose : Creates a new FloatFormat, with standard options :
     --           ZeroSuppress, Main Format = %E,
     --           Format between 0.001 and 1000. = %f
diff --git a/src/StepSelect/StepSelect_StepType.cdl b/src/StepSelect/StepSelect_StepType.cdl
index f0c483ff3b..33004a79b6 100644
--- a/src/StepSelect/StepSelect_StepType.cdl
+++ b/src/StepSelect/StepSelect_StepType.cdl
@@ -34,7 +34,7 @@ raises InterfaceError
 
 is
 
-    Create returns mutable StepType;
+    Create returns StepType;
     ---Purpose : Creates a Signature for Step Type. Protocol is undefined here,
     --           hence no Signature may yet be produced. The StepType signature
     --           requires a Protocol before working
diff --git a/src/StepSelect/StepSelect_WorkLibrary.cdl b/src/StepSelect/StepSelect_WorkLibrary.cdl
index 828c2fda53..b59a9a74a8 100644
--- a/src/StepSelect/StepSelect_WorkLibrary.cdl
+++ b/src/StepSelect/StepSelect_WorkLibrary.cdl
@@ -28,7 +28,7 @@ uses CString, Transient,
 is
 
     Create (copymode : Boolean = Standard_True)
-    	 returns mutable WorkLibrary from StepSelect;
+    	 returns WorkLibrary from StepSelect;
     ---Purpose : Creates a STEP WorkLibrary
     --           <copymode> precises whether Copy is implemented or not
 
@@ -39,7 +39,7 @@ is
     --           2 : prints labels onky
 
     ReadFile (me; name : CString;
-    	      model    : out mutable InterfaceModel;
+    	      model    : out InterfaceModel;
     	      protocol : Protocol from Interface)
     	  returns Integer;
     ---Purpose : Reads a STEP File and returns a STEP Model (into <mod>),
@@ -53,7 +53,7 @@ is
 
     CopyModel (me;
     	       original : InterfaceModel;
-	       newmodel : mutable InterfaceModel;
+	       newmodel : InterfaceModel;
 	       list     : EntityIterator;
 	       TC       : in out CopyTool)
 	returns Boolean  is redefined;
diff --git a/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.cdl b/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.cdl
index 5519909ae5..2fd97670ce 100644
--- a/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_AdvancedBrepShapeRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable AdvancedBrepShapeRepresentation;
+	Create returns AdvancedBrepShapeRepresentation;
 	---Purpose: Returns a AdvancedBrepShapeRepresentation
 
 
diff --git a/src/StepShape/StepShape_AdvancedFace.cdl b/src/StepShape/StepShape_AdvancedFace.cdl
index b1574a5576..2e745eb9ce 100644
--- a/src/StepShape/StepShape_AdvancedFace.cdl
+++ b/src/StepShape/StepShape_AdvancedFace.cdl
@@ -26,7 +26,7 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable AdvancedFace;
+	Create returns AdvancedFace;
 	---Purpose: Returns a AdvancedFace
 
 
diff --git a/src/StepShape/StepShape_Block.cdl b/src/StepShape/StepShape_Block.cdl
index f8d3abffd2..fb2b94a887 100644
--- a/src/StepShape/StepShape_Block.cdl
+++ b/src/StepShape/StepShape_Block.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Block;
+	Create returns Block;
 	---Purpose: Returns a Block
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom;
 	      aX : Real from Standard;
 	      aY : Real from Standard;
 	      aZ : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPosition(me : mutable; aPosition : mutable Axis2Placement3d);
-	Position (me) returns mutable Axis2Placement3d;
+	SetPosition(me : mutable; aPosition : Axis2Placement3d);
+	Position (me) returns Axis2Placement3d;
 	SetX(me : mutable; aX : Real);
 	X (me) returns Real;
 	SetY(me : mutable; aY : Real);
diff --git a/src/StepShape/StepShape_BooleanResult.cdl b/src/StepShape/StepShape_BooleanResult.cdl
index 3cd3fd206b..99f0ceb162 100644
--- a/src/StepShape/StepShape_BooleanResult.cdl
+++ b/src/StepShape/StepShape_BooleanResult.cdl
@@ -25,15 +25,15 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable BooleanResult;
+	Create returns BooleanResult;
 	---Purpose: Returns a BooleanResult
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aOperator : BooleanOperator from StepShape;
 	      aFirstOperand : BooleanOperand from StepShape;
 	      aSecondOperand : BooleanOperand from StepShape) is virtual;
diff --git a/src/StepShape/StepShape_BoxDomain.cdl b/src/StepShape/StepShape_BoxDomain.cdl
index 73d63a6f3d..fc2719b04f 100644
--- a/src/StepShape/StepShape_BoxDomain.cdl
+++ b/src/StepShape/StepShape_BoxDomain.cdl
@@ -24,19 +24,19 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable BoxDomain;
+	Create returns BoxDomain;
 	---Purpose: Returns a BoxDomain
 
 	Init (me : mutable;
-	      aCorner : mutable CartesianPoint from StepGeom;
+	      aCorner : CartesianPoint from StepGeom;
 	      aXlength : Real from Standard;
 	      aYlength : Real from Standard;
 	      aZlength : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetCorner(me : mutable; aCorner : mutable CartesianPoint);
-	Corner (me) returns mutable CartesianPoint;
+	SetCorner(me : mutable; aCorner : CartesianPoint);
+	Corner (me) returns CartesianPoint;
 	SetXlength(me : mutable; aXlength : Real);
 	Xlength (me) returns Real;
 	SetYlength(me : mutable; aYlength : Real);
diff --git a/src/StepShape/StepShape_BoxedHalfSpace.cdl b/src/StepShape/StepShape_BoxedHalfSpace.cdl
index 500f317963..b90401881e 100644
--- a/src/StepShape/StepShape_BoxedHalfSpace.cdl
+++ b/src/StepShape/StepShape_BoxedHalfSpace.cdl
@@ -26,25 +26,25 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable BoxedHalfSpace;
+	Create returns BoxedHalfSpace;
 	---Purpose: Returns a BoxedHalfSpace
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBaseSurface : mutable Surface from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBaseSurface : Surface from StepGeom;
 	      aAgreementFlag : Boolean from Standard) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBaseSurface : mutable Surface from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBaseSurface : Surface from StepGeom;
 	      aAgreementFlag : Boolean from Standard;
-	      aEnclosure : mutable BoxDomain from StepShape) is virtual;
+	      aEnclosure : BoxDomain from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetEnclosure(me : mutable; aEnclosure : mutable BoxDomain);
-	Enclosure (me) returns mutable BoxDomain;
+	SetEnclosure(me : mutable; aEnclosure : BoxDomain);
+	Enclosure (me) returns BoxDomain;
 
 fields
 
diff --git a/src/StepShape/StepShape_BrepWithVoids.cdl b/src/StepShape/StepShape_BrepWithVoids.cdl
index 755f53d8b7..401f80a6d2 100644
--- a/src/StepShape/StepShape_BrepWithVoids.cdl
+++ b/src/StepShape/StepShape_BrepWithVoids.cdl
@@ -26,24 +26,24 @@ uses
 	ClosedShell from StepShape
 is
 
-	Create returns mutable BrepWithVoids;
+	Create returns BrepWithVoids;
 	---Purpose: Returns a BrepWithVoids
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aOuter : mutable ClosedShell from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aOuter : ClosedShell from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aOuter : mutable ClosedShell from StepShape;
-	      aVoids : mutable HArray1OfOrientedClosedShell from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aOuter : ClosedShell from StepShape;
+	      aVoids : HArray1OfOrientedClosedShell from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetVoids(me : mutable; aVoids : mutable HArray1OfOrientedClosedShell);
-	Voids (me) returns mutable HArray1OfOrientedClosedShell;
-	VoidsValue (me; num : Integer) returns mutable OrientedClosedShell;
+	SetVoids(me : mutable; aVoids : HArray1OfOrientedClosedShell);
+	Voids (me) returns HArray1OfOrientedClosedShell;
+	VoidsValue (me; num : Integer) returns OrientedClosedShell;
 	NbVoids (me) returns Integer;
 
 fields
diff --git a/src/StepShape/StepShape_ClosedShell.cdl b/src/StepShape/StepShape_ClosedShell.cdl
index f7b2965eab..78b6d04f72 100644
--- a/src/StepShape/StepShape_ClosedShell.cdl
+++ b/src/StepShape/StepShape_ClosedShell.cdl
@@ -24,7 +24,7 @@ uses
 	HArray1OfFace from StepShape
 is
 
-	Create returns mutable ClosedShell;
+	Create returns ClosedShell;
 	---Purpose: Returns a ClosedShell
 
 
diff --git a/src/StepShape/StepShape_ConnectedFaceSet.cdl b/src/StepShape/StepShape_ConnectedFaceSet.cdl
index 2e80ef5fec..8ff8357ef5 100644
--- a/src/StepShape/StepShape_ConnectedFaceSet.cdl
+++ b/src/StepShape/StepShape_ConnectedFaceSet.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ConnectedFaceSet;
+	Create returns ConnectedFaceSet;
 	---Purpose: Returns a ConnectedFaceSet
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCfsFaces : mutable HArray1OfFace from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aCfsFaces : HArray1OfFace from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetCfsFaces(me : mutable; aCfsFaces : mutable HArray1OfFace)
+	SetCfsFaces(me : mutable; aCfsFaces : HArray1OfFace)
     	is virtual;
-	CfsFaces (me) returns mutable HArray1OfFace
+	CfsFaces (me) returns HArray1OfFace
     	is virtual;
-	CfsFacesValue (me; num : Integer) returns mutable Face
+	CfsFacesValue (me; num : Integer) returns Face
     	is virtual;
 	NbCfsFaces (me) returns Integer
     	is virtual;
diff --git a/src/StepShape/StepShape_ContextDependentShapeRepresentation.cdl b/src/StepShape/StepShape_ContextDependentShapeRepresentation.cdl
index a2ef286615..fe3d917e03 100644
--- a/src/StepShape/StepShape_ContextDependentShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_ContextDependentShapeRepresentation.cdl
@@ -22,7 +22,7 @@ uses
 
 is
 
-    Create returns mutable ContextDependentShapeRepresentation;
+    Create returns ContextDependentShapeRepresentation;
 
     Init (me : mutable;
     	  aRepRel : ShapeRepresentationRelationship;
diff --git a/src/StepShape/StepShape_CsgShapeRepresentation.cdl b/src/StepShape/StepShape_CsgShapeRepresentation.cdl
index 8025bc8891..a9557fbbeb 100644
--- a/src/StepShape/StepShape_CsgShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_CsgShapeRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable CsgShapeRepresentation;
+	Create returns CsgShapeRepresentation;
 	---Purpose: Returns a CsgShapeRepresentation
 
 
diff --git a/src/StepShape/StepShape_CsgSolid.cdl b/src/StepShape/StepShape_CsgSolid.cdl
index 819e3b386f..52069e209f 100644
--- a/src/StepShape/StepShape_CsgSolid.cdl
+++ b/src/StepShape/StepShape_CsgSolid.cdl
@@ -24,15 +24,15 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CsgSolid;
+	Create returns CsgSolid;
 	---Purpose: Returns a CsgSolid
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aTreeRootExpression : CsgSelect from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepShape/StepShape_Edge.cdl b/src/StepShape/StepShape_Edge.cdl
index 807f2ff89a..ab20ffbb29 100644
--- a/src/StepShape/StepShape_Edge.cdl
+++ b/src/StepShape/StepShape_Edge.cdl
@@ -24,27 +24,27 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Edge;
+	Create returns Edge;
 	---Purpose: Returns a Edge
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aEdgeStart : mutable Vertex from StepShape;
-	      aEdgeEnd : mutable Vertex from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aEdgeStart : Vertex from StepShape;
+	      aEdgeEnd : Vertex from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetEdgeStart(me : mutable; aEdgeStart : mutable Vertex)
+	SetEdgeStart(me : mutable; aEdgeStart : Vertex)
     	is virtual;
-	EdgeStart (me) returns mutable Vertex
+	EdgeStart (me) returns Vertex
     	is virtual;
-	SetEdgeEnd(me : mutable; aEdgeEnd : mutable Vertex)
+	SetEdgeEnd(me : mutable; aEdgeEnd : Vertex)
     	is virtual;
-	EdgeEnd (me) returns mutable Vertex
+	EdgeEnd (me) returns Vertex
     	is virtual;
 
 fields
diff --git a/src/StepShape/StepShape_EdgeCurve.cdl b/src/StepShape/StepShape_EdgeCurve.cdl
index ce8f3b0e6c..3644fb7e0a 100644
--- a/src/StepShape/StepShape_EdgeCurve.cdl
+++ b/src/StepShape/StepShape_EdgeCurve.cdl
@@ -29,26 +29,26 @@ uses
 	Vertex from StepShape
 is
 
-	Create returns mutable EdgeCurve;
+	Create returns EdgeCurve;
 	---Purpose: Returns a EdgeCurve
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aEdgeStart : mutable Vertex from StepShape;
-	      aEdgeEnd : mutable Vertex from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aEdgeStart : Vertex from StepShape;
+	      aEdgeEnd : Vertex from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aEdgeStart : mutable Vertex from StepShape;
-	      aEdgeEnd : mutable Vertex from StepShape;
-	      aEdgeGeometry : mutable Curve from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aEdgeStart : Vertex from StepShape;
+	      aEdgeEnd : Vertex from StepShape;
+	      aEdgeGeometry : Curve from StepGeom;
 	      aSameSense : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetEdgeGeometry(me : mutable; aEdgeGeometry : mutable Curve);
-	EdgeGeometry (me) returns mutable Curve;
+	SetEdgeGeometry(me : mutable; aEdgeGeometry : Curve);
+	EdgeGeometry (me) returns Curve;
 	SetSameSense(me : mutable; aSameSense : Boolean);
 	SameSense (me) returns Boolean;
 
diff --git a/src/StepShape/StepShape_EdgeLoop.cdl b/src/StepShape/StepShape_EdgeLoop.cdl
index 53a6543648..cb1bf589ed 100644
--- a/src/StepShape/StepShape_EdgeLoop.cdl
+++ b/src/StepShape/StepShape_EdgeLoop.cdl
@@ -36,21 +36,21 @@ uses
 
 is
 
-	Create returns mutable EdgeLoop;
+	Create returns EdgeLoop;
 	---Purpose: Returns a EdgeLoop
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aEdgeList : mutable HArray1OfOrientedEdge from StepShape);
+	      aName : HAsciiString from TCollection;
+	      aEdgeList : HArray1OfOrientedEdge from StepShape);
 
 	-- Specific Methods for Field Data Access --
 
-	SetEdgeList(me : mutable; aEdgeList : mutable HArray1OfOrientedEdge);
-	EdgeList (me) returns mutable HArray1OfOrientedEdge;
-	EdgeListValue (me; num : Integer) returns mutable OrientedEdge;
+	SetEdgeList(me : mutable; aEdgeList : HArray1OfOrientedEdge);
+	EdgeList (me) returns HArray1OfOrientedEdge;
+	EdgeListValue (me; num : Integer) returns OrientedEdge;
 	NbEdgeList (me) returns Integer;
 
 fields
diff --git a/src/StepShape/StepShape_ExtrudedAreaSolid.cdl b/src/StepShape/StepShape_ExtrudedAreaSolid.cdl
index bf6c979908..51ccb9c221 100644
--- a/src/StepShape/StepShape_ExtrudedAreaSolid.cdl
+++ b/src/StepShape/StepShape_ExtrudedAreaSolid.cdl
@@ -26,24 +26,24 @@ uses
 	CurveBoundedSurface from StepGeom
 is
 
-	Create returns mutable ExtrudedAreaSolid;
+	Create returns ExtrudedAreaSolid;
 	---Purpose: Returns a ExtrudedAreaSolid
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable CurveBoundedSurface from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : CurveBoundedSurface from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable CurveBoundedSurface from StepGeom;
-	      aExtrudedDirection : mutable Direction from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : CurveBoundedSurface from StepGeom;
+	      aExtrudedDirection : Direction from StepGeom;
 	      aDepth : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetExtrudedDirection(me : mutable; aExtrudedDirection : mutable Direction);
-	ExtrudedDirection (me) returns mutable Direction;
+	SetExtrudedDirection(me : mutable; aExtrudedDirection : Direction);
+	ExtrudedDirection (me) returns Direction;
 	SetDepth(me : mutable; aDepth : Real);
 	Depth (me) returns Real;
 
diff --git a/src/StepShape/StepShape_ExtrudedFaceSolid.cdl b/src/StepShape/StepShape_ExtrudedFaceSolid.cdl
index 15b49a35f2..3eeee5b7d5 100644
--- a/src/StepShape/StepShape_ExtrudedFaceSolid.cdl
+++ b/src/StepShape/StepShape_ExtrudedFaceSolid.cdl
@@ -26,24 +26,24 @@ uses
 
 is
 
-	Create returns mutable ExtrudedFaceSolid;
+	Create returns ExtrudedFaceSolid;
 	---Purpose: Returns a ExtrudedFaceSolid
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable FaceSurface from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : FaceSurface from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable FaceSurface from StepShape;
-	      aExtrudedDirection : mutable Direction from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : FaceSurface from StepShape;
+	      aExtrudedDirection : Direction from StepGeom;
 	      aDepth : Real from Standard) ;
 
 	-- Specific Methods for Field Data Access --
 
-	SetExtrudedDirection(me : mutable; aExtrudedDirection : mutable Direction);
-	ExtrudedDirection (me) returns mutable Direction;
+	SetExtrudedDirection(me : mutable; aExtrudedDirection : Direction);
+	ExtrudedDirection (me) returns Direction;
 	SetDepth(me : mutable; aDepth : Real);
 	Depth (me) returns Real;
 
diff --git a/src/StepShape/StepShape_Face.cdl b/src/StepShape/StepShape_Face.cdl
index 24824bd600..9544d2ac4c 100644
--- a/src/StepShape/StepShape_Face.cdl
+++ b/src/StepShape/StepShape_Face.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Face;
+	Create returns Face;
 	---Purpose: Returns a Face
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBounds : mutable HArray1OfFaceBound from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aBounds : HArray1OfFaceBound from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBounds(me : mutable; aBounds : mutable HArray1OfFaceBound)
+	SetBounds(me : mutable; aBounds : HArray1OfFaceBound)
     	is virtual;
-	Bounds (me) returns mutable HArray1OfFaceBound
+	Bounds (me) returns HArray1OfFaceBound
     	is virtual;
-	BoundsValue (me; num : Integer) returns mutable FaceBound
+	BoundsValue (me; num : Integer) returns FaceBound
     	is virtual;
 	NbBounds (me) returns Integer
     	is virtual;
diff --git a/src/StepShape/StepShape_FaceBound.cdl b/src/StepShape/StepShape_FaceBound.cdl
index 75db3ed217..0cb1debe69 100644
--- a/src/StepShape/StepShape_FaceBound.cdl
+++ b/src/StepShape/StepShape_FaceBound.cdl
@@ -25,22 +25,22 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable FaceBound;
+	Create returns FaceBound;
 	---Purpose: Returns a FaceBound
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBound : mutable Loop from StepShape;
+	      aName : HAsciiString from TCollection;
+	      aBound : Loop from StepShape;
 	      aOrientation : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBound(me : mutable; aBound : mutable Loop);
-	Bound (me) returns mutable Loop;
+	SetBound(me : mutable; aBound : Loop);
+	Bound (me) returns Loop;
 	SetOrientation(me : mutable; aOrientation : Boolean);
 	Orientation (me) returns Boolean;
 
diff --git a/src/StepShape/StepShape_FaceOuterBound.cdl b/src/StepShape/StepShape_FaceOuterBound.cdl
index d36f93d9e7..73ad743ad6 100644
--- a/src/StepShape/StepShape_FaceOuterBound.cdl
+++ b/src/StepShape/StepShape_FaceOuterBound.cdl
@@ -25,7 +25,7 @@ uses
 	Boolean from Standard
 is
 
-	Create returns mutable FaceOuterBound;
+	Create returns FaceOuterBound;
 	---Purpose: Returns a FaceOuterBound
 
 
diff --git a/src/StepShape/StepShape_FaceSurface.cdl b/src/StepShape/StepShape_FaceSurface.cdl
index 56a6a037d5..31d3523fcc 100644
--- a/src/StepShape/StepShape_FaceSurface.cdl
+++ b/src/StepShape/StepShape_FaceSurface.cdl
@@ -29,24 +29,24 @@ uses
 	HArray1OfFaceBound from StepShape
 is
 
-	Create returns mutable FaceSurface;
+	Create returns FaceSurface;
 	---Purpose: Returns a FaceSurface
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBounds : mutable HArray1OfFaceBound from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aBounds : HArray1OfFaceBound from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBounds : mutable HArray1OfFaceBound from StepShape;
-	      aFaceGeometry : mutable Surface from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBounds : HArray1OfFaceBound from StepShape;
+	      aFaceGeometry : Surface from StepGeom;
 	      aSameSense : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetFaceGeometry(me : mutable; aFaceGeometry : mutable Surface);
-	FaceGeometry (me) returns mutable Surface;
+	SetFaceGeometry(me : mutable; aFaceGeometry : Surface);
+	FaceGeometry (me) returns Surface;
 	SetSameSense(me : mutable; aSameSense : Boolean);
 	SameSense (me) returns Boolean;
 
diff --git a/src/StepShape/StepShape_FacetedBrep.cdl b/src/StepShape/StepShape_FacetedBrep.cdl
index 5b49f0c4dc..779804a5bc 100644
--- a/src/StepShape/StepShape_FacetedBrep.cdl
+++ b/src/StepShape/StepShape_FacetedBrep.cdl
@@ -24,7 +24,7 @@ uses
 	ClosedShell from StepShape
 is
 
-	Create returns mutable FacetedBrep;
+	Create returns FacetedBrep;
 	---Purpose: Returns a FacetedBrep
 
 
diff --git a/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.cdl b/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.cdl
index c6000b3ab0..2e50eda93f 100644
--- a/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.cdl
+++ b/src/StepShape/StepShape_FacetedBrepAndBrepWithVoids.cdl
@@ -31,37 +31,37 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable FacetedBrepAndBrepWithVoids;
+	Create returns FacetedBrepAndBrepWithVoids;
 	---Purpose: Returns a FacetedBrepAndBrepWithVoids
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aOuter : mutable ClosedShell from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aOuter : ClosedShell from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aOuter : mutable ClosedShell from StepShape;
-	      aFacetedBrep : mutable FacetedBrep from StepShape;
-	      aBrepWithVoids : mutable BrepWithVoids from StepShape);
+	      aName : HAsciiString from TCollection;
+	      aOuter : ClosedShell from StepShape;
+	      aFacetedBrep : FacetedBrep from StepShape;
+	      aBrepWithVoids : BrepWithVoids from StepShape);
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aOuter : mutable ClosedShell from StepShape;
-	      aVoids : mutable HArray1OfOrientedClosedShell from StepShape);
+	      aName : HAsciiString from TCollection;
+	      aOuter : ClosedShell from StepShape;
+	      aVoids : HArray1OfOrientedClosedShell from StepShape);
 
 	-- Specific Methods for Field Data Access --
 
-	SetFacetedBrep(me : mutable; aFacetedBrep : mutable FacetedBrep);
-	FacetedBrep (me) returns mutable FacetedBrep;
-	SetBrepWithVoids(me : mutable; aBrepWithVoids : mutable BrepWithVoids);
-	BrepWithVoids (me) returns mutable BrepWithVoids;
+	SetFacetedBrep(me : mutable; aFacetedBrep : FacetedBrep);
+	FacetedBrep (me) returns FacetedBrep;
+	SetBrepWithVoids(me : mutable; aBrepWithVoids : BrepWithVoids);
+	BrepWithVoids (me) returns BrepWithVoids;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetVoids(me : mutable; aVoids : mutable HArray1OfOrientedClosedShell);
-	Voids (me) returns mutable HArray1OfOrientedClosedShell;
-	VoidsValue (me; num : Integer) returns mutable OrientedClosedShell;
+	SetVoids(me : mutable; aVoids : HArray1OfOrientedClosedShell);
+	Voids (me) returns HArray1OfOrientedClosedShell;
+	VoidsValue (me; num : Integer) returns OrientedClosedShell;
 	NbVoids (me) returns Integer;
 
 	-- Specific Methods for ANDOR Field Data Access --
diff --git a/src/StepShape/StepShape_FacetedBrepShapeRepresentation.cdl b/src/StepShape/StepShape_FacetedBrepShapeRepresentation.cdl
index c97eedf1cb..9b8aab47bb 100644
--- a/src/StepShape/StepShape_FacetedBrepShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_FacetedBrepShapeRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable FacetedBrepShapeRepresentation;
+	Create returns FacetedBrepShapeRepresentation;
 	---Purpose: Returns a FacetedBrepShapeRepresentation
 
 
diff --git a/src/StepShape/StepShape_GeometricCurveSet.cdl b/src/StepShape/StepShape_GeometricCurveSet.cdl
index f77a692f19..cef52bcf56 100644
--- a/src/StepShape/StepShape_GeometricCurveSet.cdl
+++ b/src/StepShape/StepShape_GeometricCurveSet.cdl
@@ -24,7 +24,7 @@ uses
 	HArray1OfGeometricSetSelect from StepShape
 is
 
-	Create returns mutable GeometricCurveSet;
+	Create returns GeometricCurveSet;
 	---Purpose: Returns a GeometricCurveSet
 
 
diff --git a/src/StepShape/StepShape_GeometricSet.cdl b/src/StepShape/StepShape_GeometricSet.cdl
index 46e3d530ed..185f58807e 100644
--- a/src/StepShape/StepShape_GeometricSet.cdl
+++ b/src/StepShape/StepShape_GeometricSet.cdl
@@ -25,21 +25,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable GeometricSet;
+	Create returns GeometricSet;
 	---Purpose: Returns a GeometricSet
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aElements : mutable HArray1OfGeometricSetSelect from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aElements : HArray1OfGeometricSetSelect from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetElements(me : mutable; aElements : mutable HArray1OfGeometricSetSelect);
-	Elements (me) returns mutable HArray1OfGeometricSetSelect;
+	SetElements(me : mutable; aElements : HArray1OfGeometricSetSelect);
+	Elements (me) returns HArray1OfGeometricSetSelect;
 	ElementsValue (me; num : Integer) returns GeometricSetSelect;
 	NbElements (me) returns Integer;
 
diff --git a/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.cdl b/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.cdl
index 1724d30996..96cc8af371 100644
--- a/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_GeometricallyBoundedSurfaceShapeRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable GeometricallyBoundedSurfaceShapeRepresentation;
+	Create returns GeometricallyBoundedSurfaceShapeRepresentation;
 	---Purpose: Returns a GeometricallyBoundedSurfaceShapeRepresentation
 
 
diff --git a/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.cdl b/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.cdl
index 94776cdf00..753671434e 100644
--- a/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_GeometricallyBoundedWireframeShapeRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable GeometricallyBoundedWireframeShapeRepresentation;
+	Create returns GeometricallyBoundedWireframeShapeRepresentation;
 	---Purpose: Returns a GeometricallyBoundedWireframeShapeRepresentation
 
 
diff --git a/src/StepShape/StepShape_HalfSpaceSolid.cdl b/src/StepShape/StepShape_HalfSpaceSolid.cdl
index 409233cf39..6ce197ebd9 100644
--- a/src/StepShape/StepShape_HalfSpaceSolid.cdl
+++ b/src/StepShape/StepShape_HalfSpaceSolid.cdl
@@ -25,22 +25,22 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable HalfSpaceSolid;
+	Create returns HalfSpaceSolid;
 	---Purpose: Returns a HalfSpaceSolid
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBaseSurface : mutable Surface from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aBaseSurface : Surface from StepGeom;
 	      aAgreementFlag : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetBaseSurface(me : mutable; aBaseSurface : mutable Surface);
-	BaseSurface (me) returns mutable Surface;
+	SetBaseSurface(me : mutable; aBaseSurface : Surface);
+	BaseSurface (me) returns Surface;
 	SetAgreementFlag(me : mutable; aAgreementFlag : Boolean);
 	AgreementFlag (me) returns Boolean;
 
diff --git a/src/StepShape/StepShape_LimitsAndFits.cdl b/src/StepShape/StepShape_LimitsAndFits.cdl
index 384f5a2ba3..40f1b7a5a7 100644
--- a/src/StepShape/StepShape_LimitsAndFits.cdl
+++ b/src/StepShape/StepShape_LimitsAndFits.cdl
@@ -22,7 +22,7 @@ uses
 
 is
 
-    Create returns mutable LimitsAndFits;
+    Create returns LimitsAndFits;
 
     Init (me : mutable; form_variance, zone_variance, grade, source :
     	    	        HAsciiString from TCollection);
diff --git a/src/StepShape/StepShape_Loop.cdl b/src/StepShape/StepShape_Loop.cdl
index e9dbd99b00..013b89a96e 100644
--- a/src/StepShape/StepShape_Loop.cdl
+++ b/src/StepShape/StepShape_Loop.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Loop;
+	Create returns Loop;
 	---Purpose: Returns a Loop
 
 
diff --git a/src/StepShape/StepShape_LoopAndPath.cdl b/src/StepShape/StepShape_LoopAndPath.cdl
index 1cb479eb55..27bdcb0e06 100644
--- a/src/StepShape/StepShape_LoopAndPath.cdl
+++ b/src/StepShape/StepShape_LoopAndPath.cdl
@@ -30,37 +30,37 @@ uses
 	OrientedEdge from StepShape
 is
 
-	Create returns mutable LoopAndPath;
+	Create returns LoopAndPath;
 	---Purpose: Returns a LoopAndPath
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLoop : mutable Loop from StepShape;
-	      aPath : mutable Path from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aLoop : Loop from StepShape;
+	      aPath : Path from StepShape) is virtual;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aEdgeList : mutable HArray1OfOrientedEdge from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aEdgeList : HArray1OfOrientedEdge from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetLoop(me : mutable; aLoop : mutable Loop);
-	Loop (me) returns mutable Loop;
-	SetPath(me : mutable; aPath : mutable Path);
-	Path (me) returns mutable Path;
+	SetLoop(me : mutable; aLoop : Loop);
+	Loop (me) returns Loop;
+	SetPath(me : mutable; aPath : Path);
+	Path (me) returns Path;
 
 	-- Specific Methods for ANDOR Field Data Access --
 
 
 	-- Specific Methods for ANDOR Field Data Access --
 
-	SetEdgeList(me : mutable; aEdgeList : mutable HArray1OfOrientedEdge);
-	EdgeList (me) returns mutable HArray1OfOrientedEdge;
-	EdgeListValue (me; num : Integer) returns mutable OrientedEdge;
+	SetEdgeList(me : mutable; aEdgeList : HArray1OfOrientedEdge);
+	EdgeList (me) returns HArray1OfOrientedEdge;
+	EdgeListValue (me; num : Integer) returns OrientedEdge;
 	NbEdgeList (me) returns Integer;
 
 fields
diff --git a/src/StepShape/StepShape_ManifoldSolidBrep.cdl b/src/StepShape/StepShape_ManifoldSolidBrep.cdl
index 8a1377fad3..ef0186ec84 100644
--- a/src/StepShape/StepShape_ManifoldSolidBrep.cdl
+++ b/src/StepShape/StepShape_ManifoldSolidBrep.cdl
@@ -24,21 +24,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ManifoldSolidBrep;
+	Create returns ManifoldSolidBrep;
 	---Purpose: Returns a ManifoldSolidBrep
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aOuter : mutable ClosedShell from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aOuter : ClosedShell from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetOuter(me : mutable; aOuter : mutable ClosedShell);
-	Outer (me) returns mutable ClosedShell;
+	SetOuter(me : mutable; aOuter : ClosedShell);
+	Outer (me) returns ClosedShell;
 
 fields
 
diff --git a/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.cdl b/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.cdl
index c803b11473..d3a5282310 100644
--- a/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_ManifoldSurfaceShapeRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable ManifoldSurfaceShapeRepresentation;
+	Create returns ManifoldSurfaceShapeRepresentation;
 	---Purpose: Returns a ManifoldSurfaceShapeRepresentation
 
 
diff --git a/src/StepShape/StepShape_MeasureQualification.cdl b/src/StepShape/StepShape_MeasureQualification.cdl
index 6b4d14b58c..1eab387335 100644
--- a/src/StepShape/StepShape_MeasureQualification.cdl
+++ b/src/StepShape/StepShape_MeasureQualification.cdl
@@ -25,7 +25,7 @@ uses
 
 is
 
-    Create returns mutable MeasureQualification;
+    Create returns MeasureQualification;
 
     Init (me : mutable; name : HAsciiString from TCollection;
     	    description : HAsciiString from TCollection;
diff --git a/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.cdl b/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.cdl
index c4b57e80b9..17c42726cc 100644
--- a/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.cdl
+++ b/src/StepShape/StepShape_MeasureRepresentationItemAndQualifiedRepresentationItem.cdl
@@ -30,10 +30,10 @@ uses
  
 is
 
-    Create returns mutable MeasureRepresentationItemAndQualifiedRepresentationItem;
+    Create returns MeasureRepresentationItemAndQualifiedRepresentationItem;
 
     Init (me : mutable;
-          aName : mutable HAsciiString from TCollection;
+          aName : HAsciiString from TCollection;
           aValueComponent : MeasureValueMember from StepBasic;
           aUnitComponent : Unit from StepBasic;
     	  qualifiers : HArray1OfValueQualifier from StepShape);
diff --git a/src/StepShape/StepShape_OpenShell.cdl b/src/StepShape/StepShape_OpenShell.cdl
index 30723f8e90..42690110fe 100644
--- a/src/StepShape/StepShape_OpenShell.cdl
+++ b/src/StepShape/StepShape_OpenShell.cdl
@@ -24,7 +24,7 @@ uses
 	HArray1OfFace from StepShape
 is
 
-	Create returns mutable OpenShell;
+	Create returns OpenShell;
 	---Purpose: Returns a OpenShell
 
 
diff --git a/src/StepShape/StepShape_OrientedClosedShell.cdl b/src/StepShape/StepShape_OrientedClosedShell.cdl
index 9dc900f000..5aae27c9fc 100644
--- a/src/StepShape/StepShape_OrientedClosedShell.cdl
+++ b/src/StepShape/StepShape_OrientedClosedShell.cdl
@@ -26,28 +26,28 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable OrientedClosedShell;
+	Create returns OrientedClosedShell;
 	---Purpose: Returns a OrientedClosedShell
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCfsFaces : mutable HArray1OfFace from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aCfsFaces : HArray1OfFace from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aClosedShellElement : mutable ClosedShell from StepShape;
+	      aName : HAsciiString from TCollection;
+	      aClosedShellElement : ClosedShell from StepShape;
 	      aOrientation : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetClosedShellElement(me : mutable; aClosedShellElement : mutable ClosedShell);
-	ClosedShellElement (me) returns mutable ClosedShell;
+	SetClosedShellElement(me : mutable; aClosedShellElement : ClosedShell);
+	ClosedShellElement (me) returns ClosedShell;
 	SetOrientation(me : mutable; aOrientation : Boolean);
 	Orientation (me) returns Boolean;
-	SetCfsFaces(me : mutable; aCfsFaces : mutable HArray1OfFace) is redefined;
-	CfsFaces (me) returns mutable HArray1OfFace is redefined;
-	CfsFacesValue (me; num : Integer) returns mutable Face is redefined;
+	SetCfsFaces(me : mutable; aCfsFaces : HArray1OfFace) is redefined;
+	CfsFaces (me) returns HArray1OfFace is redefined;
+	CfsFacesValue (me; num : Integer) returns Face is redefined;
 	NbCfsFaces (me) returns Integer is redefined;
 
 fields
diff --git a/src/StepShape/StepShape_OrientedEdge.cdl b/src/StepShape/StepShape_OrientedEdge.cdl
index 84b6118788..248d17f975 100644
--- a/src/StepShape/StepShape_OrientedEdge.cdl
+++ b/src/StepShape/StepShape_OrientedEdge.cdl
@@ -25,25 +25,25 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable OrientedEdge;
+	Create returns OrientedEdge;
 	---Purpose: Returns a OrientedEdge
 	
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aEdgeElement : mutable Edge from StepShape;
+	      aName : HAsciiString from TCollection;
+	      aEdgeElement : Edge from StepShape;
 	      aOrientation : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetEdgeElement(me : mutable; aEdgeElement : mutable Edge);
-	EdgeElement (me) returns mutable Edge;
+	SetEdgeElement(me : mutable; aEdgeElement : Edge);
+	EdgeElement (me) returns Edge;
 	SetOrientation(me : mutable; aOrientation : Boolean);
 	Orientation (me) returns Boolean;
-	SetEdgeStart(me : mutable; aEdgeStart : mutable Vertex) is redefined;
-	EdgeStart (me) returns mutable Vertex is redefined;
-	SetEdgeEnd(me : mutable; aEdgeEnd : mutable Vertex) is redefined;
-	EdgeEnd (me) returns mutable Vertex is redefined;
+	SetEdgeStart(me : mutable; aEdgeStart : Vertex) is redefined;
+	EdgeStart (me) returns Vertex is redefined;
+	SetEdgeEnd(me : mutable; aEdgeEnd : Vertex) is redefined;
+	EdgeEnd (me) returns Vertex is redefined;
 
 fields
 
diff --git a/src/StepShape/StepShape_OrientedFace.cdl b/src/StepShape/StepShape_OrientedFace.cdl
index 68f02d1398..1909cac8e4 100644
--- a/src/StepShape/StepShape_OrientedFace.cdl
+++ b/src/StepShape/StepShape_OrientedFace.cdl
@@ -26,28 +26,28 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable OrientedFace;
+	Create returns OrientedFace;
 	---Purpose: Returns a OrientedFace
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aBounds : mutable HArray1OfFaceBound from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aBounds : HArray1OfFaceBound from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aFaceElement : mutable Face from StepShape;
+	      aName : HAsciiString from TCollection;
+	      aFaceElement : Face from StepShape;
 	      aOrientation : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetFaceElement(me : mutable; aFaceElement : mutable Face);
-	FaceElement (me) returns mutable Face;
+	SetFaceElement(me : mutable; aFaceElement : Face);
+	FaceElement (me) returns Face;
 	SetOrientation(me : mutable; aOrientation : Boolean);
 	Orientation (me) returns Boolean;
-	SetBounds(me : mutable; aBounds : mutable HArray1OfFaceBound) is redefined;
-	Bounds (me) returns mutable HArray1OfFaceBound is redefined;
-	BoundsValue (me; num : Integer) returns mutable FaceBound is redefined;
+	SetBounds(me : mutable; aBounds : HArray1OfFaceBound) is redefined;
+	Bounds (me) returns HArray1OfFaceBound is redefined;
+	BoundsValue (me; num : Integer) returns FaceBound is redefined;
 	NbBounds (me) returns Integer is redefined;
 
 fields
diff --git a/src/StepShape/StepShape_OrientedOpenShell.cdl b/src/StepShape/StepShape_OrientedOpenShell.cdl
index d59096437e..2d0760c536 100644
--- a/src/StepShape/StepShape_OrientedOpenShell.cdl
+++ b/src/StepShape/StepShape_OrientedOpenShell.cdl
@@ -26,28 +26,28 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable OrientedOpenShell;
+	Create returns OrientedOpenShell;
 	---Purpose: Returns a OrientedOpenShell
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCfsFaces : mutable HArray1OfFace from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aCfsFaces : HArray1OfFace from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aOpenShellElement : mutable OpenShell from StepShape;
+	      aName : HAsciiString from TCollection;
+	      aOpenShellElement : OpenShell from StepShape;
 	      aOrientation : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetOpenShellElement(me : mutable; aOpenShellElement : mutable OpenShell);
-	OpenShellElement (me) returns mutable OpenShell;
+	SetOpenShellElement(me : mutable; aOpenShellElement : OpenShell);
+	OpenShellElement (me) returns OpenShell;
 	SetOrientation(me : mutable; aOrientation : Boolean);
 	Orientation (me) returns Boolean;
-	SetCfsFaces(me : mutable; aCfsFaces : mutable HArray1OfFace) is redefined;
-	CfsFaces (me) returns mutable HArray1OfFace is redefined;
-	CfsFacesValue (me; num : Integer) returns mutable Face is redefined;
+	SetCfsFaces(me : mutable; aCfsFaces : HArray1OfFace) is redefined;
+	CfsFaces (me) returns HArray1OfFace is redefined;
+	CfsFacesValue (me; num : Integer) returns Face is redefined;
 	NbCfsFaces (me) returns Integer is redefined;
 
 fields
diff --git a/src/StepShape/StepShape_OrientedPath.cdl b/src/StepShape/StepShape_OrientedPath.cdl
index bab7e54fb8..73effcc886 100644
--- a/src/StepShape/StepShape_OrientedPath.cdl
+++ b/src/StepShape/StepShape_OrientedPath.cdl
@@ -27,28 +27,28 @@ uses
 	EdgeLoop from StepShape
 is
 
-	Create returns mutable OrientedPath;
+	Create returns OrientedPath;
 	---Purpose: Returns a OrientedPath
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aEdgeList : mutable HArray1OfOrientedEdge from StepShape) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aEdgeList : HArray1OfOrientedEdge from StepShape) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPathElement : mutable EdgeLoop from StepShape;
+	      aName : HAsciiString from TCollection;
+	      aPathElement : EdgeLoop from StepShape;
 	      aOrientation : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPathElement(me : mutable; aPathElement : mutable EdgeLoop);
-	PathElement (me) returns mutable EdgeLoop;
+	SetPathElement(me : mutable; aPathElement : EdgeLoop);
+	PathElement (me) returns EdgeLoop;
 	SetOrientation(me : mutable; aOrientation : Boolean);
 	Orientation (me) returns Boolean;
-	SetEdgeList(me : mutable; aEdgeList : mutable HArray1OfOrientedEdge) is redefined;
-	EdgeList (me) returns mutable HArray1OfOrientedEdge is redefined;
-	EdgeListValue (me; num : Integer) returns mutable OrientedEdge is redefined;
+	SetEdgeList(me : mutable; aEdgeList : HArray1OfOrientedEdge) is redefined;
+	EdgeList (me) returns HArray1OfOrientedEdge is redefined;
+	EdgeListValue (me; num : Integer) returns OrientedEdge is redefined;
 	NbEdgeList (me) returns Integer is redefined;
 
 fields
diff --git a/src/StepShape/StepShape_Path.cdl b/src/StepShape/StepShape_Path.cdl
index b22fecd764..6d8172a43e 100644
--- a/src/StepShape/StepShape_Path.cdl
+++ b/src/StepShape/StepShape_Path.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Path;
+	Create returns Path;
 	---Purpose: Returns a Path
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aEdgeList : mutable HArray1OfOrientedEdge from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aEdgeList : HArray1OfOrientedEdge from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetEdgeList(me : mutable; aEdgeList : mutable HArray1OfOrientedEdge)
+	SetEdgeList(me : mutable; aEdgeList : HArray1OfOrientedEdge)
     	is virtual;
-	EdgeList (me) returns mutable HArray1OfOrientedEdge
+	EdgeList (me) returns HArray1OfOrientedEdge
     	is virtual;
-	EdgeListValue (me; num : Integer) returns mutable OrientedEdge
+	EdgeListValue (me; num : Integer) returns OrientedEdge
     	is virtual;
 	NbEdgeList (me) returns Integer
     	is virtual;
diff --git a/src/StepShape/StepShape_PlusMinusTolerance.cdl b/src/StepShape/StepShape_PlusMinusTolerance.cdl
index 28ff9ad1ae..6c3f647433 100644
--- a/src/StepShape/StepShape_PlusMinusTolerance.cdl
+++ b/src/StepShape/StepShape_PlusMinusTolerance.cdl
@@ -23,7 +23,7 @@ uses
 
 is
 
-    Create returns mutable PlusMinusTolerance;
+    Create returns PlusMinusTolerance;
 
     Init (me : mutable;
     	    range : ToleranceMethodDefinition from StepShape;
diff --git a/src/StepShape/StepShape_PolyLoop.cdl b/src/StepShape/StepShape_PolyLoop.cdl
index 86c5e06f56..1cf331cc95 100644
--- a/src/StepShape/StepShape_PolyLoop.cdl
+++ b/src/StepShape/StepShape_PolyLoop.cdl
@@ -28,22 +28,22 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PolyLoop;
+	Create returns PolyLoop;
 	---Purpose: Returns a PolyLoop
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPolygon : mutable HArray1OfCartesianPoint from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aPolygon : HArray1OfCartesianPoint from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPolygon(me : mutable; aPolygon : mutable HArray1OfCartesianPoint);
-	Polygon (me) returns mutable HArray1OfCartesianPoint;
-	PolygonValue (me; num : Integer) returns mutable CartesianPoint;
+	SetPolygon(me : mutable; aPolygon : HArray1OfCartesianPoint);
+	Polygon (me) returns HArray1OfCartesianPoint;
+	PolygonValue (me; num : Integer) returns CartesianPoint;
 	NbPolygon (me) returns Integer;
 
 fields
diff --git a/src/StepShape/StepShape_PrecisionQualifier.cdl b/src/StepShape/StepShape_PrecisionQualifier.cdl
index 463005c999..bbcf58949d 100644
--- a/src/StepShape/StepShape_PrecisionQualifier.cdl
+++ b/src/StepShape/StepShape_PrecisionQualifier.cdl
@@ -22,7 +22,7 @@ uses
 
 is
 
-    Create returns mutable PrecisionQualifier;
+    Create returns PrecisionQualifier;
 
     Init (me : mutable; precision_value : Integer);
 
diff --git a/src/StepShape/StepShape_QualifiedRepresentationItem.cdl b/src/StepShape/StepShape_QualifiedRepresentationItem.cdl
index be4a24a7ab..1e50edcb92 100644
--- a/src/StepShape/StepShape_QualifiedRepresentationItem.cdl
+++ b/src/StepShape/StepShape_QualifiedRepresentationItem.cdl
@@ -25,10 +25,10 @@ uses
 
 is
 
-    Create returns mutable QualifiedRepresentationItem;
+    Create returns QualifiedRepresentationItem;
 
     Init (me : mutable;
-             aName : mutable HAsciiString from TCollection;
+             aName : HAsciiString from TCollection;
 	     qualifiers : HArray1OfValueQualifier from StepShape);
 
     Qualifiers (me) returns HArray1OfValueQualifier from StepShape;
diff --git a/src/StepShape/StepShape_RevolvedAreaSolid.cdl b/src/StepShape/StepShape_RevolvedAreaSolid.cdl
index 0c4100b252..e36a3f6fe8 100644
--- a/src/StepShape/StepShape_RevolvedAreaSolid.cdl
+++ b/src/StepShape/StepShape_RevolvedAreaSolid.cdl
@@ -26,24 +26,24 @@ uses
 	CurveBoundedSurface from StepGeom
 is
 
-	Create returns mutable RevolvedAreaSolid;
+	Create returns RevolvedAreaSolid;
 	---Purpose: Returns a RevolvedAreaSolid
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable CurveBoundedSurface from StepGeom) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : CurveBoundedSurface from StepGeom) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable CurveBoundedSurface from StepGeom;
-	      aAxis : mutable Axis1Placement from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : CurveBoundedSurface from StepGeom;
+	      aAxis : Axis1Placement from StepGeom;
 	      aAngle : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetAxis(me : mutable; aAxis : mutable Axis1Placement);
-	Axis (me) returns mutable Axis1Placement;
+	SetAxis(me : mutable; aAxis : Axis1Placement);
+	Axis (me) returns Axis1Placement;
 	SetAngle(me : mutable; aAngle : Real);
 	Angle (me) returns Real;
 
diff --git a/src/StepShape/StepShape_RevolvedFaceSolid.cdl b/src/StepShape/StepShape_RevolvedFaceSolid.cdl
index b679a1e1af..9bc861b958 100644
--- a/src/StepShape/StepShape_RevolvedFaceSolid.cdl
+++ b/src/StepShape/StepShape_RevolvedFaceSolid.cdl
@@ -25,24 +25,24 @@ uses
 	FaceSurface from StepShape 
 
 is
-    	Create returns mutable RevolvedFaceSolid;
+    	Create returns RevolvedFaceSolid;
 	---Purpose: Returns a RevolvedFaceSolid
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable FaceSurface from StepShape) is redefined ;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : FaceSurface from StepShape) is redefined ;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable FaceSurface from StepShape;
-	      aAxis : mutable Axis1Placement from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : FaceSurface from StepShape;
+	      aAxis : Axis1Placement from StepGeom;
 	      aAngle : Real from Standard);
 
 	-- Specific Methods for Field Data Access --
 
-	SetAxis(me : mutable; aAxis : mutable Axis1Placement);
-	Axis (me) returns mutable Axis1Placement;
+	SetAxis(me : mutable; aAxis : Axis1Placement);
+	Axis (me) returns Axis1Placement;
 	SetAngle(me : mutable; aAngle : Real);
 	Angle (me) returns Real;
 
diff --git a/src/StepShape/StepShape_RightAngularWedge.cdl b/src/StepShape/StepShape_RightAngularWedge.cdl
index 3161be4980..754fd65fd7 100644
--- a/src/StepShape/StepShape_RightAngularWedge.cdl
+++ b/src/StepShape/StepShape_RightAngularWedge.cdl
@@ -25,16 +25,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable RightAngularWedge;
+	Create returns RightAngularWedge;
 	---Purpose: Returns a RightAngularWedge
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis2Placement3d from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis2Placement3d from StepGeom;
 	      aX : Real from Standard;
 	      aY : Real from Standard;
 	      aZ : Real from Standard;
@@ -42,8 +42,8 @@ is
 
 	-- Specific Methods for Field Data Access --
 
-	SetPosition(me : mutable; aPosition : mutable Axis2Placement3d);
-	Position (me) returns mutable Axis2Placement3d;
+	SetPosition(me : mutable; aPosition : Axis2Placement3d);
+	Position (me) returns Axis2Placement3d;
 	SetX(me : mutable; aX : Real);
 	X (me) returns Real;
 	SetY(me : mutable; aY : Real);
diff --git a/src/StepShape/StepShape_RightCircularCone.cdl b/src/StepShape/StepShape_RightCircularCone.cdl
index 118bdbabb9..263d35c9e0 100644
--- a/src/StepShape/StepShape_RightCircularCone.cdl
+++ b/src/StepShape/StepShape_RightCircularCone.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable RightCircularCone;
+	Create returns RightCircularCone;
 	---Purpose: Returns a RightCircularCone
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis1Placement from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis1Placement from StepGeom;
 	      aHeight : Real from Standard;
 	      aRadius : Real from Standard;
 	      aSemiAngle : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPosition(me : mutable; aPosition : mutable Axis1Placement);
-	Position (me) returns mutable Axis1Placement;
+	SetPosition(me : mutable; aPosition : Axis1Placement);
+	Position (me) returns Axis1Placement;
 	SetHeight(me : mutable; aHeight : Real);
 	Height (me) returns Real;
 	SetRadius(me : mutable; aRadius : Real);
diff --git a/src/StepShape/StepShape_RightCircularCylinder.cdl b/src/StepShape/StepShape_RightCircularCylinder.cdl
index b8aacfd605..9674c9cbc6 100644
--- a/src/StepShape/StepShape_RightCircularCylinder.cdl
+++ b/src/StepShape/StepShape_RightCircularCylinder.cdl
@@ -25,23 +25,23 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable RightCircularCylinder;
+	Create returns RightCircularCylinder;
 	---Purpose: Returns a RightCircularCylinder
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis1Placement from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis1Placement from StepGeom;
 	      aHeight : Real from Standard;
 	      aRadius : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPosition(me : mutable; aPosition : mutable Axis1Placement);
-	Position (me) returns mutable Axis1Placement;
+	SetPosition(me : mutable; aPosition : Axis1Placement);
+	Position (me) returns Axis1Placement;
 	SetHeight(me : mutable; aHeight : Real);
 	Height (me) returns Real;
 	SetRadius(me : mutable; aRadius : Real);
diff --git a/src/StepShape/StepShape_ShapeRepresentation.cdl b/src/StepShape/StepShape_ShapeRepresentation.cdl
index 2af68e1e47..0a2a8a6f17 100644
--- a/src/StepShape/StepShape_ShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_ShapeRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable ShapeRepresentation;
+	Create returns ShapeRepresentation;
 	---Purpose: Returns a ShapeRepresentation
 
 
diff --git a/src/StepShape/StepShape_ShellBasedSurfaceModel.cdl b/src/StepShape/StepShape_ShellBasedSurfaceModel.cdl
index a22c213e98..2df03ce556 100644
--- a/src/StepShape/StepShape_ShellBasedSurfaceModel.cdl
+++ b/src/StepShape/StepShape_ShellBasedSurfaceModel.cdl
@@ -25,21 +25,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ShellBasedSurfaceModel;
+	Create returns ShellBasedSurfaceModel;
 	---Purpose: Returns a ShellBasedSurfaceModel
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSbsmBoundary : mutable HArray1OfShell from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aSbsmBoundary : HArray1OfShell from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetSbsmBoundary(me : mutable; aSbsmBoundary : mutable HArray1OfShell);
-	SbsmBoundary (me) returns mutable HArray1OfShell;
+	SetSbsmBoundary(me : mutable; aSbsmBoundary : HArray1OfShell);
+	SbsmBoundary (me) returns HArray1OfShell;
 	SbsmBoundaryValue (me; num : Integer) returns Shell;
 	NbSbsmBoundary (me) returns Integer;
 
diff --git a/src/StepShape/StepShape_SolidModel.cdl b/src/StepShape/StepShape_SolidModel.cdl
index f41659366e..b89642f533 100644
--- a/src/StepShape/StepShape_SolidModel.cdl
+++ b/src/StepShape/StepShape_SolidModel.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable SolidModel;
+	Create returns SolidModel;
 	---Purpose: Returns a SolidModel
 
 
diff --git a/src/StepShape/StepShape_SolidReplica.cdl b/src/StepShape/StepShape_SolidReplica.cdl
index d20341867c..3edd07afe2 100644
--- a/src/StepShape/StepShape_SolidReplica.cdl
+++ b/src/StepShape/StepShape_SolidReplica.cdl
@@ -24,24 +24,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable SolidReplica;
+	Create returns SolidReplica;
 	---Purpose: Returns a SolidReplica
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aParentSolid : mutable SolidModel from StepShape;
-	      aTransformation : mutable CartesianTransformationOperator3d from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aParentSolid : SolidModel from StepShape;
+	      aTransformation : CartesianTransformationOperator3d from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetParentSolid(me : mutable; aParentSolid : mutable SolidModel);
-	ParentSolid (me) returns mutable SolidModel;
-	SetTransformation(me : mutable; aTransformation : mutable CartesianTransformationOperator3d);
-	Transformation (me) returns mutable CartesianTransformationOperator3d;
+	SetParentSolid(me : mutable; aParentSolid : SolidModel);
+	ParentSolid (me) returns SolidModel;
+	SetTransformation(me : mutable; aTransformation : CartesianTransformationOperator3d);
+	Transformation (me) returns CartesianTransformationOperator3d;
 
 fields
 
diff --git a/src/StepShape/StepShape_Sphere.cdl b/src/StepShape/StepShape_Sphere.cdl
index 1bb5ac8337..fcaf4b080d 100644
--- a/src/StepShape/StepShape_Sphere.cdl
+++ b/src/StepShape/StepShape_Sphere.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Sphere;
+	Create returns Sphere;
 	---Purpose: Returns a Sphere
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aRadius : Real from Standard;
-	      aCentre : mutable Point from StepGeom) is virtual;
+	      aCentre : Point from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
 	SetRadius(me : mutable; aRadius : Real);
 	Radius (me) returns Real;
-	SetCentre(me : mutable; aCentre : mutable Point);
-	Centre (me) returns mutable Point;
+	SetCentre(me : mutable; aCentre : Point);
+	Centre (me) returns Point;
 
 fields
 
diff --git a/src/StepShape/StepShape_SweptAreaSolid.cdl b/src/StepShape/StepShape_SweptAreaSolid.cdl
index f457726e62..529985048b 100644
--- a/src/StepShape/StepShape_SweptAreaSolid.cdl
+++ b/src/StepShape/StepShape_SweptAreaSolid.cdl
@@ -24,21 +24,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable SweptAreaSolid;
+	Create returns SweptAreaSolid;
 	---Purpose: Returns a SweptAreaSolid
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable CurveBoundedSurface from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : CurveBoundedSurface from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetSweptArea(me : mutable; aSweptArea : mutable CurveBoundedSurface);
-	SweptArea (me) returns mutable CurveBoundedSurface;
+	SetSweptArea(me : mutable; aSweptArea : CurveBoundedSurface);
+	SweptArea (me) returns CurveBoundedSurface;
 
 fields
 
diff --git a/src/StepShape/StepShape_SweptFaceSolid.cdl b/src/StepShape/StepShape_SweptFaceSolid.cdl
index 1b354a04de..c3266ff459 100644
--- a/src/StepShape/StepShape_SweptFaceSolid.cdl
+++ b/src/StepShape/StepShape_SweptFaceSolid.cdl
@@ -22,21 +22,21 @@ uses
     	FaceSurface from StepShape
 
 is
-    	Create returns mutable SweptFaceSolid;
+    	Create returns SweptFaceSolid;
 	---Purpose: Returns a SweptFaceSolid
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aSweptArea : mutable FaceSurface from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aSweptArea : FaceSurface from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetSweptFace(me : mutable; aSweptArea : mutable FaceSurface from StepShape) is virtual;
-	SweptFace (me) returns mutable FaceSurface from StepShape is virtual;
+	SetSweptFace(me : mutable; aSweptArea : FaceSurface from StepShape) is virtual;
+	SweptFace (me) returns FaceSurface from StepShape is virtual;
 
     	
 fields
diff --git a/src/StepShape/StepShape_ToleranceValue.cdl b/src/StepShape/StepShape_ToleranceValue.cdl
index 5a50eb3141..7cd9740ab1 100644
--- a/src/StepShape/StepShape_ToleranceValue.cdl
+++ b/src/StepShape/StepShape_ToleranceValue.cdl
@@ -24,7 +24,7 @@ uses
 
 is
 
-    Create returns mutable ToleranceValue;
+    Create returns ToleranceValue;
 
     Init (me : mutable; lower_bound, upper_bound : MeasureWithUnit from StepBasic);
 
diff --git a/src/StepShape/StepShape_TopologicalRepresentationItem.cdl b/src/StepShape/StepShape_TopologicalRepresentationItem.cdl
index 06cc78720e..10e78d8d18 100644
--- a/src/StepShape/StepShape_TopologicalRepresentationItem.cdl
+++ b/src/StepShape/StepShape_TopologicalRepresentationItem.cdl
@@ -28,7 +28,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable TopologicalRepresentationItem;
+	Create returns TopologicalRepresentationItem;
 	---Purpose: Returns a TopologicalRepresentationItem
 
 
diff --git a/src/StepShape/StepShape_Torus.cdl b/src/StepShape/StepShape_Torus.cdl
index 7516e974dd..5f7d50c1d9 100644
--- a/src/StepShape/StepShape_Torus.cdl
+++ b/src/StepShape/StepShape_Torus.cdl
@@ -25,23 +25,23 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Torus;
+	Create returns Torus;
 	---Purpose: Returns a Torus
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPosition : mutable Axis1Placement from StepGeom;
+	      aName : HAsciiString from TCollection;
+	      aPosition : Axis1Placement from StepGeom;
 	      aMajorRadius : Real from Standard;
 	      aMinorRadius : Real from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetPosition(me : mutable; aPosition : mutable Axis1Placement);
-	Position (me) returns mutable Axis1Placement;
+	SetPosition(me : mutable; aPosition : Axis1Placement);
+	Position (me) returns Axis1Placement;
 	SetMajorRadius(me : mutable; aMajorRadius : Real);
 	MajorRadius (me) returns Real;
 	SetMinorRadius(me : mutable; aMinorRadius : Real);
diff --git a/src/StepShape/StepShape_TransitionalShapeRepresentation.cdl b/src/StepShape/StepShape_TransitionalShapeRepresentation.cdl
index 9c08d14be3..28e2e295e5 100644
--- a/src/StepShape/StepShape_TransitionalShapeRepresentation.cdl
+++ b/src/StepShape/StepShape_TransitionalShapeRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable TransitionalShapeRepresentation;
+	Create returns TransitionalShapeRepresentation;
 	---Purpose: Returns a TransitionalShapeRepresentation
 
 
diff --git a/src/StepShape/StepShape_TypeQualifier.cdl b/src/StepShape/StepShape_TypeQualifier.cdl
index 9aa71cb206..6c6c7e5212 100644
--- a/src/StepShape/StepShape_TypeQualifier.cdl
+++ b/src/StepShape/StepShape_TypeQualifier.cdl
@@ -22,7 +22,7 @@ uses
 
 is
 
-    Create returns mutable TypeQualifier;
+    Create returns TypeQualifier;
 
     Init (me : mutable; name : HAsciiString from TCollection);
 
diff --git a/src/StepShape/StepShape_Vertex.cdl b/src/StepShape/StepShape_Vertex.cdl
index 057412f4c2..639e942bce 100644
--- a/src/StepShape/StepShape_Vertex.cdl
+++ b/src/StepShape/StepShape_Vertex.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable Vertex;
+	Create returns Vertex;
 	---Purpose: Returns a Vertex
 
 
diff --git a/src/StepShape/StepShape_VertexLoop.cdl b/src/StepShape/StepShape_VertexLoop.cdl
index 35c4fba2b2..a236654e64 100644
--- a/src/StepShape/StepShape_VertexLoop.cdl
+++ b/src/StepShape/StepShape_VertexLoop.cdl
@@ -24,21 +24,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable VertexLoop;
+	Create returns VertexLoop;
 	---Purpose: Returns a VertexLoop
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLoopVertex : mutable Vertex from StepShape) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aLoopVertex : Vertex from StepShape) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetLoopVertex(me : mutable; aLoopVertex : mutable Vertex);
-	LoopVertex (me) returns mutable Vertex;
+	SetLoopVertex(me : mutable; aLoopVertex : Vertex);
+	LoopVertex (me) returns Vertex;
 
 fields
 
diff --git a/src/StepShape/StepShape_VertexPoint.cdl b/src/StepShape/StepShape_VertexPoint.cdl
index bc3b75613e..374ffd6eb1 100644
--- a/src/StepShape/StepShape_VertexPoint.cdl
+++ b/src/StepShape/StepShape_VertexPoint.cdl
@@ -27,21 +27,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable VertexPoint;
+	Create returns VertexPoint;
 	---Purpose: Returns a VertexPoint
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aVertexGeometry : mutable Point from StepGeom) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aVertexGeometry : Point from StepGeom) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetVertexGeometry(me : mutable; aVertexGeometry : mutable Point);
-	VertexGeometry (me) returns mutable Point;
+	SetVertexGeometry(me : mutable; aVertexGeometry : Point);
+	VertexGeometry (me) returns Point;
 
 fields
 
diff --git a/src/StepToTopoDS/StepToTopoDS_MakeTransformed.cdl b/src/StepToTopoDS/StepToTopoDS_MakeTransformed.cdl
index 7b7581949d..79260e6f91 100644
--- a/src/StepToTopoDS/StepToTopoDS_MakeTransformed.cdl
+++ b/src/StepToTopoDS/StepToTopoDS_MakeTransformed.cdl
@@ -48,7 +48,7 @@ is
 
 
     TranslateMappedItem (me : in out; mapit : MappedItem from StepRepr;
-    	    	    	 TP : mutable TransientProcess from Transfer)
+    	    	    	 TP : TransientProcess from Transfer)
     	returns Shape;
     ---Purpose : Translates a MappedItem. More precisely
     --           A MappedItem has a MappingSource and a MappingTarget
diff --git a/src/StepVisual/StepVisual_AnnotationOccurrence.cdl b/src/StepVisual/StepVisual_AnnotationOccurrence.cdl
index eae103bf45..c33d8d8604 100644
--- a/src/StepVisual/StepVisual_AnnotationOccurrence.cdl
+++ b/src/StepVisual/StepVisual_AnnotationOccurrence.cdl
@@ -25,7 +25,7 @@ uses
 
 is
 
-	Create returns mutable AnnotationOccurrence;
+	Create returns AnnotationOccurrence;
 	---Purpose: Returns a AnnotationOccurrence
 
 
diff --git a/src/StepVisual/StepVisual_AnnotationText.cdl b/src/StepVisual/StepVisual_AnnotationText.cdl
index 33e62980e3..4a923e3f8b 100644
--- a/src/StepVisual/StepVisual_AnnotationText.cdl
+++ b/src/StepVisual/StepVisual_AnnotationText.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationItem from StepRepr
 is
 
-	Create returns mutable AnnotationText;
+	Create returns AnnotationText;
 	---Purpose: Returns a AnnotationText
 
 
diff --git a/src/StepVisual/StepVisual_AnnotationTextOccurrence.cdl b/src/StepVisual/StepVisual_AnnotationTextOccurrence.cdl
index 98d9127959..79ffe924c1 100644
--- a/src/StepVisual/StepVisual_AnnotationTextOccurrence.cdl
+++ b/src/StepVisual/StepVisual_AnnotationTextOccurrence.cdl
@@ -25,7 +25,7 @@ uses
 
 is
 
-	Create returns mutable AnnotationTextOccurrence;
+	Create returns AnnotationTextOccurrence;
 	---Purpose: Returns a AnnotationTextOccurrence
 
 
diff --git a/src/StepVisual/StepVisual_AreaInSet.cdl b/src/StepVisual/StepVisual_AreaInSet.cdl
index 5a0da80b68..211688ef70 100644
--- a/src/StepVisual/StepVisual_AreaInSet.cdl
+++ b/src/StepVisual/StepVisual_AreaInSet.cdl
@@ -24,19 +24,19 @@ uses
 	PresentationSet from StepVisual
 is
 
-	Create returns mutable AreaInSet;
+	Create returns AreaInSet;
 	---Purpose: Returns a AreaInSet
 
 	Init (me : mutable;
-	      aArea : mutable PresentationArea from StepVisual;
-	      aInSet : mutable PresentationSet from StepVisual) is virtual;
+	      aArea : PresentationArea from StepVisual;
+	      aInSet : PresentationSet from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetArea(me : mutable; aArea : mutable PresentationArea);
-	Area (me) returns mutable PresentationArea;
-	SetInSet(me : mutable; aInSet : mutable PresentationSet);
-	InSet (me) returns mutable PresentationSet;
+	SetArea(me : mutable; aArea : PresentationArea);
+	Area (me) returns PresentationArea;
+	SetInSet(me : mutable; aInSet : PresentationSet);
+	InSet (me) returns PresentationSet;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_BackgroundColour.cdl b/src/StepVisual/StepVisual_BackgroundColour.cdl
index f522f35322..870c5e5438 100644
--- a/src/StepVisual/StepVisual_BackgroundColour.cdl
+++ b/src/StepVisual/StepVisual_BackgroundColour.cdl
@@ -23,7 +23,7 @@ uses
 	AreaOrView from StepVisual
 is
 
-	Create returns mutable BackgroundColour;
+	Create returns BackgroundColour;
 	---Purpose: Returns a BackgroundColour
 
 	Init (me : mutable;
diff --git a/src/StepVisual/StepVisual_CameraImage.cdl b/src/StepVisual/StepVisual_CameraImage.cdl
index 3b61b59633..18bb205b95 100644
--- a/src/StepVisual/StepVisual_CameraImage.cdl
+++ b/src/StepVisual/StepVisual_CameraImage.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationItem from StepRepr
 is
 
-	Create returns mutable CameraImage;
+	Create returns CameraImage;
 	---Purpose: Returns a CameraImage
 
 
diff --git a/src/StepVisual/StepVisual_CameraImage2dWithScale.cdl b/src/StepVisual/StepVisual_CameraImage2dWithScale.cdl
index de9962a2c9..b4a91e88ba 100644
--- a/src/StepVisual/StepVisual_CameraImage2dWithScale.cdl
+++ b/src/StepVisual/StepVisual_CameraImage2dWithScale.cdl
@@ -18,6 +18,6 @@ class CameraImage2dWithScale  from StepVisual    inherits CameraImage  from Step
 
 is
 
-    Create returns mutable CameraImage2dWithScale;
+    Create returns CameraImage2dWithScale;
 
 end CameraImage2dWithScale;
diff --git a/src/StepVisual/StepVisual_CameraImage3dWithScale.cdl b/src/StepVisual/StepVisual_CameraImage3dWithScale.cdl
index c1724ef28a..e276fb81f8 100644
--- a/src/StepVisual/StepVisual_CameraImage3dWithScale.cdl
+++ b/src/StepVisual/StepVisual_CameraImage3dWithScale.cdl
@@ -18,6 +18,6 @@ class CameraImage3dWithScale  from StepVisual    inherits CameraImage  from Step
 
 is
 
-    Create returns mutable CameraImage3dWithScale;
+    Create returns CameraImage3dWithScale;
 
 end CameraImage3dWithScale;
diff --git a/src/StepVisual/StepVisual_CameraModel.cdl b/src/StepVisual/StepVisual_CameraModel.cdl
index 233ce8d760..c423c1b96e 100644
--- a/src/StepVisual/StepVisual_CameraModel.cdl
+++ b/src/StepVisual/StepVisual_CameraModel.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CameraModel;
+	Create returns CameraModel;
 	---Purpose: Returns a CameraModel
 
 
diff --git a/src/StepVisual/StepVisual_CameraModelD2.cdl b/src/StepVisual/StepVisual_CameraModelD2.cdl
index 13555488db..d24a3e922a 100644
--- a/src/StepVisual/StepVisual_CameraModelD2.cdl
+++ b/src/StepVisual/StepVisual_CameraModelD2.cdl
@@ -25,22 +25,22 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CameraModelD2;
+	Create returns CameraModelD2;
 	---Purpose: Returns a CameraModelD2
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aViewWindow : mutable PlanarBox from StepVisual;
+	      aName : HAsciiString from TCollection;
+	      aViewWindow : PlanarBox from StepVisual;
 	      aViewWindowClipping : Boolean from Standard) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetViewWindow(me : mutable; aViewWindow : mutable PlanarBox);
-	ViewWindow (me) returns mutable PlanarBox;
+	SetViewWindow(me : mutable; aViewWindow : PlanarBox);
+	ViewWindow (me) returns PlanarBox;
 	SetViewWindowClipping(me : mutable; aViewWindowClipping : Boolean);
 	ViewWindowClipping (me) returns Boolean;
 
diff --git a/src/StepVisual/StepVisual_CameraModelD3.cdl b/src/StepVisual/StepVisual_CameraModelD3.cdl
index b2160fa009..915cc9299f 100644
--- a/src/StepVisual/StepVisual_CameraModelD3.cdl
+++ b/src/StepVisual/StepVisual_CameraModelD3.cdl
@@ -25,24 +25,24 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CameraModelD3;
+	Create returns CameraModelD3;
 	---Purpose: Returns a CameraModelD3
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aViewReferenceSystem : mutable Axis2Placement3d from StepGeom;
-	      aPerspectiveOfVolume : mutable ViewVolume from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aViewReferenceSystem : Axis2Placement3d from StepGeom;
+	      aPerspectiveOfVolume : ViewVolume from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetViewReferenceSystem(me : mutable; aViewReferenceSystem : mutable Axis2Placement3d);
-	ViewReferenceSystem (me) returns mutable Axis2Placement3d;
-	SetPerspectiveOfVolume(me : mutable; aPerspectiveOfVolume : mutable ViewVolume);
-	PerspectiveOfVolume (me) returns mutable ViewVolume;
+	SetViewReferenceSystem(me : mutable; aViewReferenceSystem : Axis2Placement3d);
+	ViewReferenceSystem (me) returns Axis2Placement3d;
+	SetPerspectiveOfVolume(me : mutable; aPerspectiveOfVolume : ViewVolume);
+	PerspectiveOfVolume (me) returns ViewVolume;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_CameraUsage.cdl b/src/StepVisual/StepVisual_CameraUsage.cdl
index c7ba28f764..0218d34246 100644
--- a/src/StepVisual/StepVisual_CameraUsage.cdl
+++ b/src/StepVisual/StepVisual_CameraUsage.cdl
@@ -24,7 +24,7 @@ uses
 	Representation from StepRepr
 is
 
-	Create returns mutable CameraUsage;
+	Create returns CameraUsage;
 	---Purpose: Returns a CameraUsage
 
 
diff --git a/src/StepVisual/StepVisual_Colour.cdl b/src/StepVisual/StepVisual_Colour.cdl
index 0d47221dbe..2015a6b0ef 100644
--- a/src/StepVisual/StepVisual_Colour.cdl
+++ b/src/StepVisual/StepVisual_Colour.cdl
@@ -20,7 +20,7 @@ inherits TShared from MMgt
 
 is
 
-	Create returns mutable Colour;
+	Create returns Colour;
 	---Purpose: Returns a Colour
 
 
diff --git a/src/StepVisual/StepVisual_ColourRgb.cdl b/src/StepVisual/StepVisual_ColourRgb.cdl
index 57a38d6e21..f0ced34290 100644
--- a/src/StepVisual/StepVisual_ColourRgb.cdl
+++ b/src/StepVisual/StepVisual_ColourRgb.cdl
@@ -24,15 +24,15 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ColourRgb;
+	Create returns ColourRgb;
 	---Purpose: Returns a ColourRgb
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aRed : Real from Standard;
 	      aGreen : Real from Standard;
 	      aBlue : Real from Standard) is virtual;
diff --git a/src/StepVisual/StepVisual_ColourSpecification.cdl b/src/StepVisual/StepVisual_ColourSpecification.cdl
index 24e3fd80ce..08bff58a05 100644
--- a/src/StepVisual/StepVisual_ColourSpecification.cdl
+++ b/src/StepVisual/StepVisual_ColourSpecification.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable ColourSpecification;
+	Create returns ColourSpecification;
 	---Purpose: Returns a ColourSpecification
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_CompositeText.cdl b/src/StepVisual/StepVisual_CompositeText.cdl
index b772451cc0..39637885d4 100644
--- a/src/StepVisual/StepVisual_CompositeText.cdl
+++ b/src/StepVisual/StepVisual_CompositeText.cdl
@@ -25,21 +25,21 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable CompositeText;
+	Create returns CompositeText;
 	---Purpose: Returns a CompositeText
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCollectedText : mutable HArray1OfTextOrCharacter from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aCollectedText : HArray1OfTextOrCharacter from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetCollectedText(me : mutable; aCollectedText : mutable HArray1OfTextOrCharacter);
-	CollectedText (me) returns mutable HArray1OfTextOrCharacter;
+	SetCollectedText(me : mutable; aCollectedText : HArray1OfTextOrCharacter);
+	CollectedText (me) returns HArray1OfTextOrCharacter;
 	CollectedTextValue (me; num : Integer) returns TextOrCharacter;
 	NbCollectedText (me) returns Integer;
 
diff --git a/src/StepVisual/StepVisual_CompositeTextWithExtent.cdl b/src/StepVisual/StepVisual_CompositeTextWithExtent.cdl
index 4d078d251b..ba73393a55 100644
--- a/src/StepVisual/StepVisual_CompositeTextWithExtent.cdl
+++ b/src/StepVisual/StepVisual_CompositeTextWithExtent.cdl
@@ -25,23 +25,23 @@ uses
 	HArray1OfTextOrCharacter from StepVisual
 is
 
-	Create returns mutable CompositeTextWithExtent;
+	Create returns CompositeTextWithExtent;
 	---Purpose: Returns a CompositeTextWithExtent
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCollectedText : mutable HArray1OfTextOrCharacter from StepVisual) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aCollectedText : HArray1OfTextOrCharacter from StepVisual) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCollectedText : mutable HArray1OfTextOrCharacter from StepVisual;
-	      aExtent : mutable PlanarExtent from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aCollectedText : HArray1OfTextOrCharacter from StepVisual;
+	      aExtent : PlanarExtent from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetExtent(me : mutable; aExtent : mutable PlanarExtent);
-	Extent (me) returns mutable PlanarExtent;
+	SetExtent(me : mutable; aExtent : PlanarExtent);
+	Extent (me) returns PlanarExtent;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_ContextDependentInvisibility.cdl b/src/StepVisual/StepVisual_ContextDependentInvisibility.cdl
index f7520753c7..1ca250da57 100644
--- a/src/StepVisual/StepVisual_ContextDependentInvisibility.cdl
+++ b/src/StepVisual/StepVisual_ContextDependentInvisibility.cdl
@@ -24,15 +24,15 @@ uses
 	HArray1OfInvisibleItem from StepVisual
 is
 
-	Create returns mutable ContextDependentInvisibility;
+	Create returns ContextDependentInvisibility;
 	---Purpose: Returns a ContextDependentInvisibility
 
 
 	Init (me : mutable;
-	      aInvisibleItems : mutable HArray1OfInvisibleItem from StepVisual) is redefined;
+	      aInvisibleItems : HArray1OfInvisibleItem from StepVisual) is redefined;
 
 	Init (me : mutable;
-	      aInvisibleItems : mutable HArray1OfInvisibleItem from StepVisual;
+	      aInvisibleItems : HArray1OfInvisibleItem from StepVisual;
 	      aPresentationContext : InvisibilityContext from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cdl b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cdl
index f9425f225c..b76f555e71 100644
--- a/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cdl
+++ b/src/StepVisual/StepVisual_ContextDependentOverRidingStyledItem.cdl
@@ -28,27 +28,27 @@ uses
 	StyledItem from StepVisual
 is
 
-	Create returns mutable ContextDependentOverRidingStyledItem;
+	Create returns ContextDependentOverRidingStyledItem;
 	---Purpose: Returns a ContextDependentOverRidingStyledItem
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aStyles : mutable HArray1OfPresentationStyleAssignment from StepVisual;
-	      aItem : mutable RepresentationItem from StepRepr;
-	      aOverRiddenStyle : mutable StyledItem from StepVisual) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aStyles : HArray1OfPresentationStyleAssignment from StepVisual;
+	      aItem : RepresentationItem from StepRepr;
+	      aOverRiddenStyle : StyledItem from StepVisual) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aStyles : mutable HArray1OfPresentationStyleAssignment from StepVisual;
-	      aItem : mutable RepresentationItem from StepRepr;
-	      aOverRiddenStyle : mutable StyledItem from StepVisual;
-	      aStyleContext : mutable HArray1OfStyleContextSelect from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aStyles : HArray1OfPresentationStyleAssignment from StepVisual;
+	      aItem : RepresentationItem from StepRepr;
+	      aOverRiddenStyle : StyledItem from StepVisual;
+	      aStyleContext : HArray1OfStyleContextSelect from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStyleContext(me : mutable; aStyleContext : mutable HArray1OfStyleContextSelect);
-	StyleContext (me) returns mutable HArray1OfStyleContextSelect;
+	SetStyleContext(me : mutable; aStyleContext : HArray1OfStyleContextSelect);
+	StyleContext (me) returns HArray1OfStyleContextSelect;
 	StyleContextValue (me; num : Integer) returns StyleContextSelect;
 	NbStyleContext (me) returns Integer;
 
diff --git a/src/StepVisual/StepVisual_CurveStyle.cdl b/src/StepVisual/StepVisual_CurveStyle.cdl
index 4fceada7c5..6e77a1c58f 100644
--- a/src/StepVisual/StepVisual_CurveStyle.cdl
+++ b/src/StepVisual/StepVisual_CurveStyle.cdl
@@ -26,25 +26,25 @@ uses
 	Colour from StepVisual
 is
 
-	Create returns mutable CurveStyle;
+	Create returns CurveStyle;
 	---Purpose: Returns a CurveStyle
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aCurveFont : CurveStyleFontSelect from StepVisual;
 	      aCurveWidth : SizeSelect from StepBasic;
-	      aCurveColour : mutable Colour from StepVisual) is virtual;
+	      aCurveColour : Colour from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 	SetCurveFont(me : mutable; aCurveFont : CurveStyleFontSelect);
 	CurveFont (me) returns CurveStyleFontSelect;
 	SetCurveWidth(me : mutable; aCurveWidth : SizeSelect);
 	CurveWidth (me) returns SizeSelect;
-	SetCurveColour(me : mutable; aCurveColour : mutable Colour);
-	CurveColour (me) returns mutable Colour;
+	SetCurveColour(me : mutable; aCurveColour : Colour);
+	CurveColour (me) returns Colour;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_CurveStyleFont.cdl b/src/StepVisual/StepVisual_CurveStyleFont.cdl
index 94c7fea663..56033a99c1 100644
--- a/src/StepVisual/StepVisual_CurveStyleFont.cdl
+++ b/src/StepVisual/StepVisual_CurveStyleFont.cdl
@@ -25,20 +25,20 @@ uses
 	CurveStyleFontPattern from StepVisual
 is
 
-	Create returns mutable CurveStyleFont;
+	Create returns CurveStyleFont;
 	---Purpose: Returns a CurveStyleFont
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aPatternList : mutable HArray1OfCurveStyleFontPattern from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aPatternList : HArray1OfCurveStyleFontPattern from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetPatternList(me : mutable; aPatternList : mutable HArray1OfCurveStyleFontPattern);
-	PatternList (me) returns mutable HArray1OfCurveStyleFontPattern;
-	PatternListValue (me; num : Integer) returns mutable CurveStyleFontPattern;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetPatternList(me : mutable; aPatternList : HArray1OfCurveStyleFontPattern);
+	PatternList (me) returns HArray1OfCurveStyleFontPattern;
+	PatternListValue (me; num : Integer) returns CurveStyleFontPattern;
 	NbPatternList (me) returns Integer;
 
 fields
diff --git a/src/StepVisual/StepVisual_CurveStyleFontPattern.cdl b/src/StepVisual/StepVisual_CurveStyleFontPattern.cdl
index ea5bec4a26..8f7ddc2fd6 100644
--- a/src/StepVisual/StepVisual_CurveStyleFontPattern.cdl
+++ b/src/StepVisual/StepVisual_CurveStyleFontPattern.cdl
@@ -23,7 +23,7 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable CurveStyleFontPattern;
+	Create returns CurveStyleFontPattern;
 	---Purpose: Returns a CurveStyleFontPattern
 
 	Init (me : mutable;
diff --git a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cdl b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cdl
index e7fde31213..11bfea6c9d 100644
--- a/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cdl
+++ b/src/StepVisual/StepVisual_DraughtingAnnotationOccurrence.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationItem from StepRepr
 is
 
-	Create returns mutable DraughtingAnnotationOccurrence;
+	Create returns DraughtingAnnotationOccurrence;
 	---Purpose: Returns a DraughtingAnnotationOccurrence
 
 
diff --git a/src/StepVisual/StepVisual_DraughtingPreDefinedColour.cdl b/src/StepVisual/StepVisual_DraughtingPreDefinedColour.cdl
index de4c910fac..5aface7710 100644
--- a/src/StepVisual/StepVisual_DraughtingPreDefinedColour.cdl
+++ b/src/StepVisual/StepVisual_DraughtingPreDefinedColour.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable DraughtingPreDefinedColour;
+	Create returns DraughtingPreDefinedColour;
 	---Purpose: Returns a DraughtingPreDefinedColour
 
 
diff --git a/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.cdl b/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.cdl
index 97955a2897..74fc38387a 100644
--- a/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.cdl
+++ b/src/StepVisual/StepVisual_DraughtingPreDefinedCurveFont.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable DraughtingPreDefinedCurveFont;
+	Create returns DraughtingPreDefinedCurveFont;
 	---Purpose: Returns a DraughtingPreDefinedCurveFont
 
 
diff --git a/src/StepVisual/StepVisual_FillAreaStyle.cdl b/src/StepVisual/StepVisual_FillAreaStyle.cdl
index 4faf9f40b7..526bbb5628 100644
--- a/src/StepVisual/StepVisual_FillAreaStyle.cdl
+++ b/src/StepVisual/StepVisual_FillAreaStyle.cdl
@@ -25,19 +25,19 @@ uses
 	FillStyleSelect from StepVisual
 is
 
-	Create returns mutable FillAreaStyle;
+	Create returns FillAreaStyle;
 	---Purpose: Returns a FillAreaStyle
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aFillStyles : mutable HArray1OfFillStyleSelect from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aFillStyles : HArray1OfFillStyleSelect from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetFillStyles(me : mutable; aFillStyles : mutable HArray1OfFillStyleSelect);
-	FillStyles (me) returns mutable HArray1OfFillStyleSelect;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetFillStyles(me : mutable; aFillStyles : HArray1OfFillStyleSelect);
+	FillStyles (me) returns HArray1OfFillStyleSelect;
 	FillStylesValue (me; num : Integer) returns FillStyleSelect;
 	NbFillStyles (me) returns Integer;
 
diff --git a/src/StepVisual/StepVisual_FillAreaStyleColour.cdl b/src/StepVisual/StepVisual_FillAreaStyleColour.cdl
index 7adab728ca..918e236091 100644
--- a/src/StepVisual/StepVisual_FillAreaStyleColour.cdl
+++ b/src/StepVisual/StepVisual_FillAreaStyleColour.cdl
@@ -24,19 +24,19 @@ uses
 	Colour from StepVisual
 is
 
-	Create returns mutable FillAreaStyleColour;
+	Create returns FillAreaStyleColour;
 	---Purpose: Returns a FillAreaStyleColour
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aFillColour : mutable Colour from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aFillColour : Colour from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetFillColour(me : mutable; aFillColour : mutable Colour);
-	FillColour (me) returns mutable Colour;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetFillColour(me : mutable; aFillColour : Colour);
+	FillColour (me) returns Colour;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_Invisibility.cdl b/src/StepVisual/StepVisual_Invisibility.cdl
index 475cc6ee2f..7b70c92a2b 100644
--- a/src/StepVisual/StepVisual_Invisibility.cdl
+++ b/src/StepVisual/StepVisual_Invisibility.cdl
@@ -24,16 +24,16 @@ uses
 	InvisibleItem from StepVisual
 is
 
-	Create returns mutable Invisibility;
+	Create returns Invisibility;
 	---Purpose: Returns a Invisibility
 
 	Init (me : mutable;
-	      aInvisibleItems : mutable HArray1OfInvisibleItem from StepVisual) is virtual;
+	      aInvisibleItems : HArray1OfInvisibleItem from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetInvisibleItems(me : mutable; aInvisibleItems : mutable HArray1OfInvisibleItem);
-	InvisibleItems (me) returns mutable HArray1OfInvisibleItem;
+	SetInvisibleItems(me : mutable; aInvisibleItems : HArray1OfInvisibleItem);
+	InvisibleItems (me) returns HArray1OfInvisibleItem;
 	InvisibleItemsValue (me; num : Integer) returns InvisibleItem;
 	NbInvisibleItems (me) returns Integer;
 
diff --git a/src/StepVisual/StepVisual_MarkerMember.cdl b/src/StepVisual/StepVisual_MarkerMember.cdl
index df2d5a7e00..bf5b6db102 100644
--- a/src/StepVisual/StepVisual_MarkerMember.cdl
+++ b/src/StepVisual/StepVisual_MarkerMember.cdl
@@ -23,7 +23,7 @@ uses CString, MarkerType from StepVisual
 
 is
 
-    Create returns mutable MarkerMember;
+    Create returns MarkerMember;
 
     HasName (me) returns Boolean  is redefined;
     -- returns True
diff --git a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.cdl b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.cdl
index 73f01862f7..964b5ae5cf 100644
--- a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.cdl
+++ b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationArea.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable MechanicalDesignGeometricPresentationArea;
+	Create returns MechanicalDesignGeometricPresentationArea;
 	---Purpose: Returns a MechanicalDesignGeometricPresentationArea
 
 
diff --git a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.cdl b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.cdl
index f0af33f3fe..de3af0eff4 100644
--- a/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.cdl
+++ b/src/StepVisual/StepVisual_MechanicalDesignGeometricPresentationRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable MechanicalDesignGeometricPresentationRepresentation;
+	Create returns MechanicalDesignGeometricPresentationRepresentation;
 	---Purpose: Returns a MechanicalDesignGeometricPresentationRepresentation
 
 
diff --git a/src/StepVisual/StepVisual_OverRidingStyledItem.cdl b/src/StepVisual/StepVisual_OverRidingStyledItem.cdl
index 4f6b9bb8cf..13e3c65fc5 100644
--- a/src/StepVisual/StepVisual_OverRidingStyledItem.cdl
+++ b/src/StepVisual/StepVisual_OverRidingStyledItem.cdl
@@ -25,25 +25,25 @@ uses
 	RepresentationItem from StepRepr
 is
 
-	Create returns mutable OverRidingStyledItem;
+	Create returns OverRidingStyledItem;
 	---Purpose: Returns a OverRidingStyledItem
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aStyles : mutable HArray1OfPresentationStyleAssignment from StepVisual;
-	      aItem : mutable RepresentationItem from StepRepr) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aStyles : HArray1OfPresentationStyleAssignment from StepVisual;
+	      aItem : RepresentationItem from StepRepr) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aStyles : mutable HArray1OfPresentationStyleAssignment from StepVisual;
-	      aItem : mutable RepresentationItem from StepRepr;
-	      aOverRiddenStyle : mutable StyledItem from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aStyles : HArray1OfPresentationStyleAssignment from StepVisual;
+	      aItem : RepresentationItem from StepRepr;
+	      aOverRiddenStyle : StyledItem from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetOverRiddenStyle(me : mutable; aOverRiddenStyle : mutable StyledItem);
-	OverRiddenStyle (me) returns mutable StyledItem;
+	SetOverRiddenStyle(me : mutable; aOverRiddenStyle : StyledItem);
+	OverRiddenStyle (me) returns StyledItem;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_PlanarBox.cdl b/src/StepVisual/StepVisual_PlanarBox.cdl
index 3b2b95d55f..2ea4ec1af9 100644
--- a/src/StepVisual/StepVisual_PlanarBox.cdl
+++ b/src/StepVisual/StepVisual_PlanarBox.cdl
@@ -25,17 +25,17 @@ uses
 	Real from Standard
 is
 
-	Create returns mutable PlanarBox;
+	Create returns PlanarBox;
 	---Purpose: Returns a PlanarBox
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aSizeInX : Real from Standard;
 	      aSizeInY : Real from Standard) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aSizeInX : Real from Standard;
 	      aSizeInY : Real from Standard;
 	      aPlacement : Axis2Placement from StepGeom) is virtual;
diff --git a/src/StepVisual/StepVisual_PlanarExtent.cdl b/src/StepVisual/StepVisual_PlanarExtent.cdl
index d0c3a5202c..b3fd3212e2 100644
--- a/src/StepVisual/StepVisual_PlanarExtent.cdl
+++ b/src/StepVisual/StepVisual_PlanarExtent.cdl
@@ -24,15 +24,15 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PlanarExtent;
+	Create returns PlanarExtent;
 	---Purpose: Returns a PlanarExtent
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aSizeInX : Real from Standard;
 	      aSizeInY : Real from Standard) is virtual;
 
diff --git a/src/StepVisual/StepVisual_PointStyle.cdl b/src/StepVisual/StepVisual_PointStyle.cdl
index de59663922..0784c515e1 100644
--- a/src/StepVisual/StepVisual_PointStyle.cdl
+++ b/src/StepVisual/StepVisual_PointStyle.cdl
@@ -26,25 +26,25 @@ uses
 	Colour from StepVisual
 is
 
-	Create returns mutable PointStyle;
+	Create returns PointStyle;
 	---Purpose: Returns a PointStyle
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
 	      aMarker : MarkerSelect from StepVisual;
 	      aMarkerSize : SizeSelect from StepBasic;
-	      aMarkerColour : mutable Colour from StepVisual) is virtual;
+	      aMarkerColour : Colour from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 	SetMarker(me : mutable; aMarker : MarkerSelect);
 	Marker (me) returns MarkerSelect;
 	SetMarkerSize(me : mutable; aMarkerSize : SizeSelect);
 	MarkerSize (me) returns SizeSelect;
-	SetMarkerColour(me : mutable; aMarkerColour : mutable Colour);
-	MarkerColour (me) returns mutable Colour;
+	SetMarkerColour(me : mutable; aMarkerColour : Colour);
+	MarkerColour (me) returns Colour;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_PreDefinedColour.cdl b/src/StepVisual/StepVisual_PreDefinedColour.cdl
index e32e4b2593..c9db0d7e77 100644
--- a/src/StepVisual/StepVisual_PreDefinedColour.cdl
+++ b/src/StepVisual/StepVisual_PreDefinedColour.cdl
@@ -27,7 +27,7 @@ uses
 	PreDefinedItem from StepVisual
 is
 
-	Create returns mutable PreDefinedColour;
+	Create returns PreDefinedColour;
 	---Purpose: Returns a PreDefinedColour
 
     	SetPreDefinedItem (me: mutable; item: PreDefinedItem from StepVisual);
diff --git a/src/StepVisual/StepVisual_PreDefinedCurveFont.cdl b/src/StepVisual/StepVisual_PreDefinedCurveFont.cdl
index 56245848c9..4fb3601de5 100644
--- a/src/StepVisual/StepVisual_PreDefinedCurveFont.cdl
+++ b/src/StepVisual/StepVisual_PreDefinedCurveFont.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PreDefinedCurveFont;
+	Create returns PreDefinedCurveFont;
 	---Purpose: Returns a PreDefinedCurveFont
 
 
diff --git a/src/StepVisual/StepVisual_PreDefinedItem.cdl b/src/StepVisual/StepVisual_PreDefinedItem.cdl
index 59d49f27dd..666f7b558b 100644
--- a/src/StepVisual/StepVisual_PreDefinedItem.cdl
+++ b/src/StepVisual/StepVisual_PreDefinedItem.cdl
@@ -23,16 +23,16 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PreDefinedItem;
+	Create returns PreDefinedItem;
 	---Purpose: Returns a PreDefinedItem
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is virtual;
+	      aName : HAsciiString from TCollection) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_PreDefinedTextFont.cdl b/src/StepVisual/StepVisual_PreDefinedTextFont.cdl
index ab1a9cd6db..b9c34a5b69 100644
--- a/src/StepVisual/StepVisual_PreDefinedTextFont.cdl
+++ b/src/StepVisual/StepVisual_PreDefinedTextFont.cdl
@@ -23,7 +23,7 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable PreDefinedTextFont;
+	Create returns PreDefinedTextFont;
 	---Purpose: Returns a PreDefinedTextFont
 
 
diff --git a/src/StepVisual/StepVisual_PresentationArea.cdl b/src/StepVisual/StepVisual_PresentationArea.cdl
index 3ede76c97e..290796e5aa 100644
--- a/src/StepVisual/StepVisual_PresentationArea.cdl
+++ b/src/StepVisual/StepVisual_PresentationArea.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable PresentationArea;
+	Create returns PresentationArea;
 	---Purpose: Returns a PresentationArea
 
 
diff --git a/src/StepVisual/StepVisual_PresentationLayerAssignment.cdl b/src/StepVisual/StepVisual_PresentationLayerAssignment.cdl
index a7c6133676..68485712cc 100644
--- a/src/StepVisual/StepVisual_PresentationLayerAssignment.cdl
+++ b/src/StepVisual/StepVisual_PresentationLayerAssignment.cdl
@@ -25,22 +25,22 @@ uses
 	LayeredItem from StepVisual
 is
 
-	Create returns mutable PresentationLayerAssignment;
+	Create returns PresentationLayerAssignment;
 	---Purpose: Returns a PresentationLayerAssignment
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aDescription : mutable HAsciiString from TCollection;
-	      aAssignedItems : mutable HArray1OfLayeredItem from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aDescription : HAsciiString from TCollection;
+	      aAssignedItems : HArray1OfLayeredItem from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetDescription(me : mutable; aDescription : mutable HAsciiString);
-	Description (me) returns mutable HAsciiString;
-	SetAssignedItems(me : mutable; aAssignedItems : mutable HArray1OfLayeredItem);
-	AssignedItems (me) returns mutable HArray1OfLayeredItem;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetDescription(me : mutable; aDescription : HAsciiString);
+	Description (me) returns HAsciiString;
+	SetAssignedItems(me : mutable; aAssignedItems : HArray1OfLayeredItem);
+	AssignedItems (me) returns HArray1OfLayeredItem;
 	AssignedItemsValue (me; num : Integer) returns LayeredItem;
 	NbAssignedItems (me) returns Integer;
 
diff --git a/src/StepVisual/StepVisual_PresentationRepresentation.cdl b/src/StepVisual/StepVisual_PresentationRepresentation.cdl
index ac366282d9..c641613c3b 100644
--- a/src/StepVisual/StepVisual_PresentationRepresentation.cdl
+++ b/src/StepVisual/StepVisual_PresentationRepresentation.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable PresentationRepresentation;
+	Create returns PresentationRepresentation;
 	---Purpose: Returns a PresentationRepresentation
 
 
diff --git a/src/StepVisual/StepVisual_PresentationSet.cdl b/src/StepVisual/StepVisual_PresentationSet.cdl
index 74493b7882..a4904e9506 100644
--- a/src/StepVisual/StepVisual_PresentationSet.cdl
+++ b/src/StepVisual/StepVisual_PresentationSet.cdl
@@ -20,7 +20,7 @@ inherits TShared from MMgt
 
 is
 
-	Create returns mutable PresentationSet;
+	Create returns PresentationSet;
 	---Purpose: Returns a PresentationSet
 
 
diff --git a/src/StepVisual/StepVisual_PresentationSize.cdl b/src/StepVisual/StepVisual_PresentationSize.cdl
index 3739d2619d..b7ab0be3d5 100644
--- a/src/StepVisual/StepVisual_PresentationSize.cdl
+++ b/src/StepVisual/StepVisual_PresentationSize.cdl
@@ -24,19 +24,19 @@ uses
 	PlanarBox from StepVisual
 is
 
-	Create returns mutable PresentationSize;
+	Create returns PresentationSize;
 	---Purpose: Returns a PresentationSize
 
 	Init (me : mutable;
 	      aUnit : PresentationSizeAssignmentSelect from StepVisual;
-	      aSize : mutable PlanarBox from StepVisual) is virtual;
+	      aSize : PlanarBox from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
 	SetUnit(me : mutable; aUnit : PresentationSizeAssignmentSelect);
 	Unit (me) returns PresentationSizeAssignmentSelect;
-	SetSize(me : mutable; aSize : mutable PlanarBox);
-	Size (me) returns mutable PlanarBox;
+	SetSize(me : mutable; aSize : PlanarBox);
+	Size (me) returns PlanarBox;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_PresentationStyleAssignment.cdl b/src/StepVisual/StepVisual_PresentationStyleAssignment.cdl
index 82bf46de13..056c2c8025 100644
--- a/src/StepVisual/StepVisual_PresentationStyleAssignment.cdl
+++ b/src/StepVisual/StepVisual_PresentationStyleAssignment.cdl
@@ -24,16 +24,16 @@ uses
 	PresentationStyleSelect from StepVisual
 is
 
-	Create returns mutable PresentationStyleAssignment;
+	Create returns PresentationStyleAssignment;
 	---Purpose: Returns a PresentationStyleAssignment
 
 	Init (me : mutable;
-	      aStyles : mutable HArray1OfPresentationStyleSelect from StepVisual) is virtual;
+	      aStyles : HArray1OfPresentationStyleSelect from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStyles(me : mutable; aStyles : mutable HArray1OfPresentationStyleSelect);
-	Styles (me) returns mutable HArray1OfPresentationStyleSelect;
+	SetStyles(me : mutable; aStyles : HArray1OfPresentationStyleSelect);
+	Styles (me) returns HArray1OfPresentationStyleSelect;
 	StylesValue (me; num : Integer) returns PresentationStyleSelect;
 	NbStyles (me) returns Integer;
 
diff --git a/src/StepVisual/StepVisual_PresentationStyleByContext.cdl b/src/StepVisual/StepVisual_PresentationStyleByContext.cdl
index f3b45c46b8..3947bc015d 100644
--- a/src/StepVisual/StepVisual_PresentationStyleByContext.cdl
+++ b/src/StepVisual/StepVisual_PresentationStyleByContext.cdl
@@ -24,15 +24,15 @@ uses
 	HArray1OfPresentationStyleSelect from StepVisual
 is
 
-	Create returns mutable PresentationStyleByContext;
+	Create returns PresentationStyleByContext;
 	---Purpose: Returns a PresentationStyleByContext
 
 
 	Init (me : mutable;
-	      aStyles : mutable HArray1OfPresentationStyleSelect from StepVisual) is redefined;
+	      aStyles : HArray1OfPresentationStyleSelect from StepVisual) is redefined;
 
 	Init (me : mutable;
-	      aStyles : mutable HArray1OfPresentationStyleSelect from StepVisual;
+	      aStyles : HArray1OfPresentationStyleSelect from StepVisual;
 	      aStyleContext : StyleContextSelect from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepVisual/StepVisual_PresentationView.cdl b/src/StepVisual/StepVisual_PresentationView.cdl
index 59f8cc1867..3c6b2e2e61 100644
--- a/src/StepVisual/StepVisual_PresentationView.cdl
+++ b/src/StepVisual/StepVisual_PresentationView.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable PresentationView;
+	Create returns PresentationView;
 	---Purpose: Returns a PresentationView
 
 
diff --git a/src/StepVisual/StepVisual_PresentedItemRepresentation.cdl b/src/StepVisual/StepVisual_PresentedItemRepresentation.cdl
index ce8808dae4..48a5e57c86 100644
--- a/src/StepVisual/StepVisual_PresentedItemRepresentation.cdl
+++ b/src/StepVisual/StepVisual_PresentedItemRepresentation.cdl
@@ -24,7 +24,7 @@ uses
 
 is
 
-    Create returns mutable PresentedItemRepresentation;
+    Create returns PresentedItemRepresentation;
 
     Init (me : mutable;
     	  aPresentation : PresentationRepresentationSelect from StepVisual;
diff --git a/src/StepVisual/StepVisual_StyledItem.cdl b/src/StepVisual/StepVisual_StyledItem.cdl
index 56390d99c1..d9cde1de6c 100644
--- a/src/StepVisual/StepVisual_StyledItem.cdl
+++ b/src/StepVisual/StepVisual_StyledItem.cdl
@@ -25,26 +25,26 @@ uses
 	HAsciiString from TCollection
 is
 
-	Create returns mutable StyledItem;
+	Create returns StyledItem;
 	---Purpose: Returns a StyledItem
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aStyles : mutable HArray1OfPresentationStyleAssignment from StepVisual;
-	      aItem : mutable RepresentationItem from StepRepr) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aStyles : HArray1OfPresentationStyleAssignment from StepVisual;
+	      aItem : RepresentationItem from StepRepr) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStyles(me : mutable; aStyles : mutable HArray1OfPresentationStyleAssignment);
-	Styles (me) returns mutable HArray1OfPresentationStyleAssignment;
-	StylesValue (me; num : Integer) returns mutable PresentationStyleAssignment;
+	SetStyles(me : mutable; aStyles : HArray1OfPresentationStyleAssignment);
+	Styles (me) returns HArray1OfPresentationStyleAssignment;
+	StylesValue (me; num : Integer) returns PresentationStyleAssignment;
 	NbStyles (me) returns Integer;
-	SetItem(me : mutable; aItem : mutable RepresentationItem);
-	Item (me) returns mutable RepresentationItem;
+	SetItem(me : mutable; aItem : RepresentationItem);
+	Item (me) returns RepresentationItem;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_SurfaceSideStyle.cdl b/src/StepVisual/StepVisual_SurfaceSideStyle.cdl
index 7c997b607e..82935cc144 100644
--- a/src/StepVisual/StepVisual_SurfaceSideStyle.cdl
+++ b/src/StepVisual/StepVisual_SurfaceSideStyle.cdl
@@ -25,19 +25,19 @@ uses
 	SurfaceStyleElementSelect from StepVisual
 is
 
-	Create returns mutable SurfaceSideStyle;
+	Create returns SurfaceSideStyle;
 	---Purpose: Returns a SurfaceSideStyle
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aStyles : mutable HArray1OfSurfaceStyleElementSelect from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aStyles : HArray1OfSurfaceStyleElementSelect from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetStyles(me : mutable; aStyles : mutable HArray1OfSurfaceStyleElementSelect);
-	Styles (me) returns mutable HArray1OfSurfaceStyleElementSelect;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetStyles(me : mutable; aStyles : HArray1OfSurfaceStyleElementSelect);
+	Styles (me) returns HArray1OfSurfaceStyleElementSelect;
 	StylesValue (me; num : Integer) returns SurfaceStyleElementSelect;
 	NbStyles (me) returns Integer;
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleBoundary.cdl b/src/StepVisual/StepVisual_SurfaceStyleBoundary.cdl
index 86f0ef82c1..66792d057c 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleBoundary.cdl
+++ b/src/StepVisual/StepVisual_SurfaceStyleBoundary.cdl
@@ -23,16 +23,16 @@ uses
 	CurveStyle from StepVisual
 is
 
-	Create returns mutable SurfaceStyleBoundary;
+	Create returns SurfaceStyleBoundary;
 	---Purpose: Returns a SurfaceStyleBoundary
 
 	Init (me : mutable;
-	      aStyleOfBoundary : mutable CurveStyle from StepVisual) is virtual;
+	      aStyleOfBoundary : CurveStyle from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStyleOfBoundary(me : mutable; aStyleOfBoundary : mutable CurveStyle);
-	StyleOfBoundary (me) returns mutable CurveStyle;
+	SetStyleOfBoundary(me : mutable; aStyleOfBoundary : CurveStyle);
+	StyleOfBoundary (me) returns CurveStyle;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cdl b/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cdl
index 811725101a..3d668491bc 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cdl
+++ b/src/StepVisual/StepVisual_SurfaceStyleControlGrid.cdl
@@ -23,16 +23,16 @@ uses
 	CurveStyle from StepVisual
 is
 
-	Create returns mutable SurfaceStyleControlGrid;
+	Create returns SurfaceStyleControlGrid;
 	---Purpose: Returns a SurfaceStyleControlGrid
 
 	Init (me : mutable;
-	      aStyleOfControlGrid : mutable CurveStyle from StepVisual) is virtual;
+	      aStyleOfControlGrid : CurveStyle from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStyleOfControlGrid(me : mutable; aStyleOfControlGrid : mutable CurveStyle);
-	StyleOfControlGrid (me) returns mutable CurveStyle;
+	SetStyleOfControlGrid(me : mutable; aStyleOfControlGrid : CurveStyle);
+	StyleOfControlGrid (me) returns CurveStyle;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleFillArea.cdl b/src/StepVisual/StepVisual_SurfaceStyleFillArea.cdl
index 29791597a0..b403c7c05f 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleFillArea.cdl
+++ b/src/StepVisual/StepVisual_SurfaceStyleFillArea.cdl
@@ -23,16 +23,16 @@ uses
 	FillAreaStyle from StepVisual
 is
 
-	Create returns mutable SurfaceStyleFillArea;
+	Create returns SurfaceStyleFillArea;
 	---Purpose: Returns a SurfaceStyleFillArea
 
 	Init (me : mutable;
-	      aFillArea : mutable FillAreaStyle from StepVisual) is virtual;
+	      aFillArea : FillAreaStyle from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetFillArea(me : mutable; aFillArea : mutable FillAreaStyle);
-	FillArea (me) returns mutable FillAreaStyle;
+	SetFillArea(me : mutable; aFillArea : FillAreaStyle);
+	FillArea (me) returns FillAreaStyle;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cdl b/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cdl
index 0f720b2d06..eb545ebb0c 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cdl
+++ b/src/StepVisual/StepVisual_SurfaceStyleParameterLine.cdl
@@ -26,18 +26,18 @@ uses
 	Integer                       from Standard
 is
 
-	Create returns mutable SurfaceStyleParameterLine;
+	Create returns SurfaceStyleParameterLine;
 	---Purpose: Returns a SurfaceStyleParameterLine
 
 	Init (me : mutable;
-	      aStyleOfParameterLines : mutable CurveStyle from StepVisual;
+	      aStyleOfParameterLines : CurveStyle from StepVisual;
 	      aDirectionCounts : HArray1OfDirectionCountSelect from StepVisual) 
     	is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStyleOfParameterLines(me : mutable; aStyleOfParameterLines : mutable CurveStyle);
-	StyleOfParameterLines (me) returns mutable CurveStyle;
+	SetStyleOfParameterLines(me : mutable; aStyleOfParameterLines : CurveStyle);
+	StyleOfParameterLines (me) returns CurveStyle;
 	SetDirectionCounts(me : mutable; aDirectionCounts : HArray1OfDirectionCountSelect from StepVisual);
 	DirectionCounts (me) returns HArray1OfDirectionCountSelect from StepVisual;
 	DirectionCountsValue (me; num : Integer) returns DirectionCountSelect from StepVisual;
diff --git a/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cdl b/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cdl
index cb4657f2e5..6dd60cea53 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cdl
+++ b/src/StepVisual/StepVisual_SurfaceStyleSegmentationCurve.cdl
@@ -23,16 +23,16 @@ uses
 	CurveStyle from StepVisual
 is
 
-	Create returns mutable SurfaceStyleSegmentationCurve;
+	Create returns SurfaceStyleSegmentationCurve;
 	---Purpose: Returns a SurfaceStyleSegmentationCurve
 
 	Init (me : mutable;
-	      aStyleOfSegmentationCurve : mutable CurveStyle from StepVisual) is virtual;
+	      aStyleOfSegmentationCurve : CurveStyle from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStyleOfSegmentationCurve(me : mutable; aStyleOfSegmentationCurve : mutable CurveStyle);
-	StyleOfSegmentationCurve (me) returns mutable CurveStyle;
+	SetStyleOfSegmentationCurve(me : mutable; aStyleOfSegmentationCurve : CurveStyle);
+	StyleOfSegmentationCurve (me) returns CurveStyle;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cdl b/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cdl
index f48ec5a38b..32e95a0eb9 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cdl
+++ b/src/StepVisual/StepVisual_SurfaceStyleSilhouette.cdl
@@ -23,16 +23,16 @@ uses
 	CurveStyle from StepVisual
 is
 
-	Create returns mutable SurfaceStyleSilhouette;
+	Create returns SurfaceStyleSilhouette;
 	---Purpose: Returns a SurfaceStyleSilhouette
 
 	Init (me : mutable;
-	      aStyleOfSilhouette : mutable CurveStyle from StepVisual) is virtual;
+	      aStyleOfSilhouette : CurveStyle from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetStyleOfSilhouette(me : mutable; aStyleOfSilhouette : mutable CurveStyle);
-	StyleOfSilhouette (me) returns mutable CurveStyle;
+	SetStyleOfSilhouette(me : mutable; aStyleOfSilhouette : CurveStyle);
+	StyleOfSilhouette (me) returns CurveStyle;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_SurfaceStyleUsage.cdl b/src/StepVisual/StepVisual_SurfaceStyleUsage.cdl
index fbdef6c955..36932e4e8e 100644
--- a/src/StepVisual/StepVisual_SurfaceStyleUsage.cdl
+++ b/src/StepVisual/StepVisual_SurfaceStyleUsage.cdl
@@ -24,19 +24,19 @@ uses
 	SurfaceSideStyle from StepVisual
 is
 
-	Create returns mutable SurfaceStyleUsage;
+	Create returns SurfaceStyleUsage;
 	---Purpose: Returns a SurfaceStyleUsage
 
 	Init (me : mutable;
 	      aSide : SurfaceSide from StepVisual;
-	      aStyle : mutable SurfaceSideStyle from StepVisual) is virtual;
+	      aStyle : SurfaceSideStyle from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
 	SetSide(me : mutable; aSide : SurfaceSide);
 	Side (me) returns SurfaceSide;
-	SetStyle(me : mutable; aStyle : mutable SurfaceSideStyle);
-	Style (me) returns mutable SurfaceSideStyle;
+	SetStyle(me : mutable; aStyle : SurfaceSideStyle);
+	Style (me) returns SurfaceSideStyle;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_Template.cdl b/src/StepVisual/StepVisual_Template.cdl
index 10f53ec031..98162f76b5 100644
--- a/src/StepVisual/StepVisual_Template.cdl
+++ b/src/StepVisual/StepVisual_Template.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationContext from StepRepr
 is
 
-	Create returns mutable Template;
+	Create returns Template;
 	---Purpose: Returns a Template
 
 
diff --git a/src/StepVisual/StepVisual_TemplateInstance.cdl b/src/StepVisual/StepVisual_TemplateInstance.cdl
index fa9f244c59..2a3505d316 100644
--- a/src/StepVisual/StepVisual_TemplateInstance.cdl
+++ b/src/StepVisual/StepVisual_TemplateInstance.cdl
@@ -25,7 +25,7 @@ uses
 	RepresentationItem from StepRepr
 is
 
-	Create returns mutable TemplateInstance;
+	Create returns TemplateInstance;
 	---Purpose: Returns a TemplateInstance
 
 
diff --git a/src/StepVisual/StepVisual_TextLiteral.cdl b/src/StepVisual/StepVisual_TextLiteral.cdl
index d5c8d99f87..342142a283 100644
--- a/src/StepVisual/StepVisual_TextLiteral.cdl
+++ b/src/StepVisual/StepVisual_TextLiteral.cdl
@@ -26,29 +26,29 @@ uses
 	FontSelect from StepVisual
 is
 
-	Create returns mutable TextLiteral;
+	Create returns TextLiteral;
 	---Purpose: Returns a TextLiteral
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection) is redefined;
+	      aName : HAsciiString from TCollection) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aLiteral : mutable HAsciiString from TCollection;
+	      aName : HAsciiString from TCollection;
+	      aLiteral : HAsciiString from TCollection;
 	      aPlacement : Axis2Placement from StepGeom;
-	      aAlignment : mutable HAsciiString from TCollection;
+	      aAlignment : HAsciiString from TCollection;
 	      aPath : TextPath from StepVisual;
 	      aFont : FontSelect from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetLiteral(me : mutable; aLiteral : mutable HAsciiString);
-	Literal (me) returns mutable HAsciiString;
+	SetLiteral(me : mutable; aLiteral : HAsciiString);
+	Literal (me) returns HAsciiString;
 	SetPlacement(me : mutable; aPlacement : Axis2Placement);
 	Placement (me) returns Axis2Placement;
-	SetAlignment(me : mutable; aAlignment : mutable HAsciiString);
-	Alignment (me) returns mutable HAsciiString;
+	SetAlignment(me : mutable; aAlignment : HAsciiString);
+	Alignment (me) returns HAsciiString;
 	SetPath(me : mutable; aPath : TextPath);
 	Path (me) returns TextPath;
 	SetFont(me : mutable; aFont : FontSelect);
diff --git a/src/StepVisual/StepVisual_TextStyle.cdl b/src/StepVisual/StepVisual_TextStyle.cdl
index a2dc92a233..3b1700dbe5 100644
--- a/src/StepVisual/StepVisual_TextStyle.cdl
+++ b/src/StepVisual/StepVisual_TextStyle.cdl
@@ -24,19 +24,19 @@ uses
 	TextStyleForDefinedFont from StepVisual
 is
 
-	Create returns mutable TextStyle;
+	Create returns TextStyle;
 	---Purpose: Returns a TextStyle
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCharacterAppearance : mutable TextStyleForDefinedFont from StepVisual) is virtual;
+	      aName : HAsciiString from TCollection;
+	      aCharacterAppearance : TextStyleForDefinedFont from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetName(me : mutable; aName : mutable HAsciiString);
-	Name (me) returns mutable HAsciiString;
-	SetCharacterAppearance(me : mutable; aCharacterAppearance : mutable TextStyleForDefinedFont);
-	CharacterAppearance (me) returns mutable TextStyleForDefinedFont;
+	SetName(me : mutable; aName : HAsciiString);
+	Name (me) returns HAsciiString;
+	SetCharacterAppearance(me : mutable; aCharacterAppearance : TextStyleForDefinedFont);
+	CharacterAppearance (me) returns TextStyleForDefinedFont;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_TextStyleForDefinedFont.cdl b/src/StepVisual/StepVisual_TextStyleForDefinedFont.cdl
index 8e66a7b232..fa579b462a 100644
--- a/src/StepVisual/StepVisual_TextStyleForDefinedFont.cdl
+++ b/src/StepVisual/StepVisual_TextStyleForDefinedFont.cdl
@@ -23,16 +23,16 @@ uses
 	Colour from StepVisual
 is
 
-	Create returns mutable TextStyleForDefinedFont;
+	Create returns TextStyleForDefinedFont;
 	---Purpose: Returns a TextStyleForDefinedFont
 
 	Init (me : mutable;
-	      aTextColour : mutable Colour from StepVisual) is virtual;
+	      aTextColour : Colour from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
-	SetTextColour(me : mutable; aTextColour : mutable Colour);
-	TextColour (me) returns mutable Colour;
+	SetTextColour(me : mutable; aTextColour : Colour);
+	TextColour (me) returns Colour;
 
 fields
 
diff --git a/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cdl b/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cdl
index f2bedd347b..2b0555b999 100644
--- a/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cdl
+++ b/src/StepVisual/StepVisual_TextStyleWithBoxCharacteristics.cdl
@@ -26,17 +26,17 @@ uses
 	TextStyleForDefinedFont from StepVisual
 is
 
-	Create returns mutable TextStyleWithBoxCharacteristics;
+	Create returns TextStyleWithBoxCharacteristics;
 	---Purpose: Returns a TextStyleWithBoxCharacteristics
 
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCharacterAppearance : mutable TextStyleForDefinedFont from StepVisual) is redefined;
+	      aName : HAsciiString from TCollection;
+	      aCharacterAppearance : TextStyleForDefinedFont from StepVisual) is redefined;
 
 	Init (me : mutable;
-	      aName : mutable HAsciiString from TCollection;
-	      aCharacterAppearance : mutable TextStyleForDefinedFont from StepVisual;
+	      aName : HAsciiString from TCollection;
+	      aCharacterAppearance : TextStyleForDefinedFont from StepVisual;
 	      aCharacteristics : HArray1OfBoxCharacteristicSelect) is virtual;
 
 	-- Specific Methods for Field Data Access --
diff --git a/src/StepVisual/StepVisual_ViewVolume.cdl b/src/StepVisual/StepVisual_ViewVolume.cdl
index c0bbee8fd8..e1ac77102d 100644
--- a/src/StepVisual/StepVisual_ViewVolume.cdl
+++ b/src/StepVisual/StepVisual_ViewVolume.cdl
@@ -27,26 +27,26 @@ uses
 	PlanarBox from StepVisual
 is
 
-	Create returns mutable ViewVolume;
+	Create returns ViewVolume;
 	---Purpose: Returns a ViewVolume
 
 	Init (me : mutable;
 	      aProjectionType : CentralOrParallel from StepVisual;
-	      aProjectionPoint : mutable CartesianPoint from StepGeom;
+	      aProjectionPoint : CartesianPoint from StepGeom;
 	      aViewPlaneDistance : Real from Standard;
 	      aFrontPlaneDistance : Real from Standard;
 	      aFrontPlaneClipping : Boolean from Standard;
 	      aBackPlaneDistance : Real from Standard;
 	      aBackPlaneClipping : Boolean from Standard;
 	      aViewVolumeSidesClipping : Boolean from Standard;
-	      aViewWindow : mutable PlanarBox from StepVisual) is virtual;
+	      aViewWindow : PlanarBox from StepVisual) is virtual;
 
 	-- Specific Methods for Field Data Access --
 
 	SetProjectionType(me : mutable; aProjectionType : CentralOrParallel);
 	ProjectionType (me) returns CentralOrParallel;
-	SetProjectionPoint(me : mutable; aProjectionPoint : mutable CartesianPoint);
-	ProjectionPoint (me) returns mutable CartesianPoint;
+	SetProjectionPoint(me : mutable; aProjectionPoint : CartesianPoint);
+	ProjectionPoint (me) returns CartesianPoint;
 	SetViewPlaneDistance(me : mutable; aViewPlaneDistance : Real);
 	ViewPlaneDistance (me) returns Real;
 	SetFrontPlaneDistance(me : mutable; aFrontPlaneDistance : Real);
@@ -59,8 +59,8 @@ is
 	BackPlaneClipping (me) returns Boolean;
 	SetViewVolumeSidesClipping(me : mutable; aViewVolumeSidesClipping : Boolean);
 	ViewVolumeSidesClipping (me) returns Boolean;
-	SetViewWindow(me : mutable; aViewWindow : mutable PlanarBox);
-	ViewWindow (me) returns mutable PlanarBox;
+	SetViewWindow(me : mutable; aViewWindow : PlanarBox);
+	ViewWindow (me) returns PlanarBox;
 
 fields
 
diff --git a/src/StlMesh/StlMesh_Mesh.cdl b/src/StlMesh/StlMesh_Mesh.cdl
index f983964a67..33a304adbe 100644
--- a/src/StlMesh/StlMesh_Mesh.cdl
+++ b/src/StlMesh/StlMesh_Mesh.cdl
@@ -37,7 +37,7 @@ raises
 
 is
 
-    Create  returns mutable Mesh;
+    Create  returns Mesh;
     	---Purpose: Creates an empty mesh.
 
 
diff --git a/src/StlMesh/StlMesh_MeshDomain.cdl b/src/StlMesh/StlMesh_MeshDomain.cdl
index b481745d71..b7c802c066 100644
--- a/src/StlMesh/StlMesh_MeshDomain.cdl
+++ b/src/StlMesh/StlMesh_MeshDomain.cdl
@@ -32,12 +32,12 @@ raises
 
 is
 
-    Create  returns mutable MeshDomain;
+    Create  returns MeshDomain;
     	---Purpose: The mesh deflection is defaulted to Confusion from 
     	--          package Precision.
 
 
-    Create (Deflection : Real)  returns mutable MeshDomain
+    Create (Deflection : Real)  returns MeshDomain
     raises NegativeValue,
     	---Purpose: Raised if the deflection is lower than zero
     	   NullValue;
diff --git a/src/StlMesh/StlMesh_MeshTriangle.cdl b/src/StlMesh/StlMesh_MeshTriangle.cdl
index 6913bdcfe1..b9c5bdcb87 100644
--- a/src/StlMesh/StlMesh_MeshTriangle.cdl
+++ b/src/StlMesh/StlMesh_MeshTriangle.cdl
@@ -26,11 +26,11 @@ raises
 
 is
 
-    Create  returns mutable MeshTriangle;
+    Create  returns MeshTriangle;
     	---Purpose: empty constructor
 
 
-    Create (V1, V2, V3 : Integer; Xn, Yn, Zn : Real)  returns mutable MeshTriangle
+    Create (V1, V2, V3 : Integer; Xn, Yn, Zn : Real)  returns MeshTriangle
         ---Purpose: create a triangle defined with the indexes of its three vertices 
         --          and its orientation
     raises NegativeValue;
diff --git a/src/Storage/Storage_CallBack.cdl b/src/Storage/Storage_CallBack.cdl
index 632bad2942..6184dfa8e8 100644
--- a/src/Storage/Storage_CallBack.cdl
+++ b/src/Storage/Storage_CallBack.cdl
@@ -22,12 +22,12 @@ uses Schema from Storage,
      BaseDriver from Storage
      
 is
-   New(me) returns mutable Persistent is deferred;
+   New(me) returns Persistent is deferred;
    
    Add(me; aPers : Persistent from Standard; aSchema : Schema from Storage) is deferred;
    
    Write(me; aPers : Persistent from Standard; aDriver : in out BaseDriver from Storage; aSchema : Schema from Storage) is deferred;
    
-   Read(me; aPers : mutable Persistent from Standard; aDriver : in out BaseDriver from Storage; aSchema : Schema from Storage) is deferred;
+   Read(me; aPers : Persistent from Standard; aDriver : in out BaseDriver from Storage; aSchema : Schema from Storage) is deferred;
    
 end;
diff --git a/src/Storage/Storage_Data.cdl b/src/Storage/Storage_Data.cdl
index a02c6ade0b..83a33e302b 100644
--- a/src/Storage/Storage_Data.cdl
+++ b/src/Storage/Storage_Data.cdl
@@ -63,7 +63,7 @@ uses TypeData from Storage,
      SequenceOfExtendedString from TColStd
 is
 
-    Create returns mutable Data from Storage;
+    Create returns Data from Storage;
     	---Purpose:
     	-- Creates an empty set of data.
     	-- You explicitly create a Storage_Data object
@@ -160,11 +160,11 @@ is
     	--   number of roots stored in the read container.
     	--   Use the Roots function to get these roots in a sequence.
     
-    AddRoot(me; anObject : mutable Persistent from Standard);
+    AddRoot(me; anObject : Persistent from Standard);
     	---Purpose: add a persistent root to write. the name of the root 
     	--          is a driver reference number.
 
-    AddRoot(me; aName : AsciiString from TCollection; anObject : mutable Persistent from Standard);
+    AddRoot(me; aName : AsciiString from TCollection; anObject : Persistent from Standard);
     	---Purpose: Adds the root anObject to this set of data.
     	-- The name of the root is aName if given; if not, it
     	-- will be a reference number assigned by the driver
@@ -188,7 +188,7 @@ is
     	--   contains the roots stored in the container read.
     	-- -   An empty sequence is returned if there is no root in this set of data.
 
-    Find(me; aName : AsciiString from TCollection) returns mutable Root from Storage;
+    Find(me; aName : AsciiString from TCollection) returns Root from Storage;
     	---Purpose: Gives the root object whose name is aName in
     	-- this set of data. The returned object is a
     	-- Storage_Root object, from which the object it
@@ -217,10 +217,10 @@ is
 
     -- PRIVATE
 
-    HeaderData(me) returns mutable HeaderData from Storage is private;
-    RootData(me) returns mutable RootData from Storage is private;
-    TypeData(me) returns mutable TypeData from Storage is private;
-    InternalData(me) returns mutable InternalData from Storage is private;
+    HeaderData(me) returns HeaderData from Storage is private;
+    RootData(me) returns RootData from Storage is private;
+    TypeData(me) returns TypeData from Storage is private;
+    InternalData(me) returns InternalData from Storage is private;
     Clear(me) is private;
     SetErrorStatus(me : mutable; anError : Error from Storage) is private;    
     SetErrorStatusExtension(me : mutable; anErrorExt : AsciiString from TCollection) is private;    
diff --git a/src/Storage/Storage_DefaultCallBack.cdl b/src/Storage/Storage_DefaultCallBack.cdl
index c4297165db..b77435d9a6 100644
--- a/src/Storage/Storage_DefaultCallBack.cdl
+++ b/src/Storage/Storage_DefaultCallBack.cdl
@@ -24,12 +24,12 @@ uses Schema from Storage,
 is
    Create returns DefaultCallBack from Storage;
     
-   New(me) returns mutable Persistent;
+   New(me) returns Persistent;
 
    Add(me; aPers : Persistent from Standard; aSchema : Schema from Storage);
    
    Write(me; aPers : Persistent from Standard; aDriver : in out BaseDriver from Storage; aSchema : Schema from Storage);
    
-   Read(me; aPers : mutable Persistent from Standard; aDriver : in out BaseDriver from Storage; aSchema : Schema from Storage);
+   Read(me; aPers : Persistent from Standard; aDriver : in out BaseDriver from Storage; aSchema : Schema from Storage);
    
 end;
diff --git a/src/Storage/Storage_HeaderData.cdl b/src/Storage/Storage_HeaderData.cdl
index 2cb7e161c4..ba62a92feb 100644
--- a/src/Storage/Storage_HeaderData.cdl
+++ b/src/Storage/Storage_HeaderData.cdl
@@ -26,7 +26,7 @@ uses AsciiString from TCollection,
      
 is
 
-    Create returns mutable HeaderData from Storage;
+    Create returns HeaderData from Storage;
     
     CreationDate(me) returns AsciiString from TCollection;
     ---Purpose: return the creation date
diff --git a/src/Storage/Storage_InternalData.cdl b/src/Storage/Storage_InternalData.cdl
index b93c28453c..3b2d2fe38b 100644
--- a/src/Storage/Storage_InternalData.cdl
+++ b/src/Storage/Storage_InternalData.cdl
@@ -22,7 +22,7 @@ uses BucketOfPersistent from Storage,
      HPArray from Storage,
      MapOfCallBack from Storage         
 is
-    Create returns mutable InternalData from Storage;
+    Create returns InternalData from Storage;
     
     Clear(me : mutable);
     
diff --git a/src/Storage/Storage_Root.cdl b/src/Storage/Storage_Root.cdl
index 9cb859386d..5d15895c9b 100644
--- a/src/Storage/Storage_Root.cdl
+++ b/src/Storage/Storage_Root.cdl
@@ -34,10 +34,10 @@ inherits TShared from MMgt
 uses AsciiString from TCollection
 
 is
-    Create returns mutable Root from Storage;
+    Create returns Root from Storage;
 
     Create(aName    : AsciiString from TCollection;
-    	   anObject : Persistent  from Standard) returns mutable Root from Storage;
+    	   anObject : Persistent  from Standard) returns Root from Storage;
 
     SetName(me : mutable; aName    : AsciiString from TCollection);
     Name(me) returns AsciiString from TCollection;
@@ -58,7 +58,7 @@ is
     	-- into the container.    
     
     SetObject(me : mutable; anObject : Persistent  from Standard);
-    Object(me) returns mutable Persistent  from Standard;
+    Object(me) returns Persistent  from Standard;
     	---Purpose:
     	-- Returns the persistent object encapsulated by this root.    
     Type(me) returns AsciiString from TCollection;
diff --git a/src/Storage/Storage_RootData.cdl b/src/Storage/Storage_RootData.cdl
index f6d942e0ad..0ec652a757 100644
--- a/src/Storage/Storage_RootData.cdl
+++ b/src/Storage/Storage_RootData.cdl
@@ -29,7 +29,7 @@ raises NoSuchObject from Standard
 
 is
 
-    Create returns mutable RootData from Storage;
+    Create returns RootData from Storage;
     
     NumberOfRoots(me) returns Integer from Standard;
     ---Purpose: returns the number of roots.
@@ -38,9 +38,9 @@ is
     ---Purpose: add a root to <me>. If a root with same name is present, it
     --          will be replaced by <aRoot>.
     
-    Roots(me) returns mutable HSeqOfRoot from Storage;
+    Roots(me) returns HSeqOfRoot from Storage;
     
-    Find(me; aName : AsciiString from TCollection) returns mutable Root from Storage;
+    Find(me; aName : AsciiString from TCollection) returns Root from Storage;
     ---Purpose: find a root with name <aName>.
     
     IsRoot(me; aName : AsciiString from TCollection) returns Boolean from Standard;
@@ -56,7 +56,7 @@ is
     
     -- PRIVATE
 
-    UpdateRoot(me : mutable; aName : AsciiString from TCollection; aPers : mutable Persistent from Standard) 
+    UpdateRoot(me : mutable; aName : AsciiString from TCollection; aPers : Persistent from Standard) 
     raises NoSuchObject
     is private;
 
diff --git a/src/Storage/Storage_Schema.cdl b/src/Storage/Storage_Schema.cdl
index a8f7ba2bfc..1cf343fa72 100644
--- a/src/Storage/Storage_Schema.cdl
+++ b/src/Storage/Storage_Schema.cdl
@@ -85,7 +85,7 @@ is
         ---Purpose: returns the schema's name
 
     Write(me; s : in out BaseDriver from Storage; 
-              aData : mutable Data from Storage);
+              aData : Data from Storage);
         ---Purpose: Writes the data aggregated in aData into the
     	-- container defined by the driver s. The storage
     	-- operation is performed according to the data
@@ -94,7 +94,7 @@ is
     	-- to be stored together.
 
     Read(me; s : in out BaseDriver from Storage) 
-        returns mutable Data from Storage;
+        returns Data from Storage;
         ---Purpose:  Returns the data read from the container defined
     	-- by the driver s. The retrieval operation is
     	-- performed according to the data schema with
@@ -104,20 +104,20 @@ is
     	-- the root objects from the container.
 
     ReadHeaderSection(me; s : in out BaseDriver from Storage)
-        returns mutable HeaderData from Storage;
+        returns HeaderData from Storage;
         ---Purpose: read the header part of the stream
         --  Arguments:
         --   s: driver to read
 
     ReadTypeSection(me; s : in out BaseDriver from Storage) 
-        returns mutable TypeData from Storage;
+        returns TypeData from Storage;
         ---Purpose: fill the TypeData with the  names of the type used
         --          in a stream
         --  Arguments:
         --   s: driver to read
 
     ReadRootSection(me; s : in out BaseDriver from Storage) 
-        returns mutable RootData from Storage;
+        returns RootData from Storage;
         ---Purpose: read root part of the file
         --  Arguments:
         --   s: driver to read
@@ -275,24 +275,24 @@ is
         ---Level: Internal
 
     IReadHeaderSection(me; s : in out BaseDriver from Storage;
-                           iData : mutable HeaderData from Storage) returns Boolean 
+                           iData : HeaderData from Storage) returns Boolean 
         raises StreamFormatError is private;
         ---Level: Internal
 
     IReadTypeSection(me; s : in out BaseDriver from Storage;
-                         tData : mutable TypeData from Storage) returns Boolean
+                         tData : TypeData from Storage) returns Boolean
         raises StreamFormatError is private;
         ---Level: Internal
 
     IReadRootSection(me; s : in out BaseDriver from Storage; 
-                         rData : mutable RootData from Storage) returns Boolean
+                         rData : RootData from Storage) returns Boolean
         raises StreamFormatError is private;
         ---Level: Internal
 
-    ISetCurrentData(myclass; dData : mutable Data from Storage) is private;
+    ISetCurrentData(myclass; dData : Data from Storage) is private;
         ---Level: Internal
 
-    ICurrentData(myclass) returns mutable Data from Storage is private;
+    ICurrentData(myclass) returns Data from Storage is private;
         ---Level: Internal
         ---C++: return &
 
diff --git a/src/Storage/Storage_TypeData.cdl b/src/Storage/Storage_TypeData.cdl
index 55f6bec2a0..bade8ef5ef 100644
--- a/src/Storage/Storage_TypeData.cdl
+++ b/src/Storage/Storage_TypeData.cdl
@@ -25,7 +25,7 @@ uses HSequenceOfAsciiString from TColStd,
      
 raises NoSuchObject from Standard
 is
-    Create returns mutable TypeData from Storage;
+    Create returns TypeData from Storage;
     
     NumberOfTypes(me) returns Integer from Standard;
     
diff --git a/src/Storage/Storage_TypedCallBack.cdl b/src/Storage/Storage_TypedCallBack.cdl
index a7c7ef667e..e27270a80e 100644
--- a/src/Storage/Storage_TypedCallBack.cdl
+++ b/src/Storage/Storage_TypedCallBack.cdl
@@ -22,10 +22,10 @@ uses CallBack from Storage,
      AsciiString from TCollection
      
 is
-    Create returns mutable TypedCallBack from Storage;
+    Create returns TypedCallBack from Storage;
 
     Create(aTypeName : AsciiString from TCollection; aCallBack : CallBack from Storage)
-    	returns mutable TypedCallBack from Storage;
+    	returns TypedCallBack from Storage;
 
     SetType(me : mutable; aType : AsciiString from TCollection);
     Type(me) returns AsciiString from TCollection;
diff --git a/src/TColStd/TColStd_HPackedMapOfInteger.cdl b/src/TColStd/TColStd_HPackedMapOfInteger.cdl
index 9e1e1529cd..e10dc0c627 100644
--- a/src/TColStd/TColStd_HPackedMapOfInteger.cdl
+++ b/src/TColStd/TColStd_HPackedMapOfInteger.cdl
@@ -21,9 +21,9 @@ uses
     PackedMapOfInteger from TColStd 
  
 is 
-    Create( NbBuckets: Integer from Standard = 1 ) returns mutable HPackedMapOfInteger from TColStd;    
+    Create( NbBuckets: Integer from Standard = 1 ) returns HPackedMapOfInteger from TColStd;    
      
-    Create( theOther:  PackedMapOfInteger from TColStd ) returns mutable HPackedMapOfInteger from TColStd; 
+    Create( theOther:  PackedMapOfInteger from TColStd ) returns HPackedMapOfInteger from TColStd; 
      
     Map( me ) returns PackedMapOfInteger from TColStd 
 	---C++: return const &
diff --git a/src/TCollection/TCollection_HArray1.cdl b/src/TCollection/TCollection_HArray1.cdl
index a3c4082807..3997d635e3 100644
--- a/src/TCollection/TCollection_HArray1.cdl
+++ b/src/TCollection/TCollection_HArray1.cdl
@@ -47,7 +47,7 @@ raises  RangeError from Standard,
 is
     
     Create (Low, Up: Integer from Standard) 
-    returns mutable  HArray1 from TCollection
+    returns  HArray1 from TCollection
     	---Purpose: Creates an array  of lower  bound  <Low> and upper
     	-- bound  <Up>. Range  error is  raised when  <Up> is less than <Low>.
     raises 
@@ -56,7 +56,7 @@ is
 	---C++: inline
 	
     Create (Low, Up: Integer from Standard; V : ItemHArray1) 
-    returns mutable  HArray1 from TCollection
+    returns  HArray1 from TCollection
     	---Purpose: Creates an array  of lower  bound  <Low> and upper
     	-- bound  <Up>. Range  error is  raised when  <Up> is less than <Low>.
     raises 
diff --git a/src/TCollection/TCollection_HArray2.cdl b/src/TCollection/TCollection_HArray2.cdl
index 2828881c82..ea550a47bd 100644
--- a/src/TCollection/TCollection_HArray2.cdl
+++ b/src/TCollection/TCollection_HArray2.cdl
@@ -46,7 +46,7 @@ raises
 is
     
     Create (R1, R2, C1, C2: Integer from Standard) 
-    returns  mutable HArray2 from TCollection
+    returns HArray2 from TCollection
     	---Purpose: Creates an array of lower bound <R1><C1> and upper
     	-- bound <R2><C2>.   Range    from Standard error  is
     	-- raised when <R2> is less than <R1> or <C2> is less than <C1>.
@@ -57,7 +57,7 @@ is
 
 
     Create (R1, R2, C1, C2: Integer from Standard; V : ItemHArray2) 
-    returns  mutable HArray2 from TCollection
+    returns HArray2 from TCollection
     	---Purpose: Creates an array of lower bound <R1><C1> and upper
     	-- bound <R2><C2>.   Range    from Standard error  is
     	-- raised when <R2> is less than <R1> or <C2> is less than <C1>.
diff --git a/src/TCollection/TCollection_HAsciiString.cdl b/src/TCollection/TCollection_HAsciiString.cdl
index c9cec7fc5f..ae06f94013 100644
--- a/src/TCollection/TCollection_HAsciiString.cdl
+++ b/src/TCollection/TCollection_HAsciiString.cdl
@@ -36,44 +36,44 @@ raises
     NegativeValue
 is
 
- Create returns mutable HAsciiString from TCollection;
+ Create returns HAsciiString from TCollection;
    ---Purpose: Initializes a HAsciiString to an empty AsciiString.
 
  Create ( message : CString ) 
-         returns mutable HAsciiString from TCollection
+         returns HAsciiString from TCollection
    ---Purpose: Initializes a HAsciiString with a CString.
    raises NullObject;
 
  Create ( aChar : Character) 
-         returns mutable HAsciiString from TCollection;
+         returns HAsciiString from TCollection;
    ---Purpose: Initializes a HAsciiString with a single character.
 
  Create ( length : Integer; filler : Character)
-         returns mutable HAsciiString from TCollection;
+         returns HAsciiString from TCollection;
    ---Purpose: Initializes a HAsciiString with <length> space allocated.
    -- and filled with <filler>.This is useful for buffers.
 
  Create ( value : Integer ) 
-         returns mutable HAsciiString from TCollection
+         returns HAsciiString from TCollection
    ---Purpose: Initializes a HAsciiString with an integer value
    raises NullObject;
 
  Create ( value : Real ) 
-         returns mutable HAsciiString from TCollection
+         returns HAsciiString from TCollection
    ---Purpose: Initializes a HAsciiString with a real value
    raises NullObject;
 
  Create ( aString : AsciiString from TCollection) 
-         returns mutable HAsciiString from TCollection;
+         returns HAsciiString from TCollection;
    ---Purpose: Initializes a HAsciiString with a HAsciiString.
 
  Create ( aString : HAsciiString from TCollection) 
-         returns mutable HAsciiString from TCollection;
+         returns HAsciiString from TCollection;
    ---Purpose: Initializes a HAsciiString with a HAsciiString.
 
  Create ( aString : HExtendedString from TCollection;
           replaceNonAscii: Character from Standard) 
-         returns mutable HAsciiString from TCollection
+         returns HAsciiString from TCollection
          raises OutOfRange from Standard;
    ---Purpose: Initializes a HAsciiString with a HAsciiString.
    --          If replaceNonAscii is non-null charecter, it will be used 
@@ -104,7 +104,7 @@ is
    --   me = "Hello "
 
  Cat (me ; other : CString) 
-        returns mutable HAsciiString from TCollection;
+        returns HAsciiString from TCollection;
    ---Level: Public
    ---Purpose:  Creates a new string by concatenation of this
    -- ASCII string and the other ASCII string.
@@ -120,7 +120,7 @@ is
    -- This rule is applicable to AssignCat (operator +=) too.
 
  Cat (me ; other : HAsciiString from TCollection) 
-        returns mutable HAsciiString from TCollection;
+        returns HAsciiString from TCollection;
    ---Level: Public
    ---Purpose: Creates a new string by concatenation of this
    -- ASCII string and the other ASCII string.
@@ -488,7 +488,7 @@ is
    raises OutOfRange from Standard;
 
  Split(me : mutable; where : Integer) 
- returns mutable HAsciiString from TCollection
+ returns HAsciiString from TCollection
    ---Level: Public
    ---Purpose: Splits a HAsciiString into two sub-strings.
    --  Example: 
@@ -510,7 +510,7 @@ is
  --   me = "abcdefg"
  -- returns
  --   "cdef"
- returns mutable HAsciiString from TCollection
+ returns HAsciiString from TCollection
  raises OutOfRange from Standard;
 
  ToCString(me) returns CString;
@@ -521,7 +521,7 @@ is
    ---C++: inline
 
  Token (me ; separators : CString=" \t" ; whichone : Integer=1) 
- returns mutable HAsciiString from TCollection
+ returns HAsciiString from TCollection
    ---Level: Public
    ---Purpose: Extracts <whichone> token from <me>.
    -- By default, the <separators> is set to space and tabulation.
diff --git a/src/TCollection/TCollection_HExtendedString.cdl b/src/TCollection/TCollection_HExtendedString.cdl
index 107b0a2094..c4c279d743 100644
--- a/src/TCollection/TCollection_HExtendedString.cdl
+++ b/src/TCollection/TCollection_HExtendedString.cdl
@@ -39,45 +39,45 @@ raises
     NegativeValue from Standard
 is
 
- Create returns mutable HExtendedString from TCollection;
+ Create returns HExtendedString from TCollection;
    ---Purpose: Initializes a HExtendedString to an empty ExtendedString.
 
  Create ( message : CString ) 
-         returns mutable HExtendedString from TCollection
+         returns HExtendedString from TCollection
    ---Purpose: Initializes a HExtendedString with a CString.
    raises NullObject from Standard;
 
  Create ( message : ExtString ) 
-         returns mutable HExtendedString from TCollection
+         returns HExtendedString from TCollection
    ---Purpose: Initializes a HExtendedString with an ExtString.
    raises NullObject from Standard;
 
  Create ( aChar : ExtCharacter) 
-         returns mutable HExtendedString from TCollection;
+         returns HExtendedString from TCollection;
    ---Purpose: Initializes a HExtendedString with a single character.
 
  Create ( length : Integer; filler : ExtCharacter)
-         returns mutable HExtendedString from TCollection;
+         returns HExtendedString from TCollection;
    ---Purpose: Initializes a HExtendedString with <length> space allocated.
    -- and filled with <filler>.This is usefull for buffers.
 
  Create ( aString : ExtendedString from TCollection) 
-         returns mutable HExtendedString from TCollection;
+         returns HExtendedString from TCollection;
    ---Purpose: Initializes a HExtendedString with a HExtendedString.
 
  Create ( aString : HAsciiString from TCollection) 
-         returns mutable HExtendedString from TCollection;
+         returns HExtendedString from TCollection;
    ---Purpose: Initializes a HExtendedString with an HAsciiString.
 
  Create ( aString : HExtendedString from TCollection) 
-         returns mutable HExtendedString from TCollection;
+         returns HExtendedString from TCollection;
    ---Purpose: Initializes a HExtendedString with a HExtendedString.
 
  AssignCat (me : mutable ; other : HExtendedString from TCollection); 
    ---Purpose: Appends <other>  to me.
 
  Cat (me ; other : HExtendedString from TCollection) 
-        returns mutable HExtendedString from TCollection;
+        returns HExtendedString from TCollection;
    ---Level: Public
    ---Purpose: Returns a string appending <other>  to me.
 
@@ -151,7 +151,7 @@ is
    raises OutOfRange from Standard;
 
  Split(me : mutable; where : Integer) 
- returns mutable HExtendedString from TCollection
+ returns HExtendedString from TCollection
    ---Purpose: Splits a ExtendedString into two sub-strings.
    -- Example: 
    --   aString contains "abcdefg"
@@ -176,7 +176,7 @@ is
    ---C++: return const
 
  Token (me ; separators : ExtString; whichone : Integer=1) 
- returns mutable HExtendedString from TCollection
+ returns HExtendedString from TCollection
    ---Level: Public
    ---Purpose: Extracts <whichone> token from <me>.
    -- By default, the <separators> is set to space and tabulation.
diff --git a/src/TCollection/TCollection_HSequence.cdl b/src/TCollection/TCollection_HSequence.cdl
index 2601c7c7fc..8fbff97463 100644
--- a/src/TCollection/TCollection_HSequence.cdl
+++ b/src/TCollection/TCollection_HSequence.cdl
@@ -45,7 +45,7 @@ raises
     OutOfRange from Standard
     
 is 
-	Create returns mutable HSequence from TCollection;
+	Create returns HSequence from TCollection;
 		---Purpose: Constructs an empty sequence.
     	    	-- Use:
     	    	-- -   the function Append or Prepend to add an item or
@@ -185,7 +185,7 @@ is
 
 
 	Split(me : mutable; anIndex : Integer) 
-    	returns mutable HSequence 
+    	returns HSequence 
         raises OutOfRange from Standard
 		---Purpose: Keeps in <me> the items 1 to <anIndex>-1 and
 		-- returns the items <anIndex> to the end.
@@ -271,7 +271,7 @@ is
 	    ---C++: return &
 	    ---C++: inline
   
-        ShallowCopy(me) returns mutable like me;
+        ShallowCopy(me) returns like me;
             ---Purpose: function call  
 	    ---C++: function call 
 
diff --git a/src/TDF/TDF_Attribute.cdl b/src/TDF/TDF_Attribute.cdl
index e1af2086a9..f9c9f54369 100644
--- a/src/TDF/TDF_Attribute.cdl
+++ b/src/TDF/TDF_Attribute.cdl
@@ -132,7 +132,7 @@ raises DomainError from Standard
 is
 
     Initialize
-    	returns mutable Attribute from TDF;
+    	returns Attribute from TDF;
 	---Purpose: Initializes fields.
 
     ---Category: Information access.
@@ -347,7 +347,7 @@ is
 	--          
 	---C++: inline
 
-    BackupCopy(me) returns mutable Attribute from TDF
+    BackupCopy(me) returns Attribute from TDF
     	is virtual;
 	---Purpose: Copies  the attribute  contents into  a  new other
 	--          attribute. It is used by Backup().
@@ -403,14 +403,14 @@ is
     --           ==============================================================
 
     NewEmpty(me)
-    	returns mutable Attribute from TDF
+    	returns Attribute from TDF
     	is deferred;
 	---Purpose: Returns an new empty attribute from the good end
 	--          type. It is used by the copy algorithm.
 
     Paste(me;
-    	  intoAttribute    : mutable Attribute from TDF;
-	  aRelocationTable : mutable RelocationTable from TDF)
+    	  intoAttribute    : Attribute from TDF;
+	  aRelocationTable : RelocationTable from TDF)
 	is deferred;
 	---Purpose: This method is different from the "Copy" one,
 	--          because it is used when copying an attribute from
diff --git a/src/TDF/TDF_ClosureTool.cdl b/src/TDF/TDF_ClosureTool.cdl
index 2906924b98..3d79d0fc1f 100644
--- a/src/TDF/TDF_ClosureTool.cdl
+++ b/src/TDF/TDF_ClosureTool.cdl
@@ -48,12 +48,12 @@ uses
 is
 
     Closure(myclass;
-    	aDataSet : mutable DataSet from TDF);
+    	aDataSet : DataSet from TDF);
 	---Purpose: Builds the transitive closure of label and
 	--          attribute sets into <aDataSet>.
 
     Closure(myclass;
-    	aDataSet : mutable DataSet from TDF;
+    	aDataSet : DataSet from TDF;
     	aFilter  : IDFilter from TDF;
     	aMode    : ClosureMode from TDF);
 	---Purpose: Builds the transitive closure of label and
diff --git a/src/TDF/TDF_ComparisonTool.cdl b/src/TDF/TDF_ComparisonTool.cdl
index d8721b1eb7..d8b3e0d894 100644
--- a/src/TDF/TDF_ComparisonTool.cdl
+++ b/src/TDF/TDF_ComparisonTool.cdl
@@ -62,7 +62,7 @@ is
     	    aSourceDataSet   : DataSet from TDF;
     	    aTargetDataSet   : DataSet from TDF;
     	    aFilter          : IDFilter from TDF;
-	    aRelocationTable : mutable RelocationTable from TDF);
+	    aRelocationTable : RelocationTable from TDF);
 	---Purpose: Compares <aSourceDataSet> with <aTargetDataSet>,
 	--          updating <aRelocationTable> with labels and
 	--          attributes found in both sets.
@@ -71,7 +71,7 @@ is
     	    	  aRefDataSet      : DataSet from TDF;
 		  aRelocationTable : RelocationTable from TDF;
     	          aFilter          : IDFilter from TDF;
-    	    	  aDiffDataSet     : mutable DataSet from TDF;
+    	    	  aDiffDataSet     : DataSet from TDF;
     	    	  anOption         : Integer from Standard = 2)
     	returns Boolean from Standard;
 	---Purpose: Finds from <aRefDataSet> all the keys not bound
@@ -89,7 +89,7 @@ is
     	    	  aRefDataSet      : DataSet from TDF;
 		  aRelocationTable : RelocationTable from TDF;
     	          aFilter          : IDFilter from TDF;
-    	    	  aDiffDataSet     : mutable DataSet from TDF;
+    	    	  aDiffDataSet     : DataSet from TDF;
     	    	  anOption         : Integer from Standard = 2)
     	returns Boolean from Standard;
 	---Purpose: Substracts from <aRefDataSet> all the items bound
@@ -127,7 +127,7 @@ is
     	    aSourceDataSet   : DataSet from TDF;
     	    aTargetDataSet   : DataSet from TDF;
     	    aFilter          : IDFilter from TDF;
-	    aRelocationTable : mutable RelocationTable from TDF)
+	    aRelocationTable : RelocationTable from TDF)
     	is private;
 	---Purpose: Internal comparison method used by Compare(...).
 
@@ -136,7 +136,7 @@ is
     	    aRefDataSet      : DataSet from TDF;
 	    aRelocationTable : RelocationTable from TDF;
     	    aFilter          : IDFilter from TDF;
-    	    aDiffDataSet     : mutable DataSet from TDF;
+    	    aDiffDataSet     : DataSet from TDF;
     	    anOption         : Integer from Standard;
     	    theSource        : Boolean from Standard)
     	returns Boolean from Standard
diff --git a/src/TDF/TDF_CopyTool.cdl b/src/TDF/TDF_CopyTool.cdl
index 100757322e..cf4f9088b6 100644
--- a/src/TDF/TDF_CopyTool.cdl
+++ b/src/TDF/TDF_CopyTool.cdl
@@ -79,14 +79,14 @@ is
 
     Copy(myclass;
     	 aSourceDataSet   : DataSet from TDF;
-	 aRelocationTable : mutable RelocationTable from TDF);
+	 aRelocationTable : RelocationTable from TDF);
 	---Purpose:  Copy   <aSourceDataSet> with using  and  updating
 	--           <aRelocationTable>. This  method ignores   target
 	--          attributes privilege over source ones.
 
     Copy(myclass;
     	 aSourceDataSet   : DataSet from TDF;
-	 aRelocationTable : mutable RelocationTable from TDF;
+	 aRelocationTable : RelocationTable from TDF;
     	 aPrivilegeFilter : IDFilter from TDF);
 	---Purpose:    Copy  <aSourceDataSet>  using      and updating
 	--          <aRelocationTable>. Use <aPrivilegeFilter> to give
@@ -99,7 +99,7 @@ is
 
     Copy(myclass;
     	 aSourceDataSet   : DataSet from TDF;
-	 aRelocationTable : mutable RelocationTable from TDF;
+	 aRelocationTable : RelocationTable from TDF;
     	 aPrivilegeFilter : IDFilter from TDF;
     	 aRefFilter       : IDFilter from TDF;
     	 setSelfContained : Boolean from Standard);
diff --git a/src/TDF/TDF_Data.cdl b/src/TDF/TDF_Data.cdl
index 1d25c4c732..1d535d9b36 100644
--- a/src/TDF/TDF_Data.cdl
+++ b/src/TDF/TDF_Data.cdl
@@ -50,7 +50,7 @@ raises
     
 is
 
-    Create returns mutable Data from TDF;
+    Create returns Data from TDF;
         ---Purpose: A new and empty Data structure.
     
     -- -----------------------------------------------------------------------
diff --git a/src/TDF/TDF_DataSet.cdl b/src/TDF/TDF_DataSet.cdl
index 390e01d7ce..9cf4990e97 100644
--- a/src/TDF/TDF_DataSet.cdl
+++ b/src/TDF/TDF_DataSet.cdl
@@ -40,7 +40,7 @@ uses
 is
 
     Create
-    	returns mutable DataSet from TDF;
+    	returns DataSet from TDF;
 	---Purpose: Creates an  empty   DataSet  object.
 
     Clear(me : mutable);
diff --git a/src/TDF/TDF_DeltaOnAddition.cdl b/src/TDF/TDF_DeltaOnAddition.cdl
index 50ee69557a..c6abe5e781 100644
--- a/src/TDF/TDF_DeltaOnAddition.cdl
+++ b/src/TDF/TDF_DeltaOnAddition.cdl
@@ -37,7 +37,7 @@ uses
 is
 
     Create(anAtt : Attribute from TDF)
-    	returns mutable DeltaOnAddition from TDF;
+    	returns DeltaOnAddition from TDF;
 	---Purpose: Creates a TDF_DeltaOnAddition.
 
     Apply (me : mutable)
diff --git a/src/TDF/TDF_DeltaOnForget.cdl b/src/TDF/TDF_DeltaOnForget.cdl
index af85abfcab..8e03b14b19 100644
--- a/src/TDF/TDF_DeltaOnForget.cdl
+++ b/src/TDF/TDF_DeltaOnForget.cdl
@@ -35,7 +35,7 @@ uses
 is
 
     Create(anAtt : Attribute from TDF)
-    	returns mutable DeltaOnForget from TDF;
+    	returns DeltaOnForget from TDF;
 	---Purpose: Creates a TDF_DeltaOnForget.
 
     Apply (me : mutable)
diff --git a/src/TDF/TDF_DeltaOnModification.cdl b/src/TDF/TDF_DeltaOnModification.cdl
index 293b36008c..793e3be7fc 100644
--- a/src/TDF/TDF_DeltaOnModification.cdl
+++ b/src/TDF/TDF_DeltaOnModification.cdl
@@ -38,7 +38,7 @@ uses
 is
 
     Initialize(anAttribute: Attribute from TDF)
-    	returns mutable DeltaOnModification from TDF;
+    	returns DeltaOnModification from TDF;
 	---Purpose: Initializes a TDF_DeltaOnModification.
 
     Apply (me : mutable)
diff --git a/src/TDF/TDF_DeltaOnResume.cdl b/src/TDF/TDF_DeltaOnResume.cdl
index eb63e1624b..e1736c2b32 100644
--- a/src/TDF/TDF_DeltaOnResume.cdl
+++ b/src/TDF/TDF_DeltaOnResume.cdl
@@ -35,7 +35,7 @@ uses
 is
 
     Create(anAtt : Attribute from TDF)
-    	returns mutable DeltaOnResume from TDF;
+    	returns DeltaOnResume from TDF;
 	---Purpose: Creates a TDF_DeltaOnResume.
 
     Apply (me : mutable)
diff --git a/src/TDF/TDF_Reference.cdl b/src/TDF/TDF_Reference.cdl
index 57c2cc2aa6..6ec42d9d1d 100644
--- a/src/TDF/TDF_Reference.cdl
+++ b/src/TDF/TDF_Reference.cdl
@@ -50,10 +50,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 
     References (me; DS : DataSet from TDF) is redefined;
@@ -64,7 +64,7 @@ is
 	---C++: return &
 
     Create
-    returns mutable Reference from TDF;    
+    returns Reference from TDF;    
 
 
 fields
diff --git a/src/TDF/TDF_RelocationTable.cdl b/src/TDF/TDF_RelocationTable.cdl
index 2de776b20b..257039ef61 100644
--- a/src/TDF/TDF_RelocationTable.cdl
+++ b/src/TDF/TDF_RelocationTable.cdl
@@ -54,7 +54,7 @@ is
 
     Create(selfRelocate : Boolean from Standard = Standard_False)
 --    Create(selfRelocate : Boolean from Standard = Standard_False;afterRelocate :Boolean from Standard = Standard_False)     
-    	returns mutable RelocationTable from TDF;
+    	returns RelocationTable from TDF;
 	---Purpose: Creates an relocation table. <selfRelocate> says
 	--          if a value without explicit relocation is its own
 	--          relocation.
@@ -120,7 +120,7 @@ is
 
     HasRelocation(me;
     	     	  aSourceAttribute :               Attribute from TDF;
-    	     	  aTargetAttribute : in out mutable Attribute from TDF)
+    	     	  aTargetAttribute : in out Attribute from TDF)
 	returns Boolean from Standard;
 	---Purpose: Finds the relocation value of <aSourceAttribute>
 	--          and returns it into <aTargetAttribute>.
@@ -141,7 +141,7 @@ is
     HasTransientRelocation
     	(me;
     	 aSourceTransient :                Transient from Standard;
-    	 aTargetTransient : in out mutable Transient from Standard)
+    	 aTargetTransient : in out Transient from Standard)
 	returns Boolean from Standard;
 	---Purpose: Finds the relocation value of <aSourceTransient>
 	--          and returns it into <aTargetTransient>.
diff --git a/src/TDF/TDF_TagSource.cdl b/src/TDF/TDF_TagSource.cdl
index aa9925f81e..c670a5a710 100644
--- a/src/TDF/TDF_TagSource.cdl
+++ b/src/TDF/TDF_TagSource.cdl
@@ -49,7 +49,7 @@ is
     --          =================
 
     Create
-    returns mutable TagSource from TDF;
+    returns TagSource from TDF;
     
     NewTag (me : mutable)
     returns Integer from Standard;
@@ -72,11 +72,11 @@ is
 
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 fields
     
diff --git a/src/TDataStd/TDataStd_AsciiString.cdl b/src/TDataStd/TDataStd_AsciiString.cdl
index 8f226cd7c8..9a7b604102 100644
--- a/src/TDataStd/TDataStd_AsciiString.cdl
+++ b/src/TDataStd/TDataStd_AsciiString.cdl
@@ -42,7 +42,7 @@ is
     --          ===================
     
     Create 
-    returns mutable AsciiString from TDataStd;
+    returns AsciiString from TDataStd;
     -- Constructor    
     
     Set (me : mutable; S : AsciiString from TCollection);
@@ -68,11 +68,11 @@ is
     --  Restores the backuped content from <with> into this one. 
     
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
     -- Returns an new empty AsciiString attribute. 
     
-    Paste (me; into : mutable Attribute from TDF;
-               RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+               RT   : RelocationTable from TDF);    
     -- This method is used when copying an attribute from a source structure 
     -- into a target structure. 
     
diff --git a/src/TDataStd/TDataStd_BooleanArray.cdl b/src/TDataStd/TDataStd_BooleanArray.cdl
index 7603566def..be9ebf21af 100644
--- a/src/TDataStd/TDataStd_BooleanArray.cdl
+++ b/src/TDataStd/TDataStd_BooleanArray.cdl
@@ -88,7 +88,7 @@ is
     ---Category: Methodes of TDF_Attribute
     --           =========================
     Create    
-    returns mutable BooleanArray from TDataStd; 
+    returns BooleanArray from TDataStd; 
     
     ID (me)
     ---C++: return const & 
@@ -98,10 +98,10 @@ is
     	     with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     
     Dump (me; 
     	  OS : in out OStream from Standard)
diff --git a/src/TDataStd/TDataStd_BooleanList.cdl b/src/TDataStd/TDataStd_BooleanList.cdl
index e5257eab54..337e5aaf5c 100644
--- a/src/TDataStd/TDataStd_BooleanList.cdl
+++ b/src/TDataStd/TDataStd_BooleanList.cdl
@@ -44,7 +44,7 @@ is
     --           ===================
 
     Create
-    returns mutable BooleanList from TDataStd; 
+    returns BooleanList from TDataStd; 
 
     IsEmpty (me)
     returns Boolean from Standard;
@@ -83,10 +83,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_ByteArray.cdl b/src/TDataStd/TDataStd_ByteArray.cdl
index cf2c6304d2..da010cddae 100644
--- a/src/TDataStd/TDataStd_ByteArray.cdl
+++ b/src/TDataStd/TDataStd_ByteArray.cdl
@@ -110,7 +110,7 @@ is
     ---Category: Methodes of TDF_Attribute
     --           =========================
     Create    
-    returns mutable ByteArray from TDataStd; 
+    returns ByteArray from TDataStd; 
     
     ID (me)
     ---C++: return const & 
@@ -120,10 +120,10 @@ is
     	     with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     
     Dump (me; 
     	  OS : in out OStream from Standard)
diff --git a/src/TDataStd/TDataStd_Comment.cdl b/src/TDataStd/TDataStd_Comment.cdl
index 233515edcf..1142ca9cac 100644
--- a/src/TDataStd/TDataStd_Comment.cdl
+++ b/src/TDataStd/TDataStd_Comment.cdl
@@ -54,7 +54,7 @@ is
     --          ============
     
     Create 
-    returns mutable Comment from TDataStd;
+    returns Comment from TDataStd;
         
     Set (me : mutable; S : ExtendedString from TCollection);
 
@@ -75,10 +75,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_Current.cdl b/src/TDataStd/TDataStd_Current.cdl
index 05b90666e1..35492c55b9 100644
--- a/src/TDataStd/TDataStd_Current.cdl
+++ b/src/TDataStd/TDataStd_Current.cdl
@@ -54,7 +54,7 @@ is
     --          =============    
 
     Create
-    returns mutable Current from TDataStd;    
+    returns Current from TDataStd;    
 
     SetLabel (me : mutable; current : Label from TDF);
     
@@ -71,10 +71,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cdl b/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cdl
index 92972f3d40..d483fed6cc 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cdl
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfByteArray.cdl
@@ -27,7 +27,7 @@ uses
 is
 
     Create (Arr : ByteArray     from TDataStd)
-    	returns mutable DeltaOnModificationOfByteArray from TDataStd;
+    	returns DeltaOnModificationOfByteArray from TDataStd;
 	---Purpose: Initializes a TDF_DeltaOnModification.
 
     Apply (me : mutable)
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cdl b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cdl
index ff74d91094..a221f5e5ea 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cdl
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfExtStringArray.cdl
@@ -26,7 +26,7 @@ uses
     
 is
     Create (Arr : ExtStringArray     from TDataStd)
-    	returns mutable DeltaOnModificationOfExtStringArray from TDataStd;
+    	returns DeltaOnModificationOfExtStringArray from TDataStd;
 	---Purpose: Initializes a TDF_DeltaOnModification.
 
     Apply (me : mutable)
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cdl b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cdl
index a1d33d487c..81b08286da 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cdl
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntArray.cdl
@@ -25,7 +25,7 @@ uses
 
 is
     Create (Arr : IntegerArray     from TDataStd)
-    	returns mutable DeltaOnModificationOfIntArray from TDataStd;
+    	returns DeltaOnModificationOfIntArray from TDataStd;
 	---Purpose: Initializes a TDF_DeltaOnModification.
 
     Apply (me : mutable)
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cdl b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cdl
index b85a3c3c2b..d9b2568c1b 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cdl
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfIntPackedMap.cdl
@@ -27,7 +27,7 @@ uses
 is
 
     Create (Arr : IntPackedMap     from TDataStd)
-    	returns mutable DeltaOnModificationOfIntPackedMap from TDataStd;
+    	returns DeltaOnModificationOfIntPackedMap from TDataStd;
 	---Purpose: Initializes a TDF_DeltaOnModification.
 
     Apply (me : mutable)
diff --git a/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cdl b/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cdl
index 8310d3524b..3976f44526 100644
--- a/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cdl
+++ b/src/TDataStd/TDataStd_DeltaOnModificationOfRealArray.cdl
@@ -28,7 +28,7 @@ uses
 is
 
     Create (Arr : RealArray     from TDataStd)
-    	returns mutable DeltaOnModificationOfRealArray from TDataStd;
+    	returns DeltaOnModificationOfRealArray from TDataStd;
 	---Purpose: Initializes a TDF_DeltaOnModification.
 
     Apply (me : mutable)
diff --git a/src/TDataStd/TDataStd_Directory.cdl b/src/TDataStd/TDataStd_Directory.cdl
index 83471ccb1b..d6a121c84a 100644
--- a/src/TDataStd/TDataStd_Directory.cdl
+++ b/src/TDataStd/TDataStd_Directory.cdl
@@ -66,7 +66,7 @@ is
     --          ===============
 
     Create
-    returns mutable Directory from TDataStd;
+    returns Directory from TDataStd;
     
     ---Category: methodes de TDF_Attribute
     --           =========================
@@ -78,10 +78,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);     
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);     
 
     References (me; DS : DataSet from TDF) is redefined;     
 
diff --git a/src/TDataStd/TDataStd_Expression.cdl b/src/TDataStd/TDataStd_Expression.cdl
index 32101ad282..af6f141a7e 100644
--- a/src/TDataStd/TDataStd_Expression.cdl
+++ b/src/TDataStd/TDataStd_Expression.cdl
@@ -54,7 +54,7 @@ is
     --          ============
 
     Create
-    returns mutable Expression from TDataStd;
+    returns Expression from TDataStd;
     
     Name (me)
     ---Purpose: build and return the expression name
@@ -80,10 +80,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_ExtStringArray.cdl b/src/TDataStd/TDataStd_ExtStringArray.cdl
index acca37c908..148bd140d4 100644
--- a/src/TDataStd/TDataStd_ExtStringArray.cdl
+++ b/src/TDataStd/TDataStd_ExtStringArray.cdl
@@ -99,7 +99,7 @@ is
     ---Category: methodes of TDF_Attribute
     --           =========================
 
-    Create returns mutable ExtStringArray from TDataStd; 
+    Create returns ExtStringArray from TDataStd; 
     
     ID (me)
     	---C++: return const & 
@@ -108,10 +108,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_ExtStringList.cdl b/src/TDataStd/TDataStd_ExtStringList.cdl
index d477490c5d..e75176bfc3 100644
--- a/src/TDataStd/TDataStd_ExtStringList.cdl
+++ b/src/TDataStd/TDataStd_ExtStringList.cdl
@@ -45,7 +45,7 @@ is
     --           =====================
 
     Create
-    returns mutable ExtStringList from TDataStd; 
+    returns ExtStringList from TDataStd; 
 
     IsEmpty (me)
     returns Boolean from Standard;
@@ -101,10 +101,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringByte.cdl b/src/TDataStd/TDataStd_HDataMapOfStringByte.cdl
index 54b661684b..3bdba49e00 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringByte.cdl
+++ b/src/TDataStd/TDataStd_HDataMapOfStringByte.cdl
@@ -23,10 +23,10 @@ uses
     
 is
     Create( NbBuckets: Integer from Standard = 1 )  
-    returns mutable HDataMapOfStringByte from TDataStd;    
+    returns HDataMapOfStringByte from TDataStd;    
      
     Create( theOther:  DataMapOfStringByte from TDataStd)  
-    returns mutable HDataMapOfStringByte from TDataStd;
+    returns HDataMapOfStringByte from TDataStd;
      
     Map( me ) returns DataMapOfStringByte from TDataStd
 	---C++: return const &
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cdl b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cdl
index 17cc5012ae..6a548905d1 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cdl
+++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfInteger.cdl
@@ -23,10 +23,10 @@ uses
     
 is
     Create( NbBuckets: Integer from Standard = 1 )  
-    returns mutable HDataMapOfStringHArray1OfInteger from TDataStd;    
+    returns HDataMapOfStringHArray1OfInteger from TDataStd;    
      
     Create( theOther:  DataMapOfStringHArray1OfInteger from TDataStd)  
-    returns mutable HDataMapOfStringHArray1OfInteger from TDataStd;
+    returns HDataMapOfStringHArray1OfInteger from TDataStd;
      
     Map( me ) returns DataMapOfStringHArray1OfInteger from TDataStd
 	---C++: return const &
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cdl b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cdl
index c7228037cd..3c4fd6db10 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cdl
+++ b/src/TDataStd/TDataStd_HDataMapOfStringHArray1OfReal.cdl
@@ -23,10 +23,10 @@ uses
     
 is
     Create( NbBuckets: Integer from Standard = 1 )  
-    returns mutable HDataMapOfStringHArray1OfReal from TDataStd;    
+    returns HDataMapOfStringHArray1OfReal from TDataStd;    
      
     Create( theOther:  DataMapOfStringHArray1OfReal from TDataStd)  
-    returns mutable HDataMapOfStringHArray1OfReal from TDataStd;
+    returns HDataMapOfStringHArray1OfReal from TDataStd;
      
     Map( me ) returns DataMapOfStringHArray1OfReal from TDataStd
 	---C++: return const &
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringInteger.cdl b/src/TDataStd/TDataStd_HDataMapOfStringInteger.cdl
index 8c4db451ed..26f455edd4 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringInteger.cdl
+++ b/src/TDataStd/TDataStd_HDataMapOfStringInteger.cdl
@@ -23,10 +23,10 @@ uses
     
 is
     Create( NbBuckets: Integer from Standard = 1 )  
-    returns mutable HDataMapOfStringInteger from TDataStd;    
+    returns HDataMapOfStringInteger from TDataStd;    
      
     Create( theOther:  DataMapOfStringInteger from TColStd)  
-    returns mutable HDataMapOfStringInteger from TDataStd;
+    returns HDataMapOfStringInteger from TDataStd;
      
     Map( me ) returns DataMapOfStringInteger from TColStd
 	---C++: return const &
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringReal.cdl b/src/TDataStd/TDataStd_HDataMapOfStringReal.cdl
index 0be7c8c9a5..772bb6ee90 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringReal.cdl
+++ b/src/TDataStd/TDataStd_HDataMapOfStringReal.cdl
@@ -23,10 +23,10 @@ uses
     
 is
     Create( NbBuckets: Integer from Standard = 1 )  
-    returns mutable HDataMapOfStringReal from TDataStd;    
+    returns HDataMapOfStringReal from TDataStd;    
      
     Create( theOther:  DataMapOfStringReal from TDataStd)  
-    returns mutable HDataMapOfStringReal from TDataStd;
+    returns HDataMapOfStringReal from TDataStd;
      
     Map( me ) returns DataMapOfStringReal from TDataStd
 	---C++: return const &
diff --git a/src/TDataStd/TDataStd_HDataMapOfStringString.cdl b/src/TDataStd/TDataStd_HDataMapOfStringString.cdl
index cffc5de9bd..5d21624f83 100644
--- a/src/TDataStd/TDataStd_HDataMapOfStringString.cdl
+++ b/src/TDataStd/TDataStd_HDataMapOfStringString.cdl
@@ -23,10 +23,10 @@ uses
     
 is
     Create( NbBuckets: Integer from Standard = 1 )  
-    returns mutable HDataMapOfStringString from TDataStd;    
+    returns HDataMapOfStringString from TDataStd;    
      
     Create( theOther:  DataMapOfStringString from TDataStd)  
-    returns mutable HDataMapOfStringString from TDataStd;
+    returns HDataMapOfStringString from TDataStd;
      
     Map( me ) returns DataMapOfStringString from TDataStd
 	---C++: return const &
diff --git a/src/TDataStd/TDataStd_IntPackedMap.cdl b/src/TDataStd/TDataStd_IntPackedMap.cdl
index e7ca72d5f0..11bf35f3a0 100644
--- a/src/TDataStd/TDataStd_IntPackedMap.cdl
+++ b/src/TDataStd/TDataStd_IntPackedMap.cdl
@@ -49,7 +49,7 @@ is
     --          ===================
     
     Create 
-    returns mutable IntPackedMap from TDataStd;
+    returns IntPackedMap from TDataStd;
     -- Constructor    
     
     ChangeMap (me : mutable; theMap : HPackedMapOfInteger from TColStd)
@@ -116,11 +116,11 @@ is
     --  Restores the backuped content from <with> into this one. 
     
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
     -- Returns an new empty AsciiString attribute. 
     
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     -- This method is used when copying an attribute from a source structure 
     -- into a target structure. 
     
diff --git a/src/TDataStd/TDataStd_Integer.cdl b/src/TDataStd/TDataStd_Integer.cdl
index 5f44ed76a0..1f88064931 100644
--- a/src/TDataStd/TDataStd_Integer.cdl
+++ b/src/TDataStd/TDataStd_Integer.cdl
@@ -60,10 +60,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
@@ -72,7 +72,7 @@ is
 
 
     Create
-    returns mutable Integer from TDataStd;    
+    returns Integer from TDataStd;    
 
 
 fields
diff --git a/src/TDataStd/TDataStd_IntegerArray.cdl b/src/TDataStd/TDataStd_IntegerArray.cdl
index a642ed408c..5e105e80ec 100644
--- a/src/TDataStd/TDataStd_IntegerArray.cdl
+++ b/src/TDataStd/TDataStd_IntegerArray.cdl
@@ -100,7 +100,7 @@ is
     ---Category: methodes of TDF_Attribute
     --           =========================
 
-    Create returns mutable IntegerArray from TDataStd; 
+    Create returns IntegerArray from TDataStd; 
     
     ID (me)
     	---C++: return const & 
@@ -109,10 +109,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     ---Purpose: Note. Uses inside ChangeArray() method
     
     Dump(me; anOS : in out OStream from Standard)
diff --git a/src/TDataStd/TDataStd_IntegerList.cdl b/src/TDataStd/TDataStd_IntegerList.cdl
index 414d789826..ea64ec49cc 100644
--- a/src/TDataStd/TDataStd_IntegerList.cdl
+++ b/src/TDataStd/TDataStd_IntegerList.cdl
@@ -44,7 +44,7 @@ is
     --           ===================
 
     Create
-    returns mutable IntegerList from TDataStd; 
+    returns IntegerList from TDataStd; 
 
     IsEmpty (me)
     returns Boolean from Standard;
@@ -97,10 +97,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_Name.cdl b/src/TDataStd/TDataStd_Name.cdl
index 91959b5009..a03f360267 100644
--- a/src/TDataStd/TDataStd_Name.cdl
+++ b/src/TDataStd/TDataStd_Name.cdl
@@ -119,7 +119,7 @@ is
     --          ============
     
     Create 
-    returns mutable Name from TDataStd;
+    returns Name from TDataStd;
     
 
     --Father (me; father : in out Name from TDataStd)
@@ -160,10 +160,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_NamedData.cdl b/src/TDataStd/TDataStd_NamedData.cdl
index 2e4fcadd3c..bc253a0ca9 100644
--- a/src/TDataStd/TDataStd_NamedData.cdl
+++ b/src/TDataStd/TDataStd_NamedData.cdl
@@ -58,7 +58,7 @@ is
     --           =================
 
     Create
-    returns mutable NamedData from TDataStd; 
+    returns NamedData from TDataStd; 
 
 
     ---Category: Integers
@@ -297,10 +297,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_NoteBook.cdl b/src/TDataStd/TDataStd_NoteBook.cdl
index 5d902b228f..65517ef4b3 100644
--- a/src/TDataStd/TDataStd_NoteBook.cdl
+++ b/src/TDataStd/TDataStd_NoteBook.cdl
@@ -50,7 +50,7 @@ is
     --          ===============
 
     Create
-    returns mutable NoteBook from TDataStd; 
+    returns NoteBook from TDataStd; 
     
 
     Append (me : mutable; value  : Real    from Standard; 
@@ -78,10 +78,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_Real.cdl b/src/TDataStd/TDataStd_Real.cdl
index e8d9a463a7..fc73448a2f 100644
--- a/src/TDataStd/TDataStd_Real.cdl
+++ b/src/TDataStd/TDataStd_Real.cdl
@@ -45,7 +45,7 @@ is
     --          ============
 
     Create
-    returns mutable Real from TDataStd; 
+    returns Real from TDataStd; 
     
     SetDimension (me : mutable; DIM : RealEnum from TDataStd);
 
@@ -75,10 +75,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     
     Dump(me; anOS : in out OStream from Standard)
diff --git a/src/TDataStd/TDataStd_RealArray.cdl b/src/TDataStd/TDataStd_RealArray.cdl
index 45ac92b685..7bd718d465 100644
--- a/src/TDataStd/TDataStd_RealArray.cdl
+++ b/src/TDataStd/TDataStd_RealArray.cdl
@@ -98,7 +98,7 @@ is
     ---Category: methodes of TDF_Attribute
     --           =========================
     Create    
-    returns mutable RealArray from TDataStd; 
+    returns RealArray from TDataStd; 
     
     ID (me)
     	---C++: return const & 
@@ -107,10 +107,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     ---Purpose: Note. Uses inside ChangeArray() method 
     
     Dump(me; anOS : in out OStream from Standard)
diff --git a/src/TDataStd/TDataStd_RealList.cdl b/src/TDataStd/TDataStd_RealList.cdl
index b55a3fe2b3..e381581bbe 100644
--- a/src/TDataStd/TDataStd_RealList.cdl
+++ b/src/TDataStd/TDataStd_RealList.cdl
@@ -44,7 +44,7 @@ is
     --           ===================
 
     Create
-    returns mutable RealList from TDataStd; 
+    returns RealList from TDataStd; 
 
     IsEmpty (me)
     returns Boolean from Standard;
@@ -98,10 +98,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_ReferenceArray.cdl b/src/TDataStd/TDataStd_ReferenceArray.cdl
index a620e24d09..f6003d6cef 100644
--- a/src/TDataStd/TDataStd_ReferenceArray.cdl
+++ b/src/TDataStd/TDataStd_ReferenceArray.cdl
@@ -91,7 +91,7 @@ is
     --           =========================
     
     Create
-    returns mutable ReferenceArray from TDataStd; 
+    returns ReferenceArray from TDataStd; 
 
     ID (me)
     ---C++: return const & 
@@ -100,10 +100,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     References (me; DS : DataSet from TDF) 
     is redefined;
diff --git a/src/TDataStd/TDataStd_ReferenceList.cdl b/src/TDataStd/TDataStd_ReferenceList.cdl
index 5c190e6377..06fd3f5837 100644
--- a/src/TDataStd/TDataStd_ReferenceList.cdl
+++ b/src/TDataStd/TDataStd_ReferenceList.cdl
@@ -45,7 +45,7 @@ is
     --           =====================
 
     Create
-    returns mutable ReferenceList from TDataStd; 
+    returns ReferenceList from TDataStd; 
 
     IsEmpty (me)
     returns Boolean from Standard;
@@ -101,10 +101,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     References (me; DS : DataSet from TDF) 
     is redefined;
diff --git a/src/TDataStd/TDataStd_Relation.cdl b/src/TDataStd/TDataStd_Relation.cdl
index 9b679fdf55..2a84643d7e 100644
--- a/src/TDataStd/TDataStd_Relation.cdl
+++ b/src/TDataStd/TDataStd_Relation.cdl
@@ -54,7 +54,7 @@ is
     --          ============
 
     Create
-    returns mutable Relation from TDataStd;
+    returns Relation from TDataStd;
     
     Name (me)
     ---Purpose: build and return the relation name
@@ -80,10 +80,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_Tick.cdl b/src/TDataStd/TDataStd_Tick.cdl
index b8be7f0ad6..5d5742af88 100644
--- a/src/TDataStd/TDataStd_Tick.cdl
+++ b/src/TDataStd/TDataStd_Tick.cdl
@@ -47,7 +47,7 @@ is
     --          ============
 
     Create
-    returns mutable Tick from TDataStd;
+    returns Tick from TDataStd;
 
 
     ---Category: Inherited methods
@@ -60,10 +60,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump (me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDataStd/TDataStd_TreeNode.cdl b/src/TDataStd/TDataStd_TreeNode.cdl
index 3dd1e77ad9..68729d87f3 100644
--- a/src/TDataStd/TDataStd_TreeNode.cdl
+++ b/src/TDataStd/TDataStd_TreeNode.cdl
@@ -69,7 +69,7 @@ is
     ---Purpose: Instance methods: 
     --          ================ 
      
-    Create returns mutable TreeNode from TDataStd;
+    Create returns TreeNode from TDataStd;
     
 
     Append (me : mutable; Child : TreeNode from TDataStd)    
@@ -245,12 +245,12 @@ is
     Restore (me: mutable; with : Attribute from TDF) 
     is virtual;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF) 
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF) 
     is virtual;    
 
     NewEmpty(me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 	
     References(me;
diff --git a/src/TDataStd/TDataStd_UAttribute.cdl b/src/TDataStd/TDataStd_UAttribute.cdl
index fd3fb732f7..7ed418eb0c 100644
--- a/src/TDataStd/TDataStd_UAttribute.cdl
+++ b/src/TDataStd/TDataStd_UAttribute.cdl
@@ -39,7 +39,7 @@ is
     --          ============
 
     Create
-    returns mutable UAttribute from TDataStd;
+    returns UAttribute from TDataStd;
     
     SetID (me: mutable; LocalID : GUID from Standard);
     
@@ -53,10 +53,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);       
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);       
 
     References (me; DS : DataSet from TDF) is redefined;   
 
diff --git a/src/TDataStd/TDataStd_Variable.cdl b/src/TDataStd/TDataStd_Variable.cdl
index 8186e31815..d94229b5fd 100644
--- a/src/TDataStd/TDataStd_Variable.cdl
+++ b/src/TDataStd/TDataStd_Variable.cdl
@@ -60,7 +60,7 @@ is
     --          ============
 
     Create
-    returns mutable Variable from TDataStd;
+    returns Variable from TDataStd;
 
     Name (me : mutable; string : ExtendedString from TCollection);
     ---Purpose:  set or change the name  of the variable, in myUnknown
@@ -141,10 +141,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
   
     References (me; DS : DataSet from TDF)
     ---Purpose: to export reference to the associated Name attribute.
diff --git a/src/TDataXtd/TDataXtd_Axis.cdl b/src/TDataXtd/TDataXtd_Axis.cdl
index 2428b7270c..4f29d06282 100644
--- a/src/TDataXtd/TDataXtd_Axis.cdl
+++ b/src/TDataXtd/TDataXtd_Axis.cdl
@@ -62,7 +62,7 @@ is
     --          ============     
 
     Create
-    returns mutable Axis from TDataXtd;  
+    returns Axis from TDataXtd;  
 
     ---Category: TDF_Attribute methods
     --           =====================
@@ -74,10 +74,10 @@ is
     Restore(me: mutable; with : Attribute from TDF);
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);  
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);  
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDataXtd/TDataXtd_Constraint.cdl b/src/TDataXtd/TDataXtd_Constraint.cdl
index 7eb75ccd30..3d745cd225 100644
--- a/src/TDataXtd/TDataXtd_Constraint.cdl
+++ b/src/TDataXtd/TDataXtd_Constraint.cdl
@@ -61,7 +61,7 @@ is
     --          ==================    
 
     Create
-    returns mutable Constraint from TDataXtd;    
+    returns Constraint from TDataXtd;    
     
     Set (me : mutable; type : ConstraintEnum from TDataXtd;
     	    	       G1   : NamedShape from TNaming);
@@ -221,10 +221,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute       from TDF;
-	       RT   : mutable RelocationTable from TDF);
+    Paste (me; Into : Attribute       from TDF;
+	       RT   : RelocationTable from TDF);
 	       
     Dump (me; anOS : in out OStream from Standard) 
     	returns OStream from Standard
diff --git a/src/TDataXtd/TDataXtd_Geometry.cdl b/src/TDataXtd/TDataXtd_Geometry.cdl
index 715e3ab252..969918ecf3 100644
--- a/src/TDataXtd/TDataXtd_Geometry.cdl
+++ b/src/TDataXtd/TDataXtd_Geometry.cdl
@@ -142,7 +142,7 @@ is
   
   
     Create
-    returns mutable Geometry from TDataXtd;  
+    returns Geometry from TDataXtd;  
     	---Purpose: This and the next methods are used to  retrieve  underlying geometry of  the
 	--           NamedShape, even   if  noone Geometry   Attribute  is
     	--          associated  .  if not  found or not compliant geometry return False.
@@ -166,10 +166,10 @@ is
     Restore(me: mutable; with : Attribute from TDF);
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);  
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);  
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDataXtd/TDataXtd_PatternStd.cdl b/src/TDataXtd/TDataXtd_PatternStd.cdl
index c5ab190079..d58f342cd3 100644
--- a/src/TDataXtd/TDataXtd_PatternStd.cdl
+++ b/src/TDataXtd/TDataXtd_PatternStd.cdl
@@ -49,7 +49,7 @@ is
     --           ===========      
 
     Create
-    returns mutable PatternStd from TDataXtd;
+    returns PatternStd from TDataXtd;
 
     --- Category: Set and Get methods
 
@@ -129,10 +129,10 @@ is
 
     Restore (me: mutable; With : Attribute from TDF);
 
-    NewEmpty (me) returns mutable Attribute from TDF;
+    NewEmpty (me) returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     References(me; aDataSet : DataSet from TDF)
     is redefined;
diff --git a/src/TDataXtd/TDataXtd_Placement.cdl b/src/TDataXtd/TDataXtd_Placement.cdl
index 0bb1b7b8ce..c3da18103b 100644
--- a/src/TDataXtd/TDataXtd_Placement.cdl
+++ b/src/TDataXtd/TDataXtd_Placement.cdl
@@ -47,7 +47,7 @@ is
 
 
     Create
-    returns mutable  Placement from TDataXtd;
+    returns  Placement from TDataXtd;
 
     ---Category: TDF_Attribute methods
     --           =====================
@@ -59,10 +59,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump (me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDataXtd/TDataXtd_Plane.cdl b/src/TDataXtd/TDataXtd_Plane.cdl
index e92985415f..899936458e 100644
--- a/src/TDataXtd/TDataXtd_Plane.cdl
+++ b/src/TDataXtd/TDataXtd_Plane.cdl
@@ -58,7 +58,7 @@ is
     --         =============    
 
     Create
-    returns mutable Plane from TDataXtd;  
+    returns Plane from TDataXtd;  
     
     ---Category: TDF_Attribute methods
     --           =====================
@@ -70,10 +70,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);  
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);  
 
     Dump (me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDataXtd/TDataXtd_Point.cdl b/src/TDataXtd/TDataXtd_Point.cdl
index 32d267cf18..2e05d26987 100644
--- a/src/TDataXtd/TDataXtd_Point.cdl
+++ b/src/TDataXtd/TDataXtd_Point.cdl
@@ -58,7 +58,7 @@ is
     --          =============    
 
     Create
-    returns mutable Point from TDataXtd;  
+    returns Point from TDataXtd;  
 
     ---Category: TDF_Attribute methods
     --           =====================
@@ -71,10 +71,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);  
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);  
 
     Dump (me; anOS : in out OStream from Standard) 
     	returns OStream from Standard
diff --git a/src/TDataXtd/TDataXtd_Position.cdl b/src/TDataXtd/TDataXtd_Position.cdl
index 06ecf6f367..ef0e33b52d 100644
--- a/src/TDataXtd/TDataXtd_Position.cdl
+++ b/src/TDataXtd/TDataXtd_Position.cdl
@@ -42,7 +42,7 @@ is
     returns Boolean from Standard;
     
     Create 
-    returns mutable Position from TDataXtd;
+    returns Position from TDataXtd;
     
     ID(me) returns GUID from Standard
     is redefined static;
@@ -64,13 +64,13 @@ is
     -- ----------------
 
     NewEmpty(me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
     ---Purpose: Returns an new empty attribute from the good end
     --          type. It is used by the copy algorithm.
 
-    Paste(me; intoAttribute    : mutable Attribute from TDF;
-    	      aRelocTationable : mutable RelocationTable from TDF)
+    Paste(me; intoAttribute    : Attribute from TDF;
+    	      aRelocTationable : RelocationTable from TDF)
     is redefined;
 	---Purpose: This method is different from the "Copy" one,
 	--          because it is used when copying an attribute from
diff --git a/src/TDataXtd/TDataXtd_Shape.cdl b/src/TDataXtd/TDataXtd_Shape.cdl
index f1138b8695..199dafbee0 100644
--- a/src/TDataXtd/TDataXtd_Shape.cdl
+++ b/src/TDataXtd/TDataXtd_Shape.cdl
@@ -61,7 +61,7 @@ is
     --          ============
 
     Create
-    returns mutable Shape from TDataXtd;
+    returns Shape from TDataXtd;
 
     
     ---Category: methodes de TDF_Attribute
@@ -75,10 +75,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);       
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);       
 
     References (me; DS : DataSet from TDF) is redefined;   
 
diff --git a/src/TDocStd/TDocStd_Document.cdl b/src/TDocStd/TDocStd_Document.cdl
index b2b45ccac5..cd0b6ce6f4 100644
--- a/src/TDocStd/TDocStd_Document.cdl
+++ b/src/TDocStd/TDocStd_Document.cdl
@@ -52,7 +52,7 @@ is
     returns Document from TDocStd;
 
     Create (astorageformat : ExtendedString from TCollection)
-    returns mutable Document from TDocStd;
+    returns Document from TDocStd;
     	---Purpose: Constructs a document object defined by the
     	-- string astorageformat.
              
diff --git a/src/TDocStd/TDocStd_Modified.cdl b/src/TDocStd/TDocStd_Modified.cdl
index 8f02565773..9374b25914 100644
--- a/src/TDocStd/TDocStd_Modified.cdl
+++ b/src/TDocStd/TDocStd_Modified.cdl
@@ -59,7 +59,7 @@ is
     --          ================
     
     Create
-    returns mutable Modified from TDocStd;  
+    returns Modified from TDocStd;  
     
     IsEmpty (me)
     returns Boolean from Standard;    
@@ -89,10 +89,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump (me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/TDocStd/TDocStd_Owner.cdl b/src/TDocStd/TDocStd_Owner.cdl
index 63c8338f9c..d21d44757d 100644
--- a/src/TDocStd/TDocStd_Owner.cdl
+++ b/src/TDocStd/TDocStd_Owner.cdl
@@ -43,7 +43,7 @@ is
     --          ===============
     
     Create
-    returns mutable Owner from TDocStd;  
+    returns Owner from TDocStd;  
     
     SetDocument (me : mutable; document : Document from TDocStd);    
 
@@ -60,10 +60,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/TDocStd/TDocStd_XLink.cdl b/src/TDocStd/TDocStd_XLink.cdl
index 23f1eae5f0..06093984e3 100644
--- a/src/TDocStd/TDocStd_XLink.cdl
+++ b/src/TDocStd/TDocStd_XLink.cdl
@@ -43,13 +43,13 @@ is
     -- Class methods ---------------------------------------------------------
 
     Set (myclass; atLabel : Label from TDF)
-    returns mutable XLink from TDocStd;
+    returns XLink from TDocStd;
 	---Purpose: Sets an empty external reference, at the label aLabel.
 
     -- -----------------------------------------------------------------------
 
     Create
-    returns mutable XLink from TDocStd;
+    returns XLink from TDocStd;
     ---Purpose: Initializes fields.
     
     Update (me : mutable)
@@ -138,7 +138,7 @@ is
     -- Modification & Transaction use methods.
     -- --------------------------------------
 
-    BackupCopy(me) returns mutable Attribute from TDF
+    BackupCopy(me) returns Attribute from TDF
     	is redefined static;
 	---Purpose: Returns a null handle. Raise allways for ,it is
 	--          nonsense to use this method.
@@ -153,13 +153,13 @@ is
     -- ----------------
 
     NewEmpty(me)
-    	returns mutable Attribute from TDF
+    	returns Attribute from TDF
     	is redefined static;
 	---Purpose: Returns a null handle.
 
     Paste(me;
-    	  intoAttribute    : mutable Attribute from TDF;
-	  aRelocationTable : mutable RelocationTable from TDF)
+    	  intoAttribute    : Attribute from TDF;
+	  aRelocationTable : RelocationTable from TDF)
     	is redefined static;
 	---Purpose: Does nothing.
 
diff --git a/src/TDocStd/TDocStd_XLinkRoot.cdl b/src/TDocStd/TDocStd_XLinkRoot.cdl
index f14f139982..4b09cd6bae 100644
--- a/src/TDocStd/TDocStd_XLinkRoot.cdl
+++ b/src/TDocStd/TDocStd_XLinkRoot.cdl
@@ -64,7 +64,7 @@ is
     -- --------------
 
     Create
-    	returns mutable XLinkRoot from TDocStd
+    	returns XLinkRoot from TDocStd
     	is private;
 	---Purpose: Initializes fields.
 
@@ -77,7 +77,7 @@ is
 	--          
 	---C++: return const &             	
   
-    BackupCopy(me) returns mutable Attribute from TDF
+    BackupCopy(me) returns Attribute from TDF
     	is redefined static;
 	---Purpose: Returns a null handle.
 
@@ -105,13 +105,13 @@ is
     -- ----------------
 
     NewEmpty(me)
-    	returns mutable Attribute from TDF
+    	returns Attribute from TDF
     	is redefined static;
 	---Purpose: Returns a null handle.
 
     Paste(me;
-    	  intoAttribute    : mutable Attribute from TDF;
-	  aRelocationTable : mutable RelocationTable from TDF)
+    	  intoAttribute    : Attribute from TDF;
+	  aRelocationTable : RelocationTable from TDF)
     	is redefined static;
 	---Purpose: Does nothing.
 
diff --git a/src/TFunction/TFunction_Driver.cdl b/src/TFunction/TFunction_Driver.cdl
index 3e1515fc94..976c43264f 100644
--- a/src/TFunction/TFunction_Driver.cdl
+++ b/src/TFunction/TFunction_Driver.cdl
@@ -35,7 +35,7 @@ uses
       
 is 
  
-    Initialize returns mutable Driver from TFunction; 
+    Initialize returns Driver from TFunction; 
 
 
     ---Purpose: initialisation of the driver
diff --git a/src/TFunction/TFunction_DriverTable.cdl b/src/TFunction/TFunction_DriverTable.cdl
index deeeddbb88..a54c0e70c7 100644
--- a/src/TFunction/TFunction_DriverTable.cdl
+++ b/src/TFunction/TFunction_DriverTable.cdl
@@ -31,9 +31,9 @@ is
 
     Get (myclass)
     ---Purpose: Returns the driver table. If a driver does not exist, creates it.
-    returns mutable DriverTable from TFunction;
+    returns DriverTable from TFunction;
 
-    Create returns mutable DriverTable from TFunction; 
+    Create returns DriverTable from TFunction; 
     ---Purpose: Default constructor
 
     AddDriver(me : mutable; guid   : GUID    from Standard;
diff --git a/src/TFunction/TFunction_Function.cdl b/src/TFunction/TFunction_Function.cdl
index 29e1440cd9..b20d1cae41 100644
--- a/src/TFunction/TFunction_Function.cdl
+++ b/src/TFunction/TFunction_Function.cdl
@@ -60,7 +60,7 @@ is
     ---Purpose: Instance methods: 
     --          ================ 
      
-    Create returns mutable Function from TFunction;
+    Create returns Function from TFunction;
 
     GetDriverGUID (me) 
     	---Purpose: Returns the GUID for this function's driver.
@@ -99,12 +99,12 @@ is
     Restore (me: mutable; with : Attribute from TDF) 
     is virtual;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF) 
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF) 
     is virtual;    
 
     NewEmpty(me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 	
     References(me;
diff --git a/src/TFunction/TFunction_GraphNode.cdl b/src/TFunction/TFunction_GraphNode.cdl
index c9db5450fe..3f67a65c5e 100644
--- a/src/TFunction/TFunction_GraphNode.cdl
+++ b/src/TFunction/TFunction_GraphNode.cdl
@@ -49,7 +49,7 @@ is
 
     Create 
     ---Purpose: Constructor (empty).
-    returns mutable GraphNode from TFunction;
+    returns GraphNode from TFunction;
 
 
     AddPrevious (me : mutable;
@@ -129,12 +129,12 @@ is
     Restore (me: mutable; with : Attribute from TDF) 
     is virtual;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF) 
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF) 
     is virtual;    
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 	
     References (me;
diff --git a/src/TFunction/TFunction_Scope.cdl b/src/TFunction/TFunction_Scope.cdl
index 2b0b632d25..fbb553f342 100644
--- a/src/TFunction/TFunction_Scope.cdl
+++ b/src/TFunction/TFunction_Scope.cdl
@@ -49,7 +49,7 @@ is
 
     Create 
     ---Purpose: Constructor (empty).
-    returns mutable Scope from TFunction;
+    returns Scope from TFunction;
 
 
     AddFunction (me : mutable;
@@ -115,12 +115,12 @@ is
     Restore (me: mutable; with : Attribute from TDF) 
     is virtual;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF) 
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF) 
     is virtual;    
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 	
     Dump (me; anOS : in out OStream from Standard) 
diff --git a/src/TNaming/TNaming_DeltaOnModification.cdl b/src/TNaming/TNaming_DeltaOnModification.cdl
index 6fbe926bb8..94cff17fe5 100644
--- a/src/TNaming/TNaming_DeltaOnModification.cdl
+++ b/src/TNaming/TNaming_DeltaOnModification.cdl
@@ -31,7 +31,7 @@ uses
 is
 
     Create (NS : NamedShape from TNaming)
-    	returns mutable DeltaOnModification from TNaming;
+    	returns DeltaOnModification from TNaming;
 	---Purpose: Initializes a TDF_DeltaOnModification.
 
     Apply (me : mutable)
diff --git a/src/TNaming/TNaming_DeltaOnRemoval.cdl b/src/TNaming/TNaming_DeltaOnRemoval.cdl
index 72be043582..f35ab20249 100644
--- a/src/TNaming/TNaming_DeltaOnRemoval.cdl
+++ b/src/TNaming/TNaming_DeltaOnRemoval.cdl
@@ -24,7 +24,7 @@ uses
 is
 
     Create (NS : NamedShape from TNaming)
-    	returns mutable DeltaOnRemoval from TNaming;
+    	returns DeltaOnRemoval from TNaming;
 	---Purpose: Initializes a TDF_DeltaOnModification.
 
     Apply (me : mutable)
diff --git a/src/TNaming/TNaming_Name.cdl b/src/TNaming/TNaming_Name.cdl
index adccbaad52..e0f4b88eb7 100644
--- a/src/TNaming/TNaming_Name.cdl
+++ b/src/TNaming/TNaming_Name.cdl
@@ -90,7 +90,7 @@ is
 	    	
     Paste (me; 
     	   into : in out  Name from TNaming; 
-    	   RT   : mutable RelocationTable from TDF);
+    	   RT   : RelocationTable from TDF);
     	    	
 fields
 
diff --git a/src/TNaming/TNaming_NamedShape.cdl b/src/TNaming/TNaming_NamedShape.cdl
index 681d9fa7b3..bb91e9d323 100644
--- a/src/TNaming/TNaming_NamedShape.cdl
+++ b/src/TNaming/TNaming_NamedShape.cdl
@@ -49,7 +49,7 @@ is
 	---Purpose: Returns the GUID for named shapes.
 	---C++: return const &
 
-    Create returns mutable NamedShape from TNaming;
+    Create returns NamedShape from TNaming;
  
  
     IsEmpty (me) 
@@ -82,7 +82,7 @@ is
 	---C++: inline         
 	---C++: return const &
 
-    BackupCopy(me) returns mutable Attribute from TDF
+    BackupCopy(me) returns Attribute from TDF
     is redefined;
 	---Purpose: Copies  the attribute  contents into  a  new other
 	--          attribute. It is used by Backup().
@@ -117,14 +117,14 @@ is
     -- ----------------
 
     NewEmpty(me)
-    	returns mutable Attribute from TDF
+    	returns Attribute from TDF
     	is redefined;
 	---Purpose: Returns an new empty attribute from the good end
 	--          type. It is used by the copy algorithm.
 
     Paste(me;
-    	  intoAttribute    : mutable Attribute from TDF;
-	  aRelocTationable : mutable RelocationTable from TDF)
+    	  intoAttribute    : Attribute from TDF;
+	  aRelocTationable : RelocationTable from TDF)
 	is redefined;
 	---Purpose: This method is different from the "Copy" one,
 	--          because it is used when copying an attribute from
diff --git a/src/TNaming/TNaming_Naming.cdl b/src/TNaming/TNaming_Naming.cdl
index 3a79f1a797..bc27685858 100644
--- a/src/TNaming/TNaming_Naming.cdl
+++ b/src/TNaming/TNaming_Naming.cdl
@@ -78,7 +78,7 @@ is
 
 
     Create 
-    returns mutable Naming from TNaming; 
+    returns Naming from TNaming; 
 
     IsDefined (me) returns Boolean from Standard;
 	    
@@ -109,12 +109,12 @@ is
     --          ===================================
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Restore (me: mutable; With : Attribute from TDF);
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 	
     References (me; aDataSet : DataSet from TDF)
     is redefined virtual;
diff --git a/src/TNaming/TNaming_UsedShapes.cdl b/src/TNaming/TNaming_UsedShapes.cdl
index 747b77ff87..a6157f771b 100644
--- a/src/TNaming/TNaming_UsedShapes.cdl
+++ b/src/TNaming/TNaming_UsedShapes.cdl
@@ -34,7 +34,7 @@ uses
 
 is
 
-    Create returns mutable UsedShapes from TNaming 
+    Create returns UsedShapes from TNaming 
     is private;
 
     Destroy(me : mutable);
@@ -54,7 +54,7 @@ is
 	---Purpose: Returns the ID: 2a96b614-ec8b-11d0-bee7-080009dc3333.
     	---C++: return const &
     
-    BackupCopy(me) returns mutable Attribute from TDF
+    BackupCopy(me) returns Attribute from TDF
     is redefined;
 	---Purpose: Copies  the attribute  contents into  a  new other
 	--          attribute. It is used by Backup().
@@ -95,14 +95,14 @@ is
     -- ----------------
 
     NewEmpty(me)
-    	returns mutable Attribute from TDF
+    	returns Attribute from TDF
     	is redefined;
 	---Purpose: Returns an new empty attribute from the good end
 	--          type. It is used by the copy algorithm.
 
     Paste(me;
-    	  intoAttribute    : mutable Attribute from TDF;
-	  aRelocTationable : mutable RelocationTable from TDF)
+    	  intoAttribute    : Attribute from TDF;
+	  aRelocTationable : RelocationTable from TDF)
  	is redefined;
 	---Purpose: This method is different from the "Copy" one,
 	--          because it is used when copying an attribute from
diff --git a/src/TPrsStd/TPrsStd_AISPresentation.cdl b/src/TPrsStd/TPrsStd_AISPresentation.cdl
index 7895d97344..84b2402e8b 100644
--- a/src/TPrsStd/TPrsStd_AISPresentation.cdl
+++ b/src/TPrsStd/TPrsStd_AISPresentation.cdl
@@ -70,7 +70,7 @@ is
     ---Category: Presentation attribute implementation
     --          ======================================
     
-    Create returns mutable AISPresentation from TPrsStd;
+    Create returns AISPresentation from TPrsStd;
     
     SetDisplayed(me : mutable; B : Boolean from Standard);
     
@@ -179,14 +179,14 @@ is
     ---C++: return const &
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;    
+    returns Attribute from TDF;    
  
     Restore(me: mutable; with : Attribute from TDF);
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);     
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);     
 
-    BackupCopy(me) returns mutable Attribute from TDF is redefined;
+    BackupCopy(me) returns Attribute from TDF is redefined;
     
     ---Category: Callbacks for viewer updating
     --           =============================
diff --git a/src/TPrsStd/TPrsStd_AISViewer.cdl b/src/TPrsStd/TPrsStd_AISViewer.cdl
index 4ffd1ebf15..510650fbc8 100644
--- a/src/TPrsStd/TPrsStd_AISViewer.cdl
+++ b/src/TPrsStd/TPrsStd_AISViewer.cdl
@@ -72,7 +72,7 @@ is
     --          =================
 
     Create
-    returns mutable AISViewer from TPrsStd; 
+    returns AISViewer from TPrsStd; 
     
     Update (me);
 ---Purpose: Updates the viewer at the label access.
@@ -94,10 +94,10 @@ is
     Restore(me: mutable; with : Attribute from TDF);
     
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
     
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF); 
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF); 
 	       
 fields
 
diff --git a/src/TPrsStd/TPrsStd_AxisDriver.cdl b/src/TPrsStd/TPrsStd_AxisDriver.cdl
index 7fd5f8d0d7..5e488d2feb 100644
--- a/src/TPrsStd/TPrsStd_AxisDriver.cdl
+++ b/src/TPrsStd/TPrsStd_AxisDriver.cdl
@@ -24,7 +24,7 @@ uses
 is
 
     Create
-    returns mutable AxisDriver from TPrsStd;
+    returns AxisDriver from TPrsStd;
 ---Purpose: Constructs an empty axis driver.
     
     Update (me : mutable ;
diff --git a/src/TPrsStd/TPrsStd_ConstraintDriver.cdl b/src/TPrsStd/TPrsStd_ConstraintDriver.cdl
index b1bbde476f..e0b0d653b7 100644
--- a/src/TPrsStd/TPrsStd_ConstraintDriver.cdl
+++ b/src/TPrsStd/TPrsStd_ConstraintDriver.cdl
@@ -24,7 +24,7 @@ uses
 is
 
     Create
-    returns mutable ConstraintDriver from TPrsStd;
+    returns ConstraintDriver from TPrsStd;
 ---Purpose: Constructs an empty constraint driver.
     Update (me : mutable ;
            aLabel      : Label from TDF;
diff --git a/src/TPrsStd/TPrsStd_DriverTable.cdl b/src/TPrsStd/TPrsStd_DriverTable.cdl
index d59d6e42ed..bd8088d892 100644
--- a/src/TPrsStd/TPrsStd_DriverTable.cdl
+++ b/src/TPrsStd/TPrsStd_DriverTable.cdl
@@ -32,11 +32,11 @@ uses Boolean    from Standard,
 
 is
 
-    Get (myclass) returns mutable DriverTable from TPrsStd;
+    Get (myclass) returns DriverTable from TPrsStd;
     ---Purpose: Returns the static table.
     --          If it does not exist, creates it and fills it with standard drivers.
 
-    Create returns mutable DriverTable from TPrsStd;
+    Create returns DriverTable from TPrsStd;
     ---Purpose: Default constructor
 
     InitStandardDrivers (me : mutable);
diff --git a/src/TPrsStd/TPrsStd_GeometryDriver.cdl b/src/TPrsStd/TPrsStd_GeometryDriver.cdl
index 892eabcec8..f9814bc0c8 100644
--- a/src/TPrsStd/TPrsStd_GeometryDriver.cdl
+++ b/src/TPrsStd/TPrsStd_GeometryDriver.cdl
@@ -25,7 +25,7 @@ uses
 is
 
     Create
-    returns mutable GeometryDriver from TPrsStd;
+    returns GeometryDriver from TPrsStd;
 ---Purpose: Constructs an empty geometry driver.    
     Update (me : mutable ;
            aLabel      : Label from TDF;
diff --git a/src/TPrsStd/TPrsStd_NamedShapeDriver.cdl b/src/TPrsStd/TPrsStd_NamedShapeDriver.cdl
index 6802f0b3a6..9f8cf7747e 100644
--- a/src/TPrsStd/TPrsStd_NamedShapeDriver.cdl
+++ b/src/TPrsStd/TPrsStd_NamedShapeDriver.cdl
@@ -24,7 +24,7 @@ uses
 is
 
     Create
-    returns mutable NamedShapeDriver from TPrsStd;
+    returns NamedShapeDriver from TPrsStd;
 ---Purpose: Constructs an empty named shape driver.
     Update (me : mutable ;
            aLabel      : Label from TDF;
diff --git a/src/TPrsStd/TPrsStd_PlaneDriver.cdl b/src/TPrsStd/TPrsStd_PlaneDriver.cdl
index 281784aca0..7c34da3a0f 100644
--- a/src/TPrsStd/TPrsStd_PlaneDriver.cdl
+++ b/src/TPrsStd/TPrsStd_PlaneDriver.cdl
@@ -24,7 +24,7 @@ uses
 is
 
     Create
-    returns mutable PlaneDriver from TPrsStd;
+    returns PlaneDriver from TPrsStd;
 ---Purpose: Constructs an empty plane driver.
     Update (me : mutable ;
            aLabel      : Label from TDF;
diff --git a/src/TPrsStd/TPrsStd_PointDriver.cdl b/src/TPrsStd/TPrsStd_PointDriver.cdl
index d26108a8be..b9ca6db866 100644
--- a/src/TPrsStd/TPrsStd_PointDriver.cdl
+++ b/src/TPrsStd/TPrsStd_PointDriver.cdl
@@ -24,7 +24,7 @@ uses
 is
 
     Create
-    returns mutable PointDriver from TPrsStd;
+    returns PointDriver from TPrsStd;
 ---Purpose: Constructs an empty point driver.
     Update (me : mutable ;
            aLabel      : Label from TDF;
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cdl b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cdl
index 370069101a..bc17a9bd86 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cdl
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cdl
@@ -29,11 +29,11 @@ uses
 is
 
     Create (C : Curve from Geom2d; CColor : Color from Draw)
-    returns mutable DrawableC2D from TestTopOpeDraw;
+    returns DrawableC2D from TestTopOpeDraw;
 
     Create (C : Curve from Geom2d; CColor : Color from Draw;
     	    Text : CString; TextColor : Color from Draw)
-    returns mutable DrawableC2D from TestTopOpeDraw;
+    returns DrawableC2D from TestTopOpeDraw;
 
     Create (C : Curve from Geom2d; CColor : Color from Draw;
     	    Text : CString; TextColor : Color from Draw;
@@ -42,7 +42,7 @@ is
             DispCurvRadius : Boolean = Standard_False;
 	    RadiusMax : Real = 1.0e3;
 	    RatioOfRadius : Real = 0.1)
-    returns mutable DrawableC2D from TestTopOpeDraw;
+    returns DrawableC2D from TestTopOpeDraw;
 
     Pnt2d(me) returns Pnt2d from gp is virtual;
     
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cdl b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cdl
index d658daa910..9f099add8b 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cdl
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cdl
@@ -31,17 +31,17 @@ uses
 is
 
     Create (C : Curve from Geom; CColor : Color from Draw)
-    returns mutable DrawableC3D from TestTopOpeDraw;
+    returns DrawableC3D from TestTopOpeDraw;
 
     Create (C : Curve from Geom; CColor : Color from Draw;
     	    Text : CString; TextColor : Color from Draw)
-    returns mutable DrawableC3D from TestTopOpeDraw;
+    returns DrawableC3D from TestTopOpeDraw;
 
     Create (C : Curve from Geom; CColor : Color from Draw;
     	    Text : CString; TextColor : Color from Draw;
     	    Discret : Integer; Deflection : Real; DrawMode : Integer;
     	    DispOrigin : Boolean from Standard = Standard_True)
-    returns mutable DrawableC3D from TestTopOpeDraw;
+    returns DrawableC3D from TestTopOpeDraw;
 
     Pnt(me) returns Pnt from gp is virtual;
     
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cdl b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cdl
index 0329fdc78c..4e5a892ec7 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cdl
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cdl
@@ -36,7 +36,7 @@ is
      TextColor : Color from Draw;
      ScaleX : Real from Standard = 1.0;
      ScaleY : Real from Standard = 1.0)
-    returns mutable DrawableMesure from TestTopOpeDraw;
+    returns DrawableMesure from TestTopOpeDraw;
 
     SetScale(me : mutable; ScaleX : Real from Standard;
     	    	    	   ScaleY : Real from Standard);
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cdl b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cdl
index 1ab4b2aa98..19e0ef2040 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cdl
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cdl
@@ -32,25 +32,25 @@ is
 
     Create (P : Pnt2d from gp; PColor : Color from Draw;
     	    moveX : Real = 0.0; moveY : Real = 0.0)
-    returns mutable DrawableP2D from TestTopOpeDraw;
+    returns DrawableP2D from TestTopOpeDraw;
 
     Create (P : Pnt2d from gp; PColor : Color from Draw;
     	    Text : CString; TextColor : Color from Draw;
     	    moveX : Real = 0.0; moveY : Real = 0.0)
-    returns mutable DrawableP2D from TestTopOpeDraw;
+    returns DrawableP2D from TestTopOpeDraw;
 
     Create (P : Pnt2d from gp; T : MarkerShape from Draw; PColor : Color from Draw;
     	    Text : CString from Standard; TextColor : Color from Draw;
 	    Size : Integer from Standard = 2;
     	    moveX : Real = 0.0; moveY : Real = 0.0)
-    returns mutable DrawableP2D from TestTopOpeDraw;
+    returns DrawableP2D from TestTopOpeDraw;
 
     Create (P : Pnt2d from gp; T : MarkerShape from Draw; 
     	    PColor : Color from Draw;
     	    Text : CString from Standard; TextColor : Color from Draw;
     	    Tol : Real from Standard;
     	    moveX : Real = 0.0; moveY : Real = 0.0)
-    returns mutable DrawableP2D from TestTopOpeDraw;
+    returns DrawableP2D from TestTopOpeDraw;
 
     ChangePnt2d(me : mutable; P : Pnt2d);
     
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cdl b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cdl
index db74501df4..4f580fc278 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cdl
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cdl
@@ -33,25 +33,25 @@ is
 
     Create (P : Pnt from gp; PColor : Color from Draw;
     	    moveX : Real = 0.0; moveY : Real = 0.0)
-    returns mutable DrawableP3D from TestTopOpeDraw;
+    returns DrawableP3D from TestTopOpeDraw;
 
     Create (P : Pnt from gp; PColor : Color from Draw;
     	    Text : CString; TextColor : Color from Draw;
     	    moveX : Real = 0.0; moveY : Real = 0.0)
-    returns mutable DrawableP3D from TestTopOpeDraw;
+    returns DrawableP3D from TestTopOpeDraw;
 
     Create (P : Pnt from gp; T : MarkerShape from Draw; PColor : Color from Draw;
     	    Text : CString from Standard; TextColor : Color from Draw;
 	    Size : Integer from Standard = 2;
     	    moveX : Real = 0.0; moveY : Real = 0.0)
-    returns mutable DrawableP3D from TestTopOpeDraw;
+    returns DrawableP3D from TestTopOpeDraw;
 
     Create (P : Pnt from gp; T : MarkerShape from Draw; 
     	    PColor : Color from Draw;
     	    Text : CString from Standard; TextColor : Color from Draw;
     	    Tol : Real from Standard;
     	    moveX : Real = 0.0; moveY : Real = 0.0)
-    returns mutable DrawableP3D from TestTopOpeDraw;
+    returns DrawableP3D from TestTopOpeDraw;
 
     ChangePnt(me : mutable; P : Pnt);
     
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cdl b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cdl
index 1f6f6e7aa6..9e9876a319 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cdl
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cdl
@@ -41,7 +41,7 @@ is
     	    Text      : CString from Standard; 
     	    TextColor : Color from Draw;
     	    DisplayGeometry : Boolean from Standard = Standard_False)
-    returns mutable DrawableSHA from TestTopOpeDraw;
+    returns DrawableSHA from TestTopOpeDraw;
 
     SetDisplayGeometry(me : mutable; b : Boolean from Standard) is static;
 
diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cdl b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cdl
index 7c6ee98d72..b78eee13e2 100644
--- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cdl
+++ b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cdl
@@ -29,11 +29,11 @@ uses
 is 
 
     Create (S : Surface from Geom; IsoColor : Color from Draw)
-    returns mutable DrawableSUR from TestTopOpeDraw;
+    returns DrawableSUR from TestTopOpeDraw;
 
     Create (S : Surface from Geom; IsoColor : Color from Draw;
     	    Text : CString from Standard; TextColor : Color from Draw)
-    returns mutable DrawableSUR from TestTopOpeDraw;
+    returns DrawableSUR from TestTopOpeDraw;
 
     Create (S : Surface from Geom; IsoColor : Color from Draw;
             BoundColor,NormalColor : Color from Draw;
@@ -41,7 +41,7 @@ is
 	    Nu,Nv : Integer;
     	    Discret : Integer; Deflection : Real; DrawMode : Integer;
     	    DispOrigin : Boolean from Standard = Standard_True)
-    returns mutable DrawableSUR from TestTopOpeDraw;
+    returns DrawableSUR from TestTopOpeDraw;
 
     Pnt(me) returns Pnt from gp
     is static;
diff --git a/src/TopLoc/TopLoc_Datum3D.cdl b/src/TopLoc/TopLoc_Datum3D.cdl
index e6b6c54a92..b9501177e8 100644
--- a/src/TopLoc/TopLoc_Datum3D.cdl
+++ b/src/TopLoc/TopLoc_Datum3D.cdl
@@ -29,10 +29,10 @@ raises
     ConstructionError from Standard
     
 is
-    Create returns mutable Datum3D;
+    Create returns Datum3D;
     	---Purpose: Constructs a default Datum3D.
 
-    Create(T : Trsf from gp) returns mutable Datum3D from TopLoc
+    Create(T : Trsf from gp) returns Datum3D from TopLoc
 	---Purpose: Constructs a Datum3D form a Trsf from gp. An error is
 	--          raised if the Trsf is not a rigid transformation.
     raises 
diff --git a/src/TopLoc/TopLoc_SListNodeOfItemLocation.cdl b/src/TopLoc/TopLoc_SListNodeOfItemLocation.cdl
index 46d978bba0..8c3ae835fe 100644
--- a/src/TopLoc/TopLoc_SListNodeOfItemLocation.cdl
+++ b/src/TopLoc/TopLoc_SListNodeOfItemLocation.cdl
@@ -21,7 +21,7 @@ uses
     ItemLocation        from TopLoc
     
 is
-   Create(I : ItemLocation from TopLoc; aTail :  SListOfItemLocation from TopLoc) returns mutable SListNodeOfItemLocation from TopLoc;
+   Create(I : ItemLocation from TopLoc; aTail :  SListOfItemLocation from TopLoc) returns SListNodeOfItemLocation from TopLoc;
    ---C++:inline
 
    Count(me) returns Integer;
diff --git a/src/TopOpeBRep/TopOpeBRep_FFDumper.cdl b/src/TopOpeBRep/TopOpeBRep_FFDumper.cdl
index 5756234dd0..9489264626 100644
--- a/src/TopOpeBRep/TopOpeBRep_FFDumper.cdl
+++ b/src/TopOpeBRep/TopOpeBRep_FFDumper.cdl
@@ -29,7 +29,7 @@ uses
     
 is 
 
-    Create(PFF:PFacesFiller) returns mutable FFDumper from  TopOpeBRep; 
+    Create(PFF:PFacesFiller) returns FFDumper from  TopOpeBRep; 
     Init(me:mutable;PFF:PFacesFiller); 
     DumpLine(me:mutable;I:Integer);
     DumpLine(me:mutable;L:LineInter);
diff --git a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cdl b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cdl
index 981234fbdc..b7dde5082a 100644
--- a/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cdl
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxee2d.cdl
@@ -28,7 +28,7 @@ uses
     
 is
 
-    Create returns mutable Hctxee2d from TopOpeBRep;
+    Create returns Hctxee2d from TopOpeBRep;
     SetEdges(me:mutable;E1,E2:Edge;BAS1,BAS2:Surface from BRepAdaptor);
     Edge(me;I:Integer) returns Shape;---C++ : return const &
     Curve(me;I:Integer) returns Curve from Geom2dAdaptor; ---C++ : return const &
diff --git a/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cdl b/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cdl
index 070df5b9e4..804354236c 100644
--- a/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cdl
+++ b/src/TopOpeBRep/TopOpeBRep_Hctxff2d.cdl
@@ -26,7 +26,7 @@ uses
 
 is
 
-    Create returns mutable Hctxff2d from TopOpeBRep;
+    Create returns Hctxff2d from TopOpeBRep;
     SetFaces(me:mutable; F1,F2:Face);
     SetHSurfaces(me:mutable; S1,S2:HSurface from BRepAdaptor);
     SetHSurfacesPrivate(me:mutable) is private;
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cdl b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cdl
index 75f0dfcc43..727f7d54f7 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cdl
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cdl
@@ -88,11 +88,11 @@ is
     BuildTool(me) returns BuildTool from TopOpeBRepDS;
     ---C++: return const &
 
-    Perform (me:in out;HDS:mutable HDataStructure)  is  virtual;
+    Perform (me:in out;HDS: HDataStructure)  is  virtual;
     ---Purpose: Stores the data structure <HDS>,  
     -- Create shapes from the new geometries.
     --modified by NIZHNY-MZV  Thu Nov  4 13:20:25 1999
-    Perform (me:in out;HDS:mutable HDataStructure;S1,S2:Shape)  is  virtual;
+    Perform (me:in out;HDS: HDataStructure;S1,S2:Shape)  is  virtual;
     ---Purpose: Stores the data structure <HDS>,  
     -- Create shapes from the new geometries,
     -- Evaluates if an operation performed on shapes S1,S2 
@@ -201,11 +201,11 @@ is
     Section(me:in out) returns ListOfShape;
     ---C++: return const &
 
-    BuildVertices (me:in out;DS:mutable HDataStructure);
+    BuildVertices (me:in out;DS: HDataStructure);
     ---Purpose: update the DS by creating new geometries.
     --          create vertices on DS points.
 
-    BuildEdges (me:in out;DS:mutable HDataStructure);
+    BuildEdges (me:in out;DS: HDataStructure);
     ---Purpose: update the DS by creating new geometries.
     --          create shapes from the new geometries.
 
@@ -221,15 +221,15 @@ is
     -- private
     -------
 
-    BuildEdges (me:in out;iC:Integer;DS:mutable HDataStructure) is protected;
+    BuildEdges (me:in out;iC:Integer;DS: HDataStructure) is protected;
     ---Purpose: update the DS by creating new geometries.
     --          create edges on the new curve <Icurv>.
 
-    BuildFaces (me:in out;iS:Integer;DS:mutable HDataStructure) is protected;
+    BuildFaces (me:in out;iS:Integer;DS: HDataStructure) is protected;
     ---Purpose: update the DS by creating new geometries.
     --          create faces on the new surface <ISurf>.
     
-    BuildFaces (me:in out;DS:mutable HDataStructure) is protected;
+    BuildFaces (me:in out;DS: HDataStructure) is protected;
     ---Purpose: update the DS by creating new geometries.
     --          create shapes from the new geometries.
     
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.cdl b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.cdl
index e8a02236ed..e1675b84b1 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.cdl
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1.cdl
@@ -57,7 +57,7 @@ is
     ---Purpose: Removes all splits and merges already performed.
     -- Does NOT clear the handled DS  (except  ShapeWithStatesMaps).
  
-    Perform (me:in out;HDS:mutable HDataStructure  from  TopOpeBRepDS )  is  redefined; 
+    Perform (me:in out;HDS: HDataStructure  from  TopOpeBRepDS )  is  redefined; 
      
     Perform(me:  out;  HDS  :  HDataStructure  from  TopOpeBRepDS; 
     	    S1  :  Shape  from  TopoDS; 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cdl b/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cdl
index eb54066f53..9892b8fdc5 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cdl
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_HBuilder.cdl
@@ -46,18 +46,18 @@ raises
 
 is
     
-    Create (BT : BuildTool from TopOpeBRepDS) returns mutable HBuilder;
+    Create (BT : BuildTool from TopOpeBRepDS) returns HBuilder;
 
     BuildTool(me) returns BuildTool from TopOpeBRepDS;
     ---C++: return const &
 
-    Perform (me : mutable; HDS : mutable HDataStructure from TopOpeBRepDS)
+    Perform (me : mutable; HDS : HDataStructure from TopOpeBRepDS)
     is static;
     ---Purpose: 
     -- Stores the data structure <HDS>,  
     -- Create shapes from the new geometries described in <HDS>.
 
-    Perform (me : mutable; HDS : mutable HDataStructure from TopOpeBRepDS; 
+    Perform (me : mutable; HDS : HDataStructure from TopOpeBRepDS; 
     	     	    	   S1,S2 : Shape from TopoDS)
     is static;
     ---Purpose: 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cdl b/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cdl
index 18efb7fce5..28ade913dc 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cdl
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Loop.cdl
@@ -29,8 +29,8 @@ uses
 
 is
 
-    Create(S : Shape from TopoDS) returns mutable Loop;
-    Create(BI : BlockIterator) returns mutable Loop;
+    Create(S : Shape from TopoDS) returns Loop;
+    Create(BI : BlockIterator) returns Loop;
 	
     IsShape(me) returns Boolean from Standard is virtual;
 
diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cdl b/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cdl
index dfceadd944..f9e0a9fd0d 100644
--- a/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cdl
+++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_Pave.cdl
@@ -25,7 +25,7 @@ uses
     Kind  from  TopOpeBRepDS
 is
 
-    Create(V : Shape from TopoDS; P : Real; bound : Boolean) returns mutable Pave;
+    Create(V : Shape from TopoDS; P : Real; bound : Boolean) returns Pave;
     ---Purpose: V = vertex, P = parameter of vertex <V>
     --          bound = True if <V> is an old vertex
     --          bound = False if <V> is a new vertex
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Association.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_Association.cdl
index 2e045539ca..e30df7c76f 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Association.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Association.cdl
@@ -25,7 +25,7 @@ uses
 
 is
 
-    Create returns mutable Association from TopOpeBRepDS;
+    Create returns Association from TopOpeBRepDS;
     
     Associate  (me : mutable; I,K : Interference from TopOpeBRepDS) 
     is static;
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Check.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_Check.cdl
index 7a137450cd..4737d25192 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Check.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Check.cdl
@@ -38,7 +38,7 @@ is
     Create returns Check from TopOpeBRepDS;
 
     Create(HDS : HDataStructure from TopOpeBRepDS) 
-    returns mutable Check from TopOpeBRepDS;
+    returns Check from TopOpeBRepDS;
     	
 -- Check Integrity of DS
 
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.cdl
index 674ac1b034..89bedb0b68 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_CurvePointInterference.cdl
@@ -33,7 +33,7 @@ is
 	   GT : Kind from TopOpeBRepDS;
 	   G  : Integer from Standard;
 	   P  : Real from Standard) 
-    returns mutable CurvePointInterference from TopOpeBRepDS; 
+    returns CurvePointInterference from TopOpeBRepDS; 
 	    
     Parameter(me) returns Real from Standard
     is static;
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Edge3dInterferenceTool.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_Edge3dInterferenceTool.cdl
index 5f41602ed1..f54909139a 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Edge3dInterferenceTool.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Edge3dInterferenceTool.cdl
@@ -47,7 +47,7 @@ is
 	F : Shape from TopoDS;
         I : Interference from TopOpeBRepDS);
 
-    Transition(me; I : mutable Interference from TopOpeBRepDS)
+    Transition(me; I : Interference from TopOpeBRepDS)
     is static;
 
 fields
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_EdgeInterferenceTool.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_EdgeInterferenceTool.cdl
index aab46d238b..e961419167 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_EdgeInterferenceTool.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_EdgeInterferenceTool.cdl
@@ -47,7 +47,7 @@ is
         I : Interference from TopOpeBRepDS)
     is static;
     
-    Transition(me; I : mutable Interference from TopOpeBRepDS)
+    Transition(me; I : Interference from TopOpeBRepDS)
     is static;
     
 fields
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.cdl
index 1389c0b476..6f162c8dbc 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_EdgeVertexInterference.cdl
@@ -36,7 +36,7 @@ is
     	   C  : Config from TopOpeBRepDS;
 	   P  : Real from Standard)
 	   
-    returns mutable EdgeVertexInterference from TopOpeBRepDS; 
+    returns EdgeVertexInterference from TopOpeBRepDS; 
 
     	---Purpose: Create an interference of VERTEX <G> on a crossed EDGE E.
     	--  
@@ -70,7 +70,7 @@ is
     	--  interference is stored in the list of interfs of the edge.
     	--  
 
-    returns mutable EdgeVertexInterference from TopOpeBRepDS; 
+    returns EdgeVertexInterference from TopOpeBRepDS; 
 	    
     Parameter(me) returns Real from Standard
     is static;
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.cdl
index 725d50ca62..3849fcd122 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_FaceEdgeInterference.cdl
@@ -33,7 +33,7 @@ is
 	   
     	---Purpose: Create an interference of EDGE <G> on FACE <S>.
 
-    returns mutable FaceEdgeInterference from TopOpeBRepDS; 
+    returns FaceEdgeInterference from TopOpeBRepDS; 
 	    
     Dump(me; OS : in out OStream from Standard) returns OStream
     is redefined;
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cdl
index ef35814c8f..8081394732 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cdl
@@ -65,7 +65,7 @@ is
     GetEdgePntPar(me ; P : out Pnt from gp; par : out Real);
     IsEdgePntParDef(me) returns Boolean;
 
-    Transition(me; I : mutable Interference from TopOpeBRepDS)
+    Transition(me; I : Interference from TopOpeBRepDS)
     is static;
     
 fields
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cdl
index e65a4bedad..08f09416d6 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_GapTool.cdl
@@ -30,10 +30,10 @@ uses
     DataMapOfInterferenceShape         from TopOpeBRepDS
 is
     
-    Create returns mutable GapTool from TopOpeBRepDS;    
+    Create returns GapTool from TopOpeBRepDS;    
 
     Create (HDS : HDataStructure from TopOpeBRepDS)
-    returns mutable GapTool from TopOpeBRepDS;
+    returns GapTool from TopOpeBRepDS;
     
     Init   (me : mutable; HDS : HDataStructure from TopOpeBRepDS);
     
@@ -74,11 +74,11 @@ is
 
     ---Modification 
     --              
-    SetPoint (me : mutable; I          : mutable Interference from TopOpeBRepDS;
+    SetPoint (me : mutable; I          : Interference from TopOpeBRepDS;
     	    	            IndexPoint :         Integer      from Standard);
     
     SetParameterOnEdge (me : mutable; 
-    	    	    	I  : mutable Interference from TopOpeBRepDS;
+    	    	    	I  : Interference from TopOpeBRepDS;
     	    	    	E  :         Shape        from TopoDS;
 			U  :         Real         from Standard)
     is static;			    
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cdl
index ecd8bdecfe..01a8bc6edc 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_HDataStructure.cdl
@@ -40,7 +40,7 @@ uses
     
 is
 
-    Create returns mutable HDataStructure from TopOpeBRepDS;
+    Create returns HDataStructure from TopOpeBRepDS;
     
     AddAncestors(me : mutable; S : Shape from TopoDS);
     
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cdl
index f8017d8e6c..38c936ffce 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Interference.cdl
@@ -48,17 +48,17 @@ uses
 
 is
 
-    Create returns mutable Interference from TopOpeBRepDS;
+    Create returns Interference from TopOpeBRepDS;
 
     Create(Transition   : Transition from TopOpeBRepDS;
 	   SupportType  : Kind from TopOpeBRepDS;
 	   Support      : Integer from Standard;
 	   GeometryType : Kind from TopOpeBRepDS;
 	   Geometry     : Integer from Standard)
-    returns mutable Interference from TopOpeBRepDS;
+    returns Interference from TopOpeBRepDS;
 
     Create( I : Interference from TopOpeBRepDS )
-    returns mutable Interference from TopOpeBRepDS;
+    returns Interference from TopOpeBRepDS;
 
     Transition(me) returns Transition from TopOpeBRepDS
     ---C++: return const &
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceTool.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceTool.cdl
index f4e0c78e67..df20e58acc 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceTool.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_InterferenceTool.cdl
@@ -74,7 +74,7 @@ is
     Parameter(myclass; CPI : Interference from TopOpeBRepDS)
     returns Real from Standard;
 
-    Parameter(myclass; CPI : mutable Interference from TopOpeBRepDS; 
+    Parameter(myclass; CPI : Interference from TopOpeBRepDS; 
                        Par : Real from Standard);
     
 end InterferenceTool from TopOpeBRepDS;
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_Marker.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_Marker.cdl
index a1c51c217b..b006bec3d8 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_Marker.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_Marker.cdl
@@ -19,7 +19,7 @@ uses
     HArray1OfBoolean from TColStd,
     AsciiString from TCollection
 is
-    Create returns mutable Marker;
+    Create returns Marker;
     Reset(me:mutable);
     Set(me:mutable;i:Integer;b:Boolean);
     Set(me:mutable;b:Boolean;n:Integer;a:Address);
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cdl
index 3ec6ab4b54..7171e9d4df 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_ShapeShapeInterference.cdl
@@ -59,7 +59,7 @@ is
     -- 	 <S> and <Ancestor> have identical types, 
     -- 	 <S> and <Ancestor> orientations are DIFFERENT.
     -- 
-    returns mutable ShapeShapeInterference from TopOpeBRepDS; 
+    returns ShapeShapeInterference from TopOpeBRepDS; 
 	    
     
     Config(me) returns Config from TopOpeBRepDS
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cdl
index 860fe87652..cd95fedef5 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_SolidSurfaceInterference.cdl
@@ -32,7 +32,7 @@ is
 	   Support      : Integer;
 	   GeometryType : Kind from TopOpeBRepDS;
 	   Geometry     : Integer)
-    returns mutable SolidSurfaceInterference from TopOpeBRepDS;
+    returns SolidSurfaceInterference from TopOpeBRepDS;
 
     Dump(me; OS : in out OStream from Standard) returns OStream
     is redefined;
diff --git a/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cdl b/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cdl
index deb2662fc1..27d34a9280 100644
--- a/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cdl
+++ b/src/TopOpeBRepDS/TopOpeBRepDS_SurfaceCurveInterference.cdl
@@ -28,7 +28,7 @@ uses
     
 is
 
-    Create returns mutable SurfaceCurveInterference from TopOpeBRepDS;
+    Create returns SurfaceCurveInterference from TopOpeBRepDS;
 
     Create(Transition   : Transition from TopOpeBRepDS;
 	   SupportType  : Kind from TopOpeBRepDS;
@@ -36,10 +36,10 @@ is
 	   GeometryType : Kind from TopOpeBRepDS;
 	   Geometry     : Integer;
     	   PC : Curve from Geom2d) 
-    returns mutable SurfaceCurveInterference from TopOpeBRepDS; 
+    returns SurfaceCurveInterference from TopOpeBRepDS; 
 
     Create(I : Interference from TopOpeBRepDS)
-    returns mutable SurfaceCurveInterference from TopOpeBRepDS; 
+    returns SurfaceCurveInterference from TopOpeBRepDS; 
 	    
     PCurve(me) returns any Curve from Geom2d is static;
 	---C++: return const &
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cdl b/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cdl
index 8e534577b8..5f6858cd8f 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cdl
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_HBoxTool.cdl
@@ -25,7 +25,7 @@ uses
     
 is
     
-    Create returns mutable HBoxTool from TopOpeBRepTool;
+    Create returns HBoxTool from TopOpeBRepTool;
     Clear(me:mutable);
     AddBoxes(me:mutable;S:Shape;TS:ShapeEnum;TA:ShapeEnum=TopAbs_SHAPE);
     AddBox(me:mutable;S:Shape);
diff --git a/src/TopoDS/TopoDS_Builder.cdl b/src/TopoDS/TopoDS_Builder.cdl
index fea8fd5d3b..49fd26fec4 100644
--- a/src/TopoDS/TopoDS_Builder.cdl
+++ b/src/TopoDS/TopoDS_Builder.cdl
@@ -72,7 +72,7 @@ raises
 
 is
     MakeShape(me; S : out     Shape  from TopoDS;
-                  T : mutable TShape from TopoDS)
+                  T : TShape from TopoDS)
     ---Purpose: The basic method to make  a Shape, used by all the
     --          Make methods.
     is static protected;
diff --git a/src/TopoDS/TopoDS_HShape.cdl b/src/TopoDS/TopoDS_HShape.cdl
index ff12e1a0ce..22d04be847 100644
--- a/src/TopoDS/TopoDS_HShape.cdl
+++ b/src/TopoDS/TopoDS_HShape.cdl
@@ -21,12 +21,12 @@ class HShape from TopoDS inherits TShared from MMgt
 uses Shape from TopoDS
 
 is
-    Create returns mutable HShape from TopoDS;
+    Create returns HShape from TopoDS;
     ---C++: inline
     ---Purpose: Constructs an empty shape object
 
     Create (aShape : Shape from TopoDS)
-    returns mutable HShape from TopoDS;
+    returns HShape from TopoDS;
     ---C++: inline
     ---Purpose: Constructs a shape object defined by the shape aShape.
 
diff --git a/src/TopoDS/TopoDS_TCompSolid.cdl b/src/TopoDS/TopoDS_TCompSolid.cdl
index fe6f2ee8fb..8f5ea45d7c 100644
--- a/src/TopoDS/TopoDS_TCompSolid.cdl
+++ b/src/TopoDS/TopoDS_TCompSolid.cdl
@@ -20,14 +20,14 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TCompSolid from TopoDS;
+    Create returns TCompSolid from TopoDS;
     ---C++: inline
     ---Purpose: Creates an empty TCompSolid.
 
     ShapeType(me) returns ShapeEnum from TopAbs;
     ---Purpose: returns COMPSOLID
 
-    EmptyCopy(me) returns mutable TShape from TopoDS;
+    EmptyCopy(me) returns TShape from TopoDS;
     ---Purpose: Returns an empty TCompSolid.
 
 end TCompSolid;
diff --git a/src/TopoDS/TopoDS_TCompound.cdl b/src/TopoDS/TopoDS_TCompound.cdl
index bd74142e6e..5fac978a07 100644
--- a/src/TopoDS/TopoDS_TCompound.cdl
+++ b/src/TopoDS/TopoDS_TCompound.cdl
@@ -20,14 +20,14 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TCompound from TopoDS;
+    Create returns TCompound from TopoDS;
     ---C++: inline
     ---Purpose: Creates an empty TCompound.
 
     ShapeType(me) returns ShapeEnum from TopAbs;
     ---Purpose: Returns COMPOUND.
 
-    EmptyCopy(me) returns mutable TShape from TopoDS;
+    EmptyCopy(me) returns TShape from TopoDS;
     ---Purpose: Returns an empty TCompound.
 
 end TCompound;
diff --git a/src/TopoDS/TopoDS_TFace.cdl b/src/TopoDS/TopoDS_TFace.cdl
index 085d2bab88..2d6fb1b745 100644
--- a/src/TopoDS/TopoDS_TFace.cdl
+++ b/src/TopoDS/TopoDS_TFace.cdl
@@ -20,14 +20,14 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TFace from TopoDS;
+    Create returns TFace from TopoDS;
     ---C++: inline
     ---Purpose: Creates an empty TFace.
     	
     ShapeType(me) returns ShapeEnum from TopAbs;
     ---Purpose: returns FACE.
 
-    EmptyCopy(me) returns mutable TShape from TopoDS is virtual;
+    EmptyCopy(me) returns TShape from TopoDS is virtual;
     ---Purpose: Returns an empty TFace.
 
 end TFace;
diff --git a/src/TopoDS/TopoDS_TShape.cdl b/src/TopoDS/TopoDS_TShape.cdl
index 83ccfde0c0..e9ad69b3ec 100644
--- a/src/TopoDS/TopoDS_TShape.cdl
+++ b/src/TopoDS/TopoDS_TShape.cdl
@@ -134,7 +134,7 @@ is
 	--          VERTEX, EDGE, WIRE, FACE, ....
     is deferred;
     
-    EmptyCopy(me) returns mutable TShape from TopoDS
+    EmptyCopy(me) returns TShape from TopoDS
 	---Purpose: Returns a copy  of the  TShape  with no sub-shapes.
     is deferred;
     
diff --git a/src/TopoDS/TopoDS_TShell.cdl b/src/TopoDS/TopoDS_TShell.cdl
index cd6256b53c..150f0acd52 100644
--- a/src/TopoDS/TopoDS_TShell.cdl
+++ b/src/TopoDS/TopoDS_TShell.cdl
@@ -20,14 +20,14 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TShell from TopoDS;
+    Create returns TShell from TopoDS;
     ---C++: inline
     ---Purpose: Creates an empty TShell.
     	
     ShapeType(me) returns ShapeEnum from TopAbs;
     ---Purpose: Returns SHELL.
 
-    EmptyCopy(me) returns mutable TShape from TopoDS;
+    EmptyCopy(me) returns TShape from TopoDS;
     ---Purpose: Returns an empty TShell.
 
 end TShell;
diff --git a/src/TopoDS/TopoDS_TSolid.cdl b/src/TopoDS/TopoDS_TSolid.cdl
index dcf474dded..0a593d8c64 100644
--- a/src/TopoDS/TopoDS_TSolid.cdl
+++ b/src/TopoDS/TopoDS_TSolid.cdl
@@ -20,14 +20,14 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TSolid from TopoDS;
+    Create returns TSolid from TopoDS;
     ---C++: inline
     ---Purpose: Creates an empty TSolid.
 
     ShapeType(me) returns ShapeEnum from TopAbs;
     ---Purpose: returns SOLID.
 
-    EmptyCopy(me) returns mutable TShape from TopoDS;
+    EmptyCopy(me) returns TShape from TopoDS;
 	---Purpose: Returns an empty TSolid.
 
 end TSolid;
diff --git a/src/TopoDS/TopoDS_TWire.cdl b/src/TopoDS/TopoDS_TWire.cdl
index e02917b001..0bb5839888 100644
--- a/src/TopoDS/TopoDS_TWire.cdl
+++ b/src/TopoDS/TopoDS_TWire.cdl
@@ -20,14 +20,14 @@ uses
     ShapeEnum from TopAbs
 
 is
-    Create returns mutable TWire;
+    Create returns TWire;
     ---C++: inline
     ---Purpose: Creates an empty TWire.
 
     ShapeType(me) returns ShapeEnum from TopAbs;
     ---Purpose: Returns WIRE.
 
-    EmptyCopy(me) returns mutable TShape from TopoDS;
+    EmptyCopy(me) returns TShape from TopoDS;
     ---Purpose: Returns an empty TWire.
 
 end TWire;
diff --git a/src/TopoDSToStep/TopoDSToStep_Builder.cdl b/src/TopoDSToStep/TopoDSToStep_Builder.cdl
index 349a05c385..0bf54fb256 100644
--- a/src/TopoDSToStep/TopoDSToStep_Builder.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_Builder.cdl
@@ -40,13 +40,13 @@ is
     
     Create(S           : Shape from TopoDS;
            T           : in out Tool from TopoDSToStep;
-           FP          : mutable FinderProcess from Transfer)
+           FP          : FinderProcess from Transfer)
     	returns Builder from TopoDSToStep;
     
     Init(me          : in out;
          S           : Shape from TopoDS;
          T           : in out Tool from TopoDSToStep;
-         FP          : mutable FinderProcess from Transfer);
+         FP          : FinderProcess from Transfer);
     
 --  -----------------------------------------------------------    
 --  Get the Result
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cdl b/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cdl
index b8248f5954..fc58953f67 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeBrepWithVoids.cdl
@@ -32,7 +32,7 @@ raises NotDone from StdFail
 is 
 
 Create ( S  : Solid from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
         returns MakeBrepWithVoids;
 
 Value (me) returns BrepWithVoids from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cdl b/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cdl
index 751e8c480e..0209b90615 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrep.cdl
@@ -33,11 +33,11 @@ raises NotDone from StdFail
 is 
 
 Create ( S  : Shell from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
         returns MakeFacetedBrep;
 
 Create ( S  : Solid from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
         returns MakeFacetedBrep;
 
 Value (me) returns FacetedBrep from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrepAndBrepWithVoids.cdl b/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrepAndBrepWithVoids.cdl
index 4a8aa4a6c5..a92f60e485 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrepAndBrepWithVoids.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeFacetedBrepAndBrepWithVoids.cdl
@@ -32,7 +32,7 @@ raises NotDone from StdFail
 is 
 
 Create ( S  : Solid from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
         returns MakeFacetedBrepAndBrepWithVoids;
 
 Value (me) returns FacetedBrepAndBrepWithVoids from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeGeometricCurveSet.cdl b/src/TopoDSToStep/TopoDSToStep_MakeGeometricCurveSet.cdl
index 3552612f86..300f91276d 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeGeometricCurveSet.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeGeometricCurveSet.cdl
@@ -30,7 +30,7 @@ raises NotDone from StdFail
 is 
 
 Create ( SH : Shape from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
         returns MakeGeometricCurveSet;
 
 Value (me) returns GeometricCurveSet from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cdl b/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cdl
index 7fea06635f..f3b2f68fb3 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeManifoldSolidBrep.cdl
@@ -33,11 +33,11 @@ raises NotDone from StdFail
 is 
 
 Create ( S  : Shell from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
        returns MakeManifoldSolidBrep;
 
 Create ( S  : Solid from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
        returns MakeManifoldSolidBrep;
 
 Value (me) returns ManifoldSolidBrep from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cdl b/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cdl
index d6711dd2b2..fcccf98606 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeShellBasedSurfaceModel.cdl
@@ -33,15 +33,15 @@ raises NotDone from StdFail
 is 
 
 Create ( F  : Face from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
         returns MakeShellBasedSurfaceModel;
 
 Create ( S           : Shell from TopoDS;
-         FP          : mutable FinderProcess from Transfer)
+         FP          : FinderProcess from Transfer)
         returns MakeShellBasedSurfaceModel;
 
 Create ( S  : Solid from TopoDS;
-         FP : mutable FinderProcess from Transfer)
+         FP : FinderProcess from Transfer)
         returns MakeShellBasedSurfaceModel;
 
 Value (me) returns ShellBasedSurfaceModel from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cdl b/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cdl
index a54bed0129..606026be25 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepEdge.cdl
@@ -35,13 +35,13 @@ is
     
     Create(E  : Edge from TopoDS;
   	   T  : in out Tool from TopoDSToStep;
-	   FP : mutable FinderProcess from Transfer)
+	   FP : FinderProcess from Transfer)
          returns MakeStepEdge;
     
     Init(me : in out;
     	 E  : Edge from TopoDS;
      	 T  : in out Tool from TopoDSToStep;
-         FP : mutable FinderProcess from Transfer);
+         FP : FinderProcess from Transfer);
 
 	    
     Value (me) returns TopologicalRepresentationItem from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cdl b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cdl
index 450bc43a50..3d9e75a3a6 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cdl
@@ -35,13 +35,13 @@ is
     
     Create (F           : Face from TopoDS;
             T           : in out Tool from TopoDSToStep;
-            FP          : mutable FinderProcess from Transfer)
+            FP          : FinderProcess from Transfer)
          returns MakeStepFace;
     
     Init(me          : in out;
          F           : Face from TopoDS;
          T           : in out Tool from TopoDSToStep;
-         FP          : mutable FinderProcess from Transfer);
+         FP          : FinderProcess from Transfer);
 	    	    
     Value (me) returns TopologicalRepresentationItem from StepShape
     	raises NotDone
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cdl b/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cdl
index 017f66065e..4335e6aba4 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepVertex.cdl
@@ -35,13 +35,13 @@ is
     
     Create (V : Vertex from TopoDS;
     	    T : in out Tool from TopoDSToStep;
-	   FP : mutable FinderProcess from Transfer)
+	   FP : FinderProcess from Transfer)
          returns MakeStepVertex;
     
     Init(me : in out;
      	 V  : Vertex from TopoDS;
      	 T  : in out Tool from TopoDSToStep;
-         FP : mutable FinderProcess from Transfer);
+         FP : FinderProcess from Transfer);
 
 	    
     Value (me) returns TopologicalRepresentationItem from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepWire.cdl b/src/TopoDSToStep/TopoDSToStep_MakeStepWire.cdl
index 4c9f517e22..cdc5062584 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepWire.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepWire.cdl
@@ -35,13 +35,13 @@ is
     
     Create (W : Wire from TopoDS;
     	    T : in out Tool from TopoDSToStep;
-	   FP : mutable FinderProcess from Transfer)
+	   FP : FinderProcess from Transfer)
          returns MakeStepWire;
     
     Init(me : in out;
 	 W  : Wire from TopoDS;
          T  : in out Tool from TopoDSToStep;
-	 FP : mutable FinderProcess from Transfer);
+	 FP : FinderProcess from Transfer);
 
 	    
     Value (me) returns TopologicalRepresentationItem from StepShape
diff --git a/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cdl b/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cdl
index 8298908653..09b1b03256 100644
--- a/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cdl
+++ b/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cdl
@@ -43,13 +43,13 @@ is
     
     Create(S  : Shape from TopoDS;
     	   T  : in out Tool from TopoDSToStep;
-	   FP : mutable FinderProcess from Transfer)
+	   FP : FinderProcess from Transfer)
     	returns WireframeBuilder from TopoDSToStep;
     
     Init(me : in out;
     	 S  : Shape from TopoDS;
     	 T  : in out Tool from TopoDSToStep;
-	 FP : mutable FinderProcess from Transfer);
+	 FP : FinderProcess from Transfer);
     
 --  -----------------------------------------------------------    
 --  Get the Result
diff --git a/src/Transfer/Transfer_ActorDispatch.cdl b/src/Transfer/Transfer_ActorDispatch.cdl
index cd82eb36da..b0f5f12cf1 100644
--- a/src/Transfer/Transfer_ActorDispatch.cdl
+++ b/src/Transfer/Transfer_ActorDispatch.cdl
@@ -34,22 +34,22 @@ raises InterfaceError
 is
 
     Create (amodel : InterfaceModel; lib : GeneralLib)
-    	 returns mutable ActorDispatch;
+    	 returns ActorDispatch;
     ---Purpose : Creates an ActorDispatch from a Model. Works with a General
     --           Service Library, given as an Argument
     --           This causes TransferDispatch and its TransientProcess to be
     --           created, with default actor <me>
 
     Create (amodel : InterfaceModel; protocol : Protocol from Interface)
-    	returns mutable ActorDispatch;
+    	returns ActorDispatch;
     ---Purpose : Same as above, but Library is defined through a Protocol
 
-    Create (amodel : InterfaceModel) returns mutable ActorDispatch
+    Create (amodel : InterfaceModel) returns ActorDispatch
     ---Purpose : Same as above, but works with the Active Protocol
     	raises InterfaceError;
     --           Error if no Active Protocol is defined
 
-    AddActor (me : mutable; actor : mutable ActorOfTransientProcess from Transfer);
+    AddActor (me : mutable; actor : ActorOfTransientProcess from Transfer);
     ---Purpose : Utility which adds an actor to the default <me> (it calls
     --           SetActor from the TransientProcess)
 
@@ -60,8 +60,8 @@ is
     ---C++ : return &
 
 
-    Transfer (me : mutable; start : Transient; TP : mutable TransientProcess)
-    	returns mutable Binder  is redefined;
+    Transfer (me : mutable; start : Transient; TP : TransientProcess)
+    	returns Binder  is redefined;
     ---Purpose : Specific action : it calls the method Transfer from CopyTool
     --           i.e. the general service Copy, then returns the Binder
     --           produced by the TransientProcess
diff --git a/src/Transfer/Transfer_ActorOfFinderProcess.cdl b/src/Transfer/Transfer_ActorOfFinderProcess.cdl
index 06ae067e80..21385c38df 100644
--- a/src/Transfer/Transfer_ActorOfFinderProcess.cdl
+++ b/src/Transfer/Transfer_ActorOfFinderProcess.cdl
@@ -25,24 +25,24 @@ uses Finder, FinderProcess, ProcessForFinder, Binder
 
 is
 
-    Create  returns mutable ActorOfFinderProcess;
+    Create  returns ActorOfFinderProcess;
 
     ModeTrans (me : mutable) returns Integer;
     ---Purpose : Returns the Transfer Mode, modifiable
     ---C++ : return &
 
-    Transferring (me : mutable; start : Finder; TP : mutable ProcessForFinder)
-        returns mutable Binder  is redefined;
+    Transferring (me : mutable; start : Finder; TP : ProcessForFinder)
+        returns Binder  is redefined;
     -- calls the one below
 
-    Transfer (me : mutable; start : Finder; TP : mutable FinderProcess)
-        returns mutable Binder  is virtual;
+    Transfer (me : mutable; start : Finder; TP : FinderProcess)
+        returns Binder  is virtual;
     -- default calls TransferTransient if <start> is a TransientMapper,
     -- i.e. does nothing, to be redefined
 
     TransferTransient (me : mutable; start : Transient;
-    	    	       TP : mutable FinderProcess)
-	returns mutable Transient  is virtual;
+    	    	       TP : FinderProcess)
+	returns Transient  is virtual;
     -- default does nothing, can be redefined
     -- usefull when a result is Transient, simpler to define than Transfer with
     -- a Finder
diff --git a/src/Transfer/Transfer_ActorOfTransientProcess.cdl b/src/Transfer/Transfer_ActorOfTransientProcess.cdl
index c800281291..cf41d1f058 100644
--- a/src/Transfer/Transfer_ActorOfTransientProcess.cdl
+++ b/src/Transfer/Transfer_ActorOfTransientProcess.cdl
@@ -22,19 +22,19 @@ uses Transient, TransientProcess, ProcessForTransient, Binder
 
 is
 
-    Create  returns mutable ActorOfTransientProcess;
+    Create  returns ActorOfTransientProcess;
 
-    Transferring (me : mutable; start : Transient; TP : mutable ProcessForTransient)
-        returns mutable Binder  is redefined;
+    Transferring (me : mutable; start : Transient; TP : ProcessForTransient)
+        returns Binder  is redefined;
     -- calls the one below
 
-    Transfer (me : mutable; start : Transient; TP : mutable TransientProcess)
-        returns mutable Binder  is virtual;
+    Transfer (me : mutable; start : Transient; TP : TransientProcess)
+        returns Binder  is virtual;
     -- default calls TransferTransient i.e. does nothing, to be redefined
 
     TransferTransient (me : mutable; start : Transient;
-    	    	       TP : mutable TransientProcess)
-	returns mutable Transient  is virtual;
+    	    	       TP : TransientProcess)
+	returns Transient  is virtual;
     -- default does nothing, can be redefined
     -- usefull when a result is Transient, simpler to define than Transfer with
     -- a Binder
diff --git a/src/Transfer/Transfer_BinderOfTransientInteger.cdl b/src/Transfer/Transfer_BinderOfTransientInteger.cdl
index bf3aa6f7ba..b740eee997 100644
--- a/src/Transfer/Transfer_BinderOfTransientInteger.cdl
+++ b/src/Transfer/Transfer_BinderOfTransientInteger.cdl
@@ -27,7 +27,7 @@ uses Integer
 
 is
 
-    Create returns mutable BinderOfTransientInteger;
+    Create returns BinderOfTransientInteger;
     ---Purpose : Creates an empty BinderOfTransientInteger; Default value for
     --           the integer part is zero
 
diff --git a/src/Transfer/Transfer_DispatchControl.cdl b/src/Transfer/Transfer_DispatchControl.cdl
index aab5aba3cd..59ca26635a 100644
--- a/src/Transfer/Transfer_DispatchControl.cdl
+++ b/src/Transfer/Transfer_DispatchControl.cdl
@@ -27,11 +27,11 @@ raises InterfaceError
 
 is
 
-    Create (model : InterfaceModel; TP : mutable TransientProcess)
-    	returns mutable DispatchControl;
+    Create (model : InterfaceModel; TP : TransientProcess)
+    	returns DispatchControl;
     ---Purpose : Creates the DispatchControl, ready for use
 
-    TransientProcess (me) returns mutable TransientProcess;
+    TransientProcess (me) returns TransientProcess;
     ---Purpose : Returns the content of the DispatchControl : it can be used
     --           for a direct call, if the basic methods do not suffice
     ---C++ : return const &
@@ -45,12 +45,12 @@ is
     Clear (me : mutable);
     ---Purpose : Clears the List of Copied Results
 
-    Bind (me : mutable; ent : Transient; res : mutable Transient)
+    Bind (me : mutable; ent : Transient; res : Transient)
     ---Purpose : Binds a (Transient) Result to a (Transient) Starting Entity
     	raises InterfaceError;
     --           Error if <ent> is already bound
 
-    Search (me; ent : Transient; res : out mutable Transient)
+    Search (me; ent : Transient; res : out Transient)
     	returns Boolean;
     ---Purpose : Searches for the Result bound to a Starting Entity
     --           If Found, returns True and fills <res>
diff --git a/src/Transfer/Transfer_Finder.cdl b/src/Transfer/Transfer_Finder.cdl
index 77cc4893db..04fb2dd66d 100644
--- a/src/Transfer/Transfer_Finder.cdl
+++ b/src/Transfer/Transfer_Finder.cdl
@@ -61,7 +61,7 @@ is
     --           Returns True when done, False if this attribute did not exist
 
     GetAttribute (me; name : CString; type : Type from Standard;
-    	    	  val : out mutable Transient)  returns Boolean;
+    	    	  val : out Transient)  returns Boolean;
     ---Purpose : Returns an attribute from its name, filtered by a type
     --           If no attribute has this name, or if it is not kind of this
     --           type, <val> is Null and returned value is False
diff --git a/src/Transfer/Transfer_FinderProcess.cdl b/src/Transfer/Transfer_FinderProcess.cdl
index fd9d8431df..05e2930547 100644
--- a/src/Transfer/Transfer_FinderProcess.cdl
+++ b/src/Transfer/Transfer_FinderProcess.cdl
@@ -25,7 +25,7 @@ uses InterfaceModel from Interface,
 
 is
 
-    Create (nb : Integer = 10000) returns mutable FinderProcess;
+    Create (nb : Integer = 10000) returns FinderProcess;
     ---Purpose : Sets FinderProcess at initial state, with an initial size
 
     SetModel (me : mutable; model : InterfaceModel);
diff --git a/src/Transfer/Transfer_MapContainer.cdl b/src/Transfer/Transfer_MapContainer.cdl
index b80c0949f6..74fbf7910a 100644
--- a/src/Transfer/Transfer_MapContainer.cdl
+++ b/src/Transfer/Transfer_MapContainer.cdl
@@ -23,7 +23,7 @@ uses
 
 is
 
-    Create returns mutable MapContainer from Transfer;
+    Create returns MapContainer from Transfer;
      
     SetMapObjects(me : mutable; theMapObjects : in out DataMapOfTransientTransient from TColStd);
     	---Purposes:Set map already translated geometry objects.
diff --git a/src/Transfer/Transfer_Mapper.cdl b/src/Transfer/Transfer_Mapper.cdl
index 8e7ac60649..2613e56011 100644
--- a/src/Transfer/Transfer_Mapper.cdl
+++ b/src/Transfer/Transfer_Mapper.cdl
@@ -33,7 +33,7 @@ uses CString
 
 is
 
-    Create (akey : any TheKey) returns mutable Mapper;
+    Create (akey : any TheKey) returns Mapper;
     ---Purpose : Creates a Mapper with a Value. This Value can then not be
     --           changed. It is used by the Hasher to compute the HashCode,
     --           which will then be stored for an immediate reading.
diff --git a/src/Transfer/Transfer_MultipleBinder.cdl b/src/Transfer/Transfer_MultipleBinder.cdl
index c9f58b4fee..7581f72999 100644
--- a/src/Transfer/Transfer_MultipleBinder.cdl
+++ b/src/Transfer/Transfer_MultipleBinder.cdl
@@ -41,7 +41,7 @@ raises TransferFailure, OutOfRange
 
 is
 
-    Create returns mutable MultipleBinder;
+    Create returns MultipleBinder;
     ---Purpose : normal standard constructor, creates an empty MultipleBinder
 
     IsMultiple (me) returns Boolean  is redefined;
@@ -56,13 +56,13 @@ is
     --           Here, returns "(list)"
 
 
-    AddResult (me : mutable; res : mutable Transient);
+    AddResult (me : mutable; res : Transient);
     ---Purpose : Adds a new Item to the Multiple Result
 
     NbResults (me) returns Integer;
     ---Purpose : Returns the actual count of recorded (Transient) results
 
-    ResultValue (me; num : Integer) returns mutable Transient
+    ResultValue (me; num : Integer) returns Transient
     ---Purpose : Returns the value of the recorded result n0 <num>
     	raises OutOfRange;
     --           Error if <num> is out of range
@@ -72,7 +72,7 @@ is
     --           Item). Else, returns a Null Handle
 
     SetMultipleResult (me : mutable;
-    	    	       mulres : mutable HSequenceOfTransient from TColStd)
+    	    	       mulres : HSequenceOfTransient from TColStd)
     	raises TransferFailure;
     ---Purpose : Defines a Binding with a Multiple Result, given as a Sequence
     --           Error if a Unique Result has yet been defined
diff --git a/src/Transfer/Transfer_ResultFromModel.cdl b/src/Transfer/Transfer_ResultFromModel.cdl
index 55d142da30..93cd592756 100644
--- a/src/Transfer/Transfer_ResultFromModel.cdl
+++ b/src/Transfer/Transfer_ResultFromModel.cdl
@@ -38,7 +38,7 @@ uses CString, AsciiString, HSequenceOfTransient from TColStd,
 
 is
 
-    Create returns mutable ResultFromModel;
+    Create returns ResultFromModel;
     ---Purpose : Creates a ResultFromModel, empty
 
     SetModel (me : mutable; model : InterfaceModel);
@@ -71,7 +71,7 @@ is
     --             and MainResult but only the result (Binder)
     --           mode = 11 : also clears MainResult (status and names remain)
 
-    FillBack (me; TP : mutable TransientProcess);
+    FillBack (me; TP : TransientProcess);
     ---Purpose : Fills back a TransientProcess from the structured set of
     --           binders. Also sets the Model.
 
diff --git a/src/Transfer/Transfer_ResultFromTransient.cdl b/src/Transfer/Transfer_ResultFromTransient.cdl
index cde9742307..39c181a68e 100644
--- a/src/Transfer/Transfer_ResultFromTransient.cdl
+++ b/src/Transfer/Transfer_ResultFromTransient.cdl
@@ -30,7 +30,7 @@ uses Transient, HSequenceOfTransient, IndexedMapOfTransient,
 
 is
 
-    Create returns mutable ResultFromTransient;
+    Create returns ResultFromTransient;
     ---Purpose : Creates a ResultFromTransient, empty
 
     SetStart  (me : mutable; start  : any Transient);
@@ -59,13 +59,13 @@ is
     ClearSubs (me : mutable);
     ---Purpose : Clears the list of (immediate) sub-results
 
-    AddSubResult (me : mutable; sub : mutable ResultFromTransient);
+    AddSubResult (me : mutable; sub : ResultFromTransient);
     ---Purpose : Adds a sub-result
 
     NbSubResults (me) returns Integer;
     ---Purpose : Returns the count of recorded sub-results
 
-    SubResult    (me; num : Integer) returns mutable ResultFromTransient;
+    SubResult    (me; num : Integer) returns ResultFromTransient;
     ---Purpose : Returns a sub-result, given its rank
 
     ResultFromKey (me; key : Transient) returns ResultFromTransient;
@@ -89,7 +89,7 @@ is
     --           the list of sub-scoped binders, which is now recorded as
     --           sub-results
 
-    FillBack (me; TP : mutable TransientProcess);
+    FillBack (me; TP : TransientProcess);
     ---Purpose : Fills back a TransientProcess with definition of a
     --           ResultFromTransient, respectfully to its structuration in
     --           scopes
diff --git a/src/Transfer/Transfer_SimpleBinderOfTransient.cdl b/src/Transfer/Transfer_SimpleBinderOfTransient.cdl
index 84287bf6b7..f16f17038c 100644
--- a/src/Transfer/Transfer_SimpleBinderOfTransient.cdl
+++ b/src/Transfer/Transfer_SimpleBinderOfTransient.cdl
@@ -26,7 +26,7 @@ raises TransferFailure
 
 is
 
-    Create returns mutable SimpleBinderOfTransient;
+    Create returns SimpleBinderOfTransient;
     ---Purpose : Creates an empty SimpleBinderOfTransient
 
 --    IsMultiple (me) returns Boolean;
diff --git a/src/Transfer/Transfer_TransferDispatch.cdl b/src/Transfer/Transfer_TransferDispatch.cdl
index 29e1f046cd..ea23013d15 100644
--- a/src/Transfer/Transfer_TransferDispatch.cdl
+++ b/src/Transfer/Transfer_TransferDispatch.cdl
@@ -52,11 +52,11 @@ is
     	raises InterfaceError;
     --           Error if no Active Protocol is defined
 
-    TransientProcess (me) returns mutable TransientProcess;
+    TransientProcess (me) returns TransientProcess;
     ---Purpose : Returns the content of Control Object, as a TransientProcess
 
 
-    Copy (me : in out; entfrom : Transient; entto : out mutable Transient;
+    Copy (me : in out; entfrom : Transient; entto : out Transient;
     	  mapped : Boolean; errstat : Boolean)
     	returns Boolean is  redefined;
     ---Purpose : Copies an Entity by calling the method Transferring from the
diff --git a/src/Transfer/Transfer_TransferInput.cdl b/src/Transfer/Transfer_TransferInput.cdl
index 36140b69b1..1abf9fe11d 100644
--- a/src/Transfer/Transfer_TransferInput.cdl
+++ b/src/Transfer/Transfer_TransferInput.cdl
@@ -39,7 +39,7 @@ is
 
 
     FillModel (me; proc   : TransientProcess;
-    	    	   amodel : mutable InterfaceModel)
+    	    	   amodel : InterfaceModel)
     ---Purpose : Fills an InterfaceModel with the Complete Result of a Transfer
     --           stored in a TransientProcess (Starting Objects are Transient)
     --           The complete result is exactly added to the model
@@ -47,7 +47,7 @@ is
     --           Error if one of the Resulting Objects is defined not Transient
 
     FillModel (me; proc   : TransientProcess;
-    	    	   amodel : mutable InterfaceModel;
+    	    	   amodel : InterfaceModel;
 		   proto  : Protocol from Interface;
 		   roots  : Boolean = Standard_True)
     ---Purpose : Fills an InterfaceModel with results of the Transfer recorded
@@ -60,7 +60,7 @@ is
 
 
     FillModel (me; proc   : FinderProcess;
-    	    	   amodel : mutable InterfaceModel)
+    	    	   amodel : InterfaceModel)
     ---Purpose : Fills an InterfaceModel with the Complete Result of a Transfer
     --           stored in a TransientProcess (Starting Objects are Transient)
     --           The complete result is exactly added to the model
@@ -68,7 +68,7 @@ is
     --           Error if one of the Resulting Objects is defined not Transient
 
     FillModel (me; proc   : FinderProcess;
-    	    	   amodel : mutable InterfaceModel;
+    	    	   amodel : InterfaceModel;
 		   proto  : Protocol from Interface;
 		   roots  : Boolean = Standard_True)
     ---Purpose : Fills an InterfaceModel with results of the Transfer recorded
diff --git a/src/Transfer/Transfer_TransferOutput.cdl b/src/Transfer/Transfer_TransferOutput.cdl
index d7a0c661b1..3b107172fa 100644
--- a/src/Transfer/Transfer_TransferOutput.cdl
+++ b/src/Transfer/Transfer_TransferOutput.cdl
@@ -33,11 +33,11 @@ raises NoSuchObject, TransferFailure
 
 is
 
-    Create (actor : mutable ActorOfTransientProcess; amodel : InterfaceModel)
+    Create (actor : ActorOfTransientProcess; amodel : InterfaceModel)
     	returns TransferOutput;
     ---Purpose : Creates a TransferOutput ready to use, with a TransientProcess
 
-    Create (proc : mutable TransientProcess; amodel : InterfaceModel)
+    Create (proc : TransientProcess; amodel : InterfaceModel)
     	returns TransferOutput;
     ---Purpose : Creates a TransferOutput from an already existing
     --           TransientProcess, and a Model
@@ -52,7 +52,7 @@ is
     Model (me) returns InterfaceModel;
     ---Purpose : Returns the Starting Model
 
-    TransientProcess (me) returns mutable TransientProcess;
+    TransientProcess (me) returns TransientProcess;
     ---Purpose : Returns the TransientProcess used to work
 
     Transfer (me : in out; obj : Transient)
@@ -94,7 +94,7 @@ is
 
     ModelForStatus (me; protocol : Protocol;
     	normal : Boolean; roots : Boolean = Standard_True)
-	returns mutable InterfaceModel;
+	returns InterfaceModel;
     ---Purpose : Fills a Model with the list determined by ListForStatus
     --           This model starts from scratch (made by NewEmptyModel from the
     --           current Model), then is filled by AddWithRefs
diff --git a/src/Transfer/Transfer_TransferProcess.cdl b/src/Transfer/Transfer_TransferProcess.cdl
index 6b9f7bf7bb..3c31ddf4bc 100644
--- a/src/Transfer/Transfer_TransferProcess.cdl
+++ b/src/Transfer/Transfer_TransferProcess.cdl
@@ -192,7 +192,7 @@ raises InterfaceError, TransferFailure
 
     	is
 
-    	    Create returns mutable Actor;
+    	    Create returns Actor;
 
     	    Recognize (me : mutable; start : TheStart)
     	    	returns Boolean is virtual;
@@ -209,8 +209,8 @@ raises InterfaceError, TransferFailure
 	    --           The provided default returns True, can be redefined
 
 	    Transferring (me : mutable;
-    	    	      start : TheStart; TP : mutable TransferProcess)
-	        	returns mutable Binder
+    	    	      start : TheStart; TP : TransferProcess)
+	        	returns Binder
 	    ---Purpose : Specific action of Transfer. The Result is stored in
 	    --           the returned Binder, or a Null Handle for "No result"
 	    --           (Default defined as doing nothing; should be deffered)
@@ -221,11 +221,11 @@ raises InterfaceError, TransferFailure
 	    --           exception can be raised
 
 	    TransientResult  (me; res : any Transient)
-	        	returns mutable SimpleBinderOfTransient;
+	        	returns SimpleBinderOfTransient;
 	    ---Purpose : Prepares and Returns a Binder for a Transient Result
 	    --           Returns a Null Handle if <res> is itself Null
 
-	    NullResult (me) returns mutable Binder;
+	    NullResult (me) returns Binder;
 	    ---Purpose : Returns a Binder for No Result, i.e. a Null Handle
 
 
@@ -239,14 +239,14 @@ raises InterfaceError, TransferFailure
     	    IsLast (me) returns Boolean;
 	    ---Purpose : Returns the Last status (see SetLast).
 
-	    SetNext (me : mutable; next : mutable Actor);
+	    SetNext (me : mutable; next : Actor);
 	    ---Purpose : Defines a Next Actor : it can then be asked to work if
 	    --           <me> produces no result for a given type of Object.
 	    --           If Next is already set and is not "Last", calls
 	    --           SetNext on it. If Next defined and "Last", the new
 	    --           actor is added before it in the list
 
-	    Next (me) returns mutable Actor;
+	    Next (me) returns Actor;
 	    ---Purpose : Returns the Actor defined as Next, or a Null Handle
 
     	fields
@@ -260,14 +260,14 @@ raises InterfaceError, TransferFailure
 
 is
 
-    Create (nb : Integer = 10000) returns mutable TransferProcess from Transfer;
+    Create (nb : Integer = 10000) returns TransferProcess from Transfer;
     ---Purpose : Sets TransferProcess at initial state. Gives an Initial size
     --           (indicative) for the Map when known (default is 10000).
     --           Sets default trace file as a printer and default trace level
     --           (see Message_TraceFile).
 
     Create (printer: Messenger from Message; nb: Integer = 10000)
-    returns mutable TransferProcess from Transfer;
+    returns TransferProcess from Transfer;
     ---Purpose : Sets TransferProcess at initial state. Gives an Initial size
     --           (indicative) for the Map when known (default is 10000).
     --           Sets a specified printer.
@@ -286,12 +286,12 @@ is
     ---Purpose : Resizes the Map as required (if a new reliable value has been
     --           determined). Acts only if <nb> is greater than actual NbMapped
 
-    SetActor (me : mutable; actor : mutable Actor);
+    SetActor (me : mutable; actor : Actor);
     ---Purpose : Defines an Actor, which is used for automatic Transfer
     --           If already defined, the new Actor is cumulated
     --           (see SetNext from Actor)
 
-    Actor (me) returns mutable Actor;
+    Actor (me) returns Actor;
     ---Purpose : Returns the defined Actor. Returns a Null Handle if
     --           not set.
 
@@ -299,7 +299,7 @@ is
     	--  This access works on : Binder (default), or Handle Result
     	--   (Transient,Finder) as privileged kinds of Result
 
-    Find (me; start : TheStart) returns mutable Binder;
+    Find (me; start : TheStart) returns Binder;
     ---Purpose : Returns the Binder which is linked with a starting Object
     --           It can either bring a Result (Transfer done) or none (for a
     --           pre-binding).
@@ -320,13 +320,13 @@ is
     --           Considers a category number, by default 0
 
     FindAndMask (me : mutable; start : TheStart)
-    	returns mutable Binder  is private;
+    	returns Binder  is private;
     ---Purpose : Same as Find but stores the last access to the map, for a
     --           faster access on next calls (as Bind does too)
     --           Considers a category number, by default 0
     --  C++ : return const &
 
-    Bind (me : mutable; start : TheStart; binder : mutable Binder)
+    Bind (me : mutable; start : TheStart; binder : Binder)
     ---Purpose : Creates a Link a starting Object with a Binder. This Binder
     --           can either bring a Result (effective Binding) or none (it can
     --           be set later : pre-binding).
@@ -335,7 +335,7 @@ is
     --           Error if a Binder with a Result set is already linked with
     --           this Object (Binder with StatusResult not Initial)
 
-    Rebind (me : mutable; start : TheStart; binder : mutable Binder)
+    Rebind (me : mutable; start : TheStart; binder : Binder)
     ---Purpose : Changes the Binder linked with a starting Object for its
     --           unitary transfer. This it can be useful when the exact form
     --           of the result is known once the transfer is widely engaged.
@@ -356,7 +356,7 @@ is
     --           Error if : - the Result is known as Already Used
 
     FindElseBind (me : mutable; start : TheStart)
-    	returns mutable Binder;
+    	returns Binder;
     ---Purpose : Returns a Binder for a starting entity, as follows :
     --           Tries to Find the already bound one
     --           If none found, creates a VoidBinder and Binds it
@@ -489,7 +489,7 @@ is
     --           Error if a UNIQUE result is already bound (if a Multiple
     --           Result is, nothing is done)
 
-    AddMultiple (me : mutable; start : TheStart; res : mutable Transient)
+    AddMultiple (me : mutable; start : TheStart; res : Transient)
     ---Purpose : Adds an item to a list of results bound to a starting object.
     --           Considers a category number, by default 0, for all results
     	raises TransferFailure;
@@ -497,7 +497,7 @@ is
     --           to <start> (none at all, or for a unique result)
 
     FindTypedTransient (me; start : TheStart; atype : Type from Standard;
-    	    	    	val : out mutable Transient)  returns Boolean;
+    	    	    	val : out Transient)  returns Boolean;
     ---Purpose : Searches for a transient result attached to a starting object,
     --           according to its type, by criterium IsKind(atype)
     --           
@@ -511,7 +511,7 @@ is
     --           immediately used, well initialised
 
     GetTypedTransient (me; binder : Binder; atype : Type from Standard;
-    	    	       val : out mutable Transient)  returns Boolean;
+    	    	       val : out Transient)  returns Boolean;
     ---Purpose : Searches for a transient result recorded in a Binder, whatever
     --           this Binder is recorded or not in <me>
     --           
@@ -534,7 +534,7 @@ is
     MapIndex (me; start : TheStart) returns Integer;
     ---Purpose : Returns the Index value bound to a Starting Object, 0 if none
 
-    MapItem (me; num : Integer) returns mutable Binder;
+    MapItem (me; num : Integer) returns Binder;
     ---Purpose : Returns the Binder bound to an Index
     --           Considers a category number, by default 0
 
@@ -563,7 +563,7 @@ is
     ---Purpose : Returns a Root Entity given its number in the list (1-NbRoots)
     ---C++ : return const &
 
-    RootItem (me; num : Integer) returns mutable Binder;
+    RootItem (me; num : Integer) returns Binder;
     ---Purpose : Returns the Binder bound with a Root Entity given its number
     --           Considers a category number, by default 0
 
@@ -586,7 +586,7 @@ is
     ---Purpose : Tells if <start> has been recognized as good candidate for
     --           Transfer. i.e. queries the Actor and its Nexts
 
-    Transferring (me : mutable; start : TheStart)  returns mutable Binder
+    Transferring (me : mutable; start : TheStart)  returns Binder
     ---Purpose : Performs the Transfer of a Starting Object, by calling
     --           the method TransferProduct (see below).
     --           Mapping and Roots are managed : nothing is done if a Result is
@@ -599,7 +599,7 @@ is
     --           the method SetErrorHandle for more details
     --  C++ : return const &
 
-    TransferProduct (me : mutable; start : TheStart)  returns mutable Binder
+    TransferProduct (me : mutable; start : TheStart)  returns Binder
     ---Purpose : Internal action of Transfer, called by Transferring, with or
     --           without ErrorHandle. It invokes the Actor to work (set by
     --           SetActor), and tries its Nexts if no result is produced,
diff --git a/src/Transfer/Transfer_TransientListBinder.cdl b/src/Transfer/Transfer_TransientListBinder.cdl
index b449e1adaa..a92224a006 100644
--- a/src/Transfer/Transfer_TransientListBinder.cdl
+++ b/src/Transfer/Transfer_TransientListBinder.cdl
@@ -28,10 +28,10 @@ raises TypeMismatch, OutOfRange
 
 is
 
-    Create returns mutable TransientListBinder;
+    Create returns TransientListBinder;
 
-    Create (list : mutable HSequenceOfTransient from TColStd)
-    	 returns mutable TransientListBinder;
+    Create (list : HSequenceOfTransient from TColStd)
+    	 returns TransientListBinder;
 
     IsMultiple (me) returns Boolean  is redefined;
     -- returns True if more than one result
diff --git a/src/Transfer/Transfer_TransientProcess.cdl b/src/Transfer/Transfer_TransientProcess.cdl
index 5a8833519f..3ce72fa0f5 100644
--- a/src/Transfer/Transfer_TransientProcess.cdl
+++ b/src/Transfer/Transfer_TransientProcess.cdl
@@ -31,7 +31,7 @@ uses Transient, Type,
 
 is
 
-    Create (nb : Integer = 10000) returns mutable TransientProcess;
+    Create (nb : Integer = 10000) returns TransientProcess;
     ---Purpose : Sets TransientProcess at initial state, with an initial size
 
     SetModel (me : mutable; model : InterfaceModel);
diff --git a/src/Transfer/Transfer_VoidBinder.cdl b/src/Transfer/Transfer_VoidBinder.cdl
index b8918abc1d..b65d3e6612 100644
--- a/src/Transfer/Transfer_VoidBinder.cdl
+++ b/src/Transfer/Transfer_VoidBinder.cdl
@@ -26,7 +26,7 @@ uses CString, Type
 
 is
 
-    Create returns mutable VoidBinder;
+    Create returns VoidBinder;
 
 --    IsMultiple (me) returns Boolean;
     ---Purpose : a VoidBinder is not Multiple (Remark : it is not Simple too)
diff --git a/src/TransferBRep/TransferBRep.cdl b/src/TransferBRep/TransferBRep.cdl
index a9b34cbfc1..ccd91cb9a8 100644
--- a/src/TransferBRep/TransferBRep.cdl
+++ b/src/TransferBRep/TransferBRep.cdl
@@ -58,7 +58,7 @@ is
     --           Transfer of an entity. I.E. in the binder bound to that Entity
     --           If no result or result not a single Shape, returns a Null Shape
 
-    SetShapeResult (TP : mutable TransientProcess from Transfer; ent : Transient;
+    SetShapeResult (TP : TransientProcess from Transfer; ent : Transient;
     	    	    result : Shape from TopoDS);
     ---Purpose : Sets a Shape as a result for a starting entity <ent>
     --           (reverse of ShapeResult)
diff --git a/src/TransferBRep/TransferBRep_BinderOfShape.cdl b/src/TransferBRep/TransferBRep_BinderOfShape.cdl
index fa9fd280f4..d0a8bedb32 100644
--- a/src/TransferBRep/TransferBRep_BinderOfShape.cdl
+++ b/src/TransferBRep/TransferBRep_BinderOfShape.cdl
@@ -36,10 +36,10 @@ raises TransferFailure
 
 is
 
-    Create returns mutable BinderOfShape;
+    Create returns BinderOfShape;
     ---Purpose : normal standard constructor, creates an empty BinderOfShape
 
-    Create (res : any Shape from TopoDS) returns mutable BinderOfShape;
+    Create (res : any Shape from TopoDS) returns BinderOfShape;
     ---Purpose : constructor which in the same time defines the result
 
 --    IsMultiple (me) returns Boolean;
diff --git a/src/TransferBRep/TransferBRep_ShapeBinder.cdl b/src/TransferBRep/TransferBRep_ShapeBinder.cdl
index 9cd9561500..abda87795f 100644
--- a/src/TransferBRep/TransferBRep_ShapeBinder.cdl
+++ b/src/TransferBRep/TransferBRep_ShapeBinder.cdl
@@ -28,10 +28,10 @@ raises TypeMismatch from Standard
 
 is
 
-    Create returns mutable ShapeBinder;
+    Create returns ShapeBinder;
     ---Purpose : Creates an empty ShapeBinder
 
-    Create (res : Shape) returns mutable ShapeBinder;
+    Create (res : Shape) returns ShapeBinder;
     ---Purpose : Creates a ShapeBinder with a result
 
     ShapeType (me) returns ShapeEnum;
diff --git a/src/TransferBRep/TransferBRep_ShapeListBinder.cdl b/src/TransferBRep/TransferBRep_ShapeListBinder.cdl
index 9976f495c8..15833eaae5 100644
--- a/src/TransferBRep/TransferBRep_ShapeListBinder.cdl
+++ b/src/TransferBRep/TransferBRep_ShapeListBinder.cdl
@@ -32,10 +32,10 @@ raises TypeMismatch, OutOfRange
 
 is
 
-    Create returns mutable ShapeListBinder;
+    Create returns ShapeListBinder;
 
-    Create (list : mutable HSequenceOfShape from TopTools)
-    	 returns mutable ShapeListBinder;
+    Create (list : HSequenceOfShape from TopTools)
+    	 returns ShapeListBinder;
 
     IsMultiple (me) returns Boolean  is redefined;
     -- returns True if more than one result
diff --git a/src/UTL/UTL.cdl b/src/UTL/UTL.cdl
index bfab4ee836..2029372ca4 100644
--- a/src/UTL/UTL.cdl
+++ b/src/UTL/UTL.cdl
@@ -24,7 +24,7 @@ is
     OpenFile(aFile: in out BaseDriver from Storage; aName: ExtendedString from TCollection; aMode : OpenMode from Storage)
     returns Error from Storage;
     
-    AddToUserInfo(aData: mutable Data from Storage; anInfo: ExtendedString from TCollection);
+    AddToUserInfo(aData: Data from Storage; anInfo: ExtendedString from TCollection);
     
     Path(aFileName: ExtendedString from TCollection) returns Path from OSD;
 
diff --git a/src/Units/Units_Dimensions.cdl b/src/Units/Units_Dimensions.cdl
index 6ea7e68efc..203536aeb9 100644
--- a/src/Units/Units_Dimensions.cdl
+++ b/src/Units/Units_Dimensions.cdl
@@ -57,7 +57,7 @@ is
     --          quantity and  the 2  secondary  fundamental  units  of
     --          physical quantity.
 	   
-    returns mutable Dimensions from Units;
+    returns Dimensions from Units;
 
     Mass(me) returns Real
     
@@ -173,7 +173,7 @@ is
     --          the   result   of the  multiplication    of  <me>  and
     --          <adimensions>.
     
-    returns mutable Dimensions from Units is static;
+    returns Dimensions from Units is static;
     
     Divide(me ; adimensions : Dimensions from Units)
     
@@ -184,9 +184,9 @@ is
     ---Purpose: Creates and returns a new  Dimensions object which  is
     --          the result of the division of <me> by <adimensions>.
     
-    returns mutable Dimensions from Units is static;
+    returns Dimensions from Units is static;
     
-    Power(me ; anexponent : Real) returns mutable Dimensions from Units
+    Power(me ; anexponent : Real) returns Dimensions from Units
     
     ---Level: Internal 
 
diff --git a/src/Units/Units_Lexicon.cdl b/src/Units/Units_Lexicon.cdl
index 48d0e2d40c..7f92a9e382 100644
--- a/src/Units/Units_Lexicon.cdl
+++ b/src/Units/Units_Lexicon.cdl
@@ -33,7 +33,7 @@ uses
 
 is
 
-    Create returns mutable Lexicon from Units;
+    Create returns Lexicon from Units;
     
     ---Level: Internal 
     
diff --git a/src/Units/Units_Quantity.cdl b/src/Units/Units_Quantity.cdl
index 88f9cdf193..d3e4f0269d 100644
--- a/src/Units/Units_Quantity.cdl
+++ b/src/Units/Units_Quantity.cdl
@@ -48,7 +48,7 @@ is
     --          is the physical dimensions, and <aunitssequence> which
     --          describes all the units known for this quantity.
     
-    returns mutable Quantity from Units;
+    returns Quantity from Units;
     
     Name(me) returns AsciiString from TCollection
     
diff --git a/src/Units/Units_Sentence.cdl b/src/Units/Units_Sentence.cdl
index 17ca80d410..e2696fc301 100644
--- a/src/Units/Units_Sentence.cdl
+++ b/src/Units/Units_Sentence.cdl
@@ -66,7 +66,7 @@ is
     
     is static;
     
-    Evaluate(me : in out)returns mutable Token from Units
+    Evaluate(me : in out)returns Token from Units
     
     ---Level: Internal 
     
diff --git a/src/Units/Units_ShiftedToken.cdl b/src/Units/Units_ShiftedToken.cdl
index e0fb18127a..8db79cef87 100644
--- a/src/Units/Units_ShiftedToken.cdl
+++ b/src/Units/Units_ShiftedToken.cdl
@@ -54,9 +54,9 @@ is
     --          and <adimensions> is  the dimension of the given  word
     --          <aword>.
     
-    returns mutable ShiftedToken from Units;
+    returns ShiftedToken from Units;
     
-    Creates(me) returns mutable Token from Units
+    Creates(me) returns Token from Units
     
     ---Level: Internal 
     
diff --git a/src/Units/Units_ShiftedUnit.cdl b/src/Units/Units_ShiftedUnit.cdl
index 3fa42f2571..99b59b9e2d 100644
--- a/src/Units/Units_ShiftedUnit.cdl
+++ b/src/Units/Units_ShiftedUnit.cdl
@@ -50,7 +50,7 @@ is
     --          instance of ShiftedUnit  with <avalue> equal to 1. and
     --          <amove> equal to 273.15.
     
-    returns mutable ShiftedUnit from Units;
+    returns ShiftedUnit from Units;
     
     Create(aname , asymbol : CString)
     
@@ -60,7 +60,7 @@ is
     --          the  unit, <asymbol> is the  usual abbreviation of the
     --          unit.
     
-    returns mutable ShiftedUnit from Units;
+    returns ShiftedUnit from Units;
     
     Create(aname : CString)
     
@@ -69,7 +69,7 @@ is
     ---Purpose: Creates  and returns a  unit.  <aname> is  the name of
     --          the  unit.
     
-    returns mutable ShiftedUnit from Units;
+    returns ShiftedUnit from Units;
     
     Move(me : mutable ; amove : Real)
     
@@ -87,7 +87,7 @@ is
     
     is static;
     
-    Token(me) returns mutable Token from Units
+    Token(me) returns Token from Units
     
     ---Level: Internal 
     
diff --git a/src/Units/Units_Token.cdl b/src/Units/Units_Token.cdl
index 11aa36c48d..b0c8f1bf02 100644
--- a/src/Units/Units_Token.cdl
+++ b/src/Units/Units_Token.cdl
@@ -30,7 +30,7 @@ uses
 
 is
 
-    Create returns mutable Token from Units;
+    Create returns Token from Units;
     
     ---Level: Internal 
     
@@ -43,7 +43,7 @@ is
     ---Purpose: Creates  and returns  a token.   <aword>  is  a string
     --          containing the available word.
     
-    returns mutable Token from Units;
+    returns Token from Units;
     
     Create(atoken : Token from Units)
     
@@ -52,7 +52,7 @@ is
     ---Purpose: Creates and returns a  token.  <atoken> is  copied  in
     --          the returned token.
     
-    returns mutable Token from Units;
+    returns Token from Units;
     
     Create(aword , amean : CString)
     
@@ -62,7 +62,7 @@ is
     --          containing the  available word and  <amean>  gives the
     --          signification of the token.
     
-    returns mutable Token from Units;
+    returns Token from Units;
     
     Create(aword , amean : CString ; avalue : Real)
     
@@ -73,7 +73,7 @@ is
     --          signification of the token and <avalue> is the numeric
     --          value of the dimension.
     
-    returns mutable Token from Units;
+    returns Token from Units;
     
     Create(aword , amean : CString ; avalue : Real ; adimension : Dimensions from Units)
     
@@ -85,9 +85,9 @@ is
     --          value  of the dimension,  and <adimensions>   is   the
     --          dimension of the given word <aword>.
     
-    returns mutable Token from Units;
+    returns Token from Units;
     
-    Creates(me) returns mutable Token from Units
+    Creates(me) returns Token from Units
 
     ---Level: Internal 
     
@@ -164,7 +164,7 @@ is
     
     is static;
 
-    Dimensions(me) returns mutable Dimensions from Units
+    Dimensions(me) returns Dimensions from Units
     
     ---Level: Internal 
     
@@ -196,7 +196,7 @@ is
     
     is static;
 
-    Add(me ; aninteger : Integer) returns mutable Token from Units
+    Add(me ; aninteger : Integer) returns Token from Units
     
     ---Level: Internal 
     
@@ -206,7 +206,7 @@ is
     
     is static;
     
-    Add(me ; atoken : Token from Units) returns mutable Token from Units
+    Add(me ; atoken : Token from Units) returns Token from Units
     
     ---Level: Internal 
     
@@ -218,7 +218,7 @@ is
     
     is static;
     
-    Subtract(me ; atoken : Token from Units) returns mutable Token from Units
+    Subtract(me ; atoken : Token from Units) returns Token from Units
     
     ---Level: Internal 
     
@@ -230,7 +230,7 @@ is
     
     is static;
     
-    Multiply(me ; atoken : Token from Units) returns mutable Token from Units
+    Multiply(me ; atoken : Token from Units) returns Token from Units
     
     ---Level: Internal 
     
@@ -251,7 +251,7 @@ is
     
     returns Real is virtual;
     
-    Divide(me ; atoken : Token from Units) returns mutable Token from Units
+    Divide(me ; atoken : Token from Units) returns Token from Units
     
     ---Level: Internal 
     
@@ -272,7 +272,7 @@ is
     
     returns Real is virtual;
     
-    Power(me ; atoken : Token from Units) returns mutable Token from Units
+    Power(me ; atoken : Token from Units) returns Token from Units
     
     ---Level: Internal 
     
@@ -284,7 +284,7 @@ is
     
     is static;
     
-    Power(me ; anexponent : Real) returns mutable Token from Units
+    Power(me ; anexponent : Real) returns Token from Units
     
     ---Level: Internal 
     
diff --git a/src/Units/Units_Unit.cdl b/src/Units/Units_Unit.cdl
index 0fcfa17618..a063336272 100644
--- a/src/Units/Units_Unit.cdl
+++ b/src/Units/Units_Unit.cdl
@@ -45,7 +45,7 @@ is
     --          unit,  and  <avalue> is the  value in relation to  the
     --          International System of Units.
     
-    returns mutable Unit from Units;
+    returns Unit from Units;
     
     Create(aname , asymbol : CString)
     
@@ -55,7 +55,7 @@ is
     --          the  unit, <asymbol> is the  usual abbreviation of the
     --          unit.
     
-    returns mutable Unit from Units;
+    returns Unit from Units;
     
     Create(aname : CString)
     
@@ -64,7 +64,7 @@ is
     ---Purpose: Creates  and returns a  unit.  <aname> is  the name of
     --          the  unit.
     
-    returns mutable Unit from Units;
+    returns Unit from Units;
     
     Name(me) returns AsciiString from TCollection
     
@@ -135,7 +135,7 @@ is
     
     is static;
     
-    Token(me) returns mutable Token from Units
+    Token(me) returns Token from Units
     
     ---Level: Internal 
     
diff --git a/src/Units/Units_UnitsDictionary.cdl b/src/Units/Units_UnitsDictionary.cdl
index 90a9653255..c2f9226273 100644
--- a/src/Units/Units_UnitsDictionary.cdl
+++ b/src/Units/Units_UnitsDictionary.cdl
@@ -33,7 +33,7 @@ uses
 
 is
 
-    Create returns mutable UnitsDictionary from Units;
+    Create returns UnitsDictionary from Units;
     
     ---Level: Internal 
     
diff --git a/src/Units/Units_UnitsLexicon.cdl b/src/Units/Units_UnitsLexicon.cdl
index 0706339583..cc45a9f2f0 100644
--- a/src/Units/Units_UnitsLexicon.cdl
+++ b/src/Units/Units_UnitsLexicon.cdl
@@ -32,7 +32,7 @@ uses
 
 is
 
-    Create returns mutable UnitsLexicon from Units;
+    Create returns UnitsLexicon from Units;
     
     ---Level: Internal 
     
diff --git a/src/Units/Units_UnitsSystem.cdl b/src/Units/Units_UnitsSystem.cdl
index e112a3fd6f..3ad934fcf2 100644
--- a/src/Units/Units_UnitsSystem.cdl
+++ b/src/Units/Units_UnitsSystem.cdl
@@ -34,7 +34,7 @@ raises NoSuchUnit from Units,NoSuchType from Units
 
 is
 
-    Create returns mutable UnitsSystem from Units;
+    Create returns UnitsSystem from Units;
     
     ---Level: Public 
     
@@ -42,7 +42,7 @@ is
     --          S.I. units system.
 
     Create(aName: CString from Standard;Verbose: Boolean from Standard = Standard_False)
-    returns mutable UnitsSystem from Units;
+    returns UnitsSystem from Units;
 
     ---Level: Public 
 
diff --git a/src/V3d/V3d.cdl b/src/V3d/V3d.cdl
index 1b54e890e7..27bd364528 100644
--- a/src/V3d/V3d.cdl
+++ b/src/V3d/V3d.cdl
@@ -228,7 +228,7 @@ is
         ---Purpose: Determines the orientation vector corresponding
         --          to the predefined orientation type.
 
-        ArrowOfRadius ( garrow   : mutable Group from Graphic3d;
+        ArrowOfRadius ( garrow   : Group from Graphic3d;
                         X0,Y0,Z0 : Coordinate;
                         DX,DY,DZ : Parameter;
                         Alpha    : PlaneAngle from Quantity;
@@ -240,7 +240,7 @@ is
         --          Alpha    : Angle of arrow.
         --          Lng      : Length of arrow.
 
-        CircleInPlane ( gcircle  : mutable Group from Graphic3d;
+        CircleInPlane ( gcircle  : Group from Graphic3d;
                         X0,Y0,Z0 : Coordinate;
                         VX,VY,VZ : Parameter;
                         Radius   : Parameter ) is protected;
diff --git a/src/V3d/V3d_AmbientLight.cdl b/src/V3d/V3d_AmbientLight.cdl
index 0f67b05046..b9ae84fe96 100644
--- a/src/V3d/V3d_AmbientLight.cdl
+++ b/src/V3d/V3d_AmbientLight.cdl
@@ -38,9 +38,9 @@ uses
 
 is
 
-    	Create ( VM : mutable Viewer ;
+    	Create ( VM : Viewer ;
 		 Color : NameOfColor = Quantity_NOC_WHITE ) 
-				returns mutable AmbientLight;
+				returns AmbientLight;
 	---Purpose: Constructs an ambient light source in the viewer VM.
     	-- The default Color of this light source is WHITE.
 
diff --git a/src/V3d/V3d_CircularGrid.cdl b/src/V3d/V3d_CircularGrid.cdl
index a089287119..2a5e9a5ffa 100644
--- a/src/V3d/V3d_CircularGrid.cdl
+++ b/src/V3d/V3d_CircularGrid.cdl
@@ -30,7 +30,7 @@ is
 	Create ( aViewer	: ViewerPointer from V3d;
 		 aColor		: Color from Quantity;
 		 aTenthColor	: Color from Quantity )
-	returns mutable CircularGrid from V3d;
+	returns CircularGrid from V3d;
 
 	SetColors ( me	: mutable;
 		    aColor	: Color from Quantity;
diff --git a/src/V3d/V3d_DirectionalLight.cdl b/src/V3d/V3d_DirectionalLight.cdl
index b59785a6f1..12469bd9fd 100644
--- a/src/V3d/V3d_DirectionalLight.cdl
+++ b/src/V3d/V3d_DirectionalLight.cdl
@@ -44,19 +44,19 @@ raises BadValue from V3d
 
 is
 
-    	Create ( VM : mutable Viewer ; 
+    	Create ( VM : Viewer ; 
 		 Direction : TypeOfOrientation = V3d_XposYposZpos;
 		 Color : NameOfColor = Quantity_NOC_WHITE; 
     	    	 Headlight : Boolean  from  Standard  =  Standard_False)
-				returns mutable DirectionalLight ;
+				returns DirectionalLight ;
         ---Level: Public
       	---Purpose : Creates a directional light source in the viewer.
 
-    	Create ( VM : mutable Viewer ; Xt,Yt,Zt : Coordinate;
+    	Create ( VM : Viewer ; Xt,Yt,Zt : Coordinate;
 	         Xp,Yp,Zp : Coordinate;
 		 Color : NameOfColor = Quantity_NOC_WHITE;
     	    	 Headlight : Boolean  from  Standard  =  Standard_False)
-		       returns mutable DirectionalLight;
+		       returns DirectionalLight;
 	---Level: Public
 	---Purpose: Creates a directional light source in the viewer.
 	--          Xt,Yt,Zt : Coordinate of light source Target.
@@ -125,7 +125,7 @@ is
         ---Category: Private or Protected methods
         -----------------------------------------
         
-        Symbol ( me ; gsymbol : mutable Group from Graphic3d ;
+        Symbol ( me ; gsymbol : Group from Graphic3d ;
                       aView   : View from V3d ) is redefined static private;
     	---Level: Internal
 	---Purpose: Defines the representation of the directional light source.
diff --git a/src/V3d/V3d_LayerMgr.cdl b/src/V3d/V3d_LayerMgr.cdl
index 36f5ed7fa6..f209ede789 100644
--- a/src/V3d/V3d_LayerMgr.cdl
+++ b/src/V3d/V3d_LayerMgr.cdl
@@ -34,21 +34,21 @@ is
     ---Category: Public
 
     Create (aView : View from V3d)
-    returns mutable LayerMgr from V3d;
+    returns LayerMgr from V3d;
     
     Overlay (me)
-    returns mutable Layer from Visual3d;
+    returns Layer from Visual3d;
     ---C++: return const &
     ---C++: inline
 
     View (me)
-    returns mutable View from V3d;
+    returns View from V3d;
     ---C++: inline
 
     ColorScaleDisplay (me : mutable);
     ColorScaleErase (me : mutable);
     ColorScaleIsDisplayed (me) returns Boolean from Standard;
-    ColorScale (me) returns mutable ColorScale from Aspect;
+    ColorScale (me) returns ColorScale from Aspect;
 
     Compute (me : mutable);
     ---Purpose: Recompute layer with objects
diff --git a/src/V3d/V3d_Light.cdl b/src/V3d/V3d_Light.cdl
index b523844c27..cd03118d9d 100644
--- a/src/V3d/V3d_Light.cdl
+++ b/src/V3d/V3d_Light.cdl
@@ -53,7 +53,7 @@ raises
 
 is
 
-	Initialize( VM : mutable Viewer )  ;
+	Initialize( VM : Viewer )  ;
 
         --------------------------------------------------------
         ---Category: Methods to modify the attributes of the Light
@@ -126,7 +126,7 @@ is
         --          on the sphere of center "Center" and radius "Radius".
         --          VX,VY,VZ is the project vector of view.
 
-        Light ( me ) returns mutable Light from Visual3d is static private ;
+        Light ( me ) returns Light from Visual3d is static private ;
 	---Level: Internal
         ---Purpose: Returns the Light of the associated Visual3d.
 
diff --git a/src/V3d/V3d_PositionLight.cdl b/src/V3d/V3d_PositionLight.cdl
index 84707ba410..8cd61d3064 100644
--- a/src/V3d/V3d_PositionLight.cdl
+++ b/src/V3d/V3d_PositionLight.cdl
@@ -42,7 +42,7 @@ raises BadValue from V3d
 
 is
 
-	Initialize( VM : mutable Viewer )  ;
+	Initialize( VM : Viewer )  ;
 
         --------------------------------------------------------
         ---Category: Methods to modify the Attributes of the Light
@@ -130,7 +130,7 @@ is
         ---Category: Private or Protected methods
         -----------------------------------------
 
-        Symbol ( me ; gsymbol : mutable Group from Graphic3d ;
+        Symbol ( me ; gsymbol : Group from Graphic3d ;
                       aView   : View from V3d ) is deferred private;
 	---Level: Internal
 	---Purpose: Defines representation of the light source.
diff --git a/src/V3d/V3d_PositionalLight.cdl b/src/V3d/V3d_PositionalLight.cdl
index 3292024a9c..0208d34bcc 100644
--- a/src/V3d/V3d_PositionalLight.cdl
+++ b/src/V3d/V3d_PositionalLight.cdl
@@ -51,11 +51,11 @@ raises BadValue from V3d
 
 is
 
-    	Create ( VM : mutable Viewer ; X,Y,Z : Coordinate ;
+    	Create ( VM : Viewer ; X,Y,Z : Coordinate ;
 		 Color : NameOfColor = Quantity_NOC_WHITE ;
 		 Attenuation1 : Coefficient = 1.0 ; 
                  Attenuation2 : Coefficient = 0.0 ) 
-				returns mutable PositionalLight 
+				returns PositionalLight 
         ---Level: Public
        	---Purpose: Creates an isolated light source X,Y,Z in the viewer.
     	--          It is also defined by the color Color and
@@ -71,12 +71,12 @@ is
 	---Purpose:  Warning!  raises BadValue from V3d
 	--          if one of the attenuation coefficients is not between 0 et 1.
 
-    	Create ( VM : mutable Viewer ; Xt,Yt,Zt : Coordinate;
+    	Create ( VM : Viewer ; Xt,Yt,Zt : Coordinate;
 	         Xp,Yp,Zp : Coordinate;
 		 Color : NameOfColor = Quantity_NOC_WHITE ;
 		 Attenuation1 : Coefficient = 1.0 ; 
                  Attenuation2 : Coefficient = 0.0 ) 
-		       returns mutable PositionalLight 
+		       returns PositionalLight 
 	---Level: Public
 	---Purpose: Creates a light source of the Positional type 
 	--          in the viewer.
@@ -144,7 +144,7 @@ is
         ---Category: Private or Protected methods
         -----------------------------------------
 
-        Symbol ( me ; gsymbol : mutable Group from Graphic3d ;
+        Symbol ( me ; gsymbol : Group from Graphic3d ;
                       aView   : View from V3d ) is redefined static private;
 	---Level: Internal
 	---Purpose: Defined the representation of the positional light source.
diff --git a/src/V3d/V3d_RectangularGrid.cdl b/src/V3d/V3d_RectangularGrid.cdl
index 9d7ce1695a..4f2c906963 100644
--- a/src/V3d/V3d_RectangularGrid.cdl
+++ b/src/V3d/V3d_RectangularGrid.cdl
@@ -30,7 +30,7 @@ is
 	Create ( aViewer	: ViewerPointer from V3d;
 		 aColor		: Color from Quantity;
 		 aTenthColor	: Color from Quantity )
-	returns mutable RectangularGrid from V3d;
+	returns RectangularGrid from V3d;
 
 	SetColors ( me	: mutable;
 		    aColor	: Color from Quantity;
diff --git a/src/V3d/V3d_SpotLight.cdl b/src/V3d/V3d_SpotLight.cdl
index 239d41700d..1ea3bd463b 100644
--- a/src/V3d/V3d_SpotLight.cdl
+++ b/src/V3d/V3d_SpotLight.cdl
@@ -45,14 +45,14 @@ raises BadValue from V3d
 
 is
 
-    	Create ( VM : mutable Viewer ; X,Y,Z : Coordinate ;
+    	Create ( VM : Viewer ; X,Y,Z : Coordinate ;
 		 Direction : TypeOfOrientation = V3d_XnegYnegZpos ;
 		 Color : NameOfColor = Quantity_NOC_WHITE ; 
 		 Attenuation1 : Coefficient = 1.0 ; 
                  Attenuation2 : Coefficient = 0.0 ; 
 		 Concentration : Coefficient = 1.0 ;
 		 Angle : PlaneAngle = 0.523599 )
-				returns mutable SpotLight
+				returns SpotLight
         ---Level: Public
 	---Purpose: Creates a light source of the Spot type in the viewer.
         --          The attenuation factor F which determines
@@ -70,14 +70,14 @@ is
 	--	If one of the coefficients is not between 0 and 1 .
 	--	If the lighting angle is <= 0 ou > PI .
 	
-    	Create ( VM : mutable Viewer ; Xt,Yt,Zt : Coordinate;
+    	Create ( VM : Viewer ; Xt,Yt,Zt : Coordinate;
 	         Xp,Yp,Zp : Coordinate;
 		 Color : NameOfColor = Quantity_NOC_WHITE ;
 		 Attenuation1 : Coefficient = 1.0 ; 
                  Attenuation2 : Coefficient = 0.0 ; 
 		 Concentration : Coefficient = 1.0 ;
 		 Angle : PlaneAngle = 0.523599 )		 
-		       returns mutable SpotLight
+		       returns SpotLight
 	---Level: Public
 	---Purpose: Creates a light source of the Spot type in the viewer.
 	--          Xt,Yt,Zt : Coordinate of light source Target.
@@ -169,7 +169,7 @@ is
         ---Category: Private or Protected methods
         -----------------------------------------
 
-        Symbol ( me ; gsymbol : mutable Group from Graphic3d ;
+        Symbol ( me ; gsymbol : Group from Graphic3d ;
                       aView   : View from V3d ) is redefined static private;
 	---Level: Internal
 	---Purpose: Defines the representation of the spot light source.
diff --git a/src/V3d/V3d_View.cdl b/src/V3d/V3d_View.cdl
index 5a24af687a..5e00113eb7 100644
--- a/src/V3d/V3d_View.cdl
+++ b/src/V3d/V3d_View.cdl
@@ -145,10 +145,10 @@ raises
 
 is
 
-        Create ( VM : mutable Viewer; Type : TypeOfView from V3d = V3d_ORTHOGRAPHIC );
+        Create ( VM : Viewer; Type : TypeOfView from V3d = V3d_ORTHOGRAPHIC );
         ---Purpose: Initializes the view.
 
-        Create (theVM : mutable Viewer; theView : View from V3d);
+        Create (theVM : Viewer; theView : View from V3d);
         ---Purpose: Initializes the view by copying.
 
         --------------------------------------------------------
@@ -1218,10 +1218,10 @@ is
         ---Purpose : Go to the next active Light
         --           (if there is not, ActiveLight will raise an exception)
 
-        ActiveLight(me) returns mutable Light from V3d;
+        ActiveLight(me) returns Light from V3d;
         ---Level: Advanced
 
-        Viewer ( me ) returns mutable Viewer from V3d;
+        Viewer ( me ) returns Viewer from V3d;
         ---Level: Advanced
         ---Purpose: Returns the viewer in which the view has been created.
 
@@ -1229,7 +1229,7 @@ is
         ---Level: Public
         ---Purpose: Returns True if MyView is associated with a window .
 
-        Window ( me ) returns mutable Window from Aspect
+        Window ( me ) returns Window from Aspect
         ---Level: Public
         ---Purpose: Returns the Aspect Window associated with the view.
                 raises BadValue from V3d;
@@ -1334,7 +1334,7 @@ is
         Focale( me ) returns Length;
         ---Purpose: Returns the View Plane Distance for Perspective Views
 
-        View ( me) returns mutable View from Visual3d is static ;
+        View ( me) returns View from Visual3d is static ;
         ---Level: Advanced
         ---Purpose: Returns the associated Visual3d view.
 
diff --git a/src/V3d/V3d_Viewer.cdl b/src/V3d/V3d_Viewer.cdl
index 812c86fddf..36b3f14e11 100644
--- a/src/V3d/V3d_Viewer.cdl
+++ b/src/V3d/V3d_Viewer.cdl
@@ -92,7 +92,7 @@ is
                 theComputedMode   : Boolean from Standard = Standard_True;
                 theDefaultComputedMode: Boolean from Standard = Standard_True;
                 theSurfaceDetail  : TypeOfSurfaceDetail  from V3d = V3d_TEX_NONE)
-        returns mutable Viewer from V3d
+        returns Viewer from V3d
         ---Purpose: Create a Viewer with the given graphic driver and the given parameters  or
         --          with their default values.
         --          Currently creating of more than 100 viewer instances 
@@ -102,7 +102,7 @@ is
         ---Purpose:        If the size of the view is <= 0
         --  Warning: Client must creates a graphic driver
 
-        CreateView (me: mutable) returns mutable View from V3d;
+        CreateView (me: mutable) returns View from V3d;
         ---Level: Public
         ---Purpose: creates a view in the viewer according to its
         --          default parameters.
@@ -369,7 +369,7 @@ is
         ---Purpose : Go to the next active view
         --           (if there is not, ActiveView will raise an exception)
 
-        ActiveView(me) returns mutable View from V3d;
+        ActiveView(me) returns View from V3d;
         ---Level:   Advanced
 
         LastActiveView(me) returns Boolean from Standard;
@@ -410,7 +410,7 @@ is
         --           (if there is not, ActiveLight will raise an exception)
 
 
-        ActiveLight(me)        returns mutable Light from V3d;
+        ActiveLight(me)        returns Light from V3d;
         ---Level:   Advanced
 
         InitDefinedLights(me: mutable);
@@ -429,7 +429,7 @@ is
         DefinedLight(me) returns Light from V3d;
         ---Level:   Advanced
 
-        Viewer (me) returns mutable ViewManager ;
+        Viewer (me) returns ViewManager ;
         ---Level:   Advanced
         ---Purpose: Returns the viewer associated to Visual3d .
 
@@ -498,7 +498,7 @@ is
         ---Category: grid management
 
         Grid (me)
-        returns mutable Grid from Aspect
+        returns Grid from Aspect
         is static;
         ---Purpose : Returns the defined grid in <me>.
         ---Level : Public
@@ -680,7 +680,7 @@ is
         -- from lowest layer to highest ( foreground ). The first layer ID
         -- in sequence is the default layer that can't be removed.
 
-        Driver(me) returns mutable GraphicDriver from Graphic3d
+        Driver(me) returns GraphicDriver from Graphic3d
         is static;
         ---C++: return const &
 
diff --git a/src/ViewerTest/ViewerTest_EventManager.cdl b/src/ViewerTest/ViewerTest_EventManager.cdl
index e267a55d09..4712139c98 100644
--- a/src/ViewerTest/ViewerTest_EventManager.cdl
+++ b/src/ViewerTest/ViewerTest_EventManager.cdl
@@ -26,7 +26,7 @@ is
 
     Create (aView: View from V3d;
             aCtx :InteractiveContext from AIS)
-    returns mutable EventManager from ViewerTest;
+    returns EventManager from ViewerTest;
     
     MoveTo (me:mutable;
             xpix, ypix  : Integer from Standard) is virtual;
diff --git a/src/Visual3d/Visual3d_Layer.cdl b/src/Visual3d/Visual3d_Layer.cdl
index 3a45c0323b..d8c0da6cff 100644
--- a/src/Visual3d/Visual3d_Layer.cdl
+++ b/src/Visual3d/Visual3d_Layer.cdl
@@ -54,7 +54,7 @@ is
     Create (AViewer : ViewManager from Visual3d;
         AType   : TypeOfLayer from Aspect = Aspect_TOL_OVERLAY;
         AFlag   : Boolean from Standard = Standard_False)
-        returns mutable Layer from Visual3d;
+        returns Layer from Visual3d;
     ---Level: Public
     ---Purpose: Creates a layer with the type <Atype>.
     --      if <AFlag> == Standard_True then the layer is
diff --git a/src/Visual3d/Visual3d_Light.cdl b/src/Visual3d/Visual3d_Light.cdl
index 15e8dfb06f..ca7f0ad8b8 100644
--- a/src/Visual3d/Visual3d_Light.cdl
+++ b/src/Visual3d/Visual3d_Light.cdl
@@ -51,7 +51,7 @@ raises
 is
 
 	Create
-		returns mutable Light from Visual3d;
+		returns Light from Visual3d;
 	---Level: Public
 	---Purpose: Creates a light from default values.
 	--	    Light sources are created in a visualiser
@@ -61,7 +61,7 @@ is
 	--	    Color	= WHITE
 
 	Create ( Color		: Color from Quantity )
-		returns mutable Light from Visual3d;
+		returns Light from Visual3d;
 	---Level: Public
 	---Purpose: Creates an AMBIENT light source.
 	--	    Light sources are created in a visualiser
@@ -70,7 +70,7 @@ is
 	Create ( Color		: Color from Quantity;
 		 Direction	: Vector from Graphic3d; 
     	    	 Headlight      : Boolean  from  Standard  =  Standard_False )
-		returns mutable Light from Visual3d
+		returns Light from Visual3d
 	---Level: Public
 	---Purpose: Creates a DIRECTIONAL light source.
 	--	    Light sources are created in a visualiser
@@ -81,7 +81,7 @@ is
 	Create ( Color		: Color from Quantity;
 		 Position	: Vertex from Graphic3d;
 		 Fact1, Fact2	: Real from Standard )
-		returns mutable Light from Visual3d
+		returns Light from Visual3d
 	---Level: Public
 	---Purpose: Creates a POSITIONAL light source.
 	--	    Light sources are created in a visualiser
@@ -98,7 +98,7 @@ is
 		 Concentration	: Real from Standard;
 		 Fact1, Fact2	: Real from Standard;
 		 AngleCone	: Real from Standard )
-		returns mutable Light from Visual3d
+		returns Light from Visual3d
 	---Level: Public
 	---Purpose: Creates a SPOT light source.
 	--	    Light sources are created in a visualiser
diff --git a/src/Visual3d/Visual3d_View.cdl b/src/Visual3d/Visual3d_View.cdl
index f644aa8a71..a4b24d1492 100644
--- a/src/Visual3d/Visual3d_View.cdl
+++ b/src/Visual3d/Visual3d_View.cdl
@@ -131,8 +131,8 @@ is
 	--	The associated window.              --
 	----------------------------------------------
 
-	Create ( AManager	: mutable ViewManager from Visual3d )
-		returns mutable View from Visual3d;
+	Create ( AManager	: ViewManager from Visual3d )
+		returns View from Visual3d;
 	---Level: Public
 	---Purpose: Creates a view in the viewer <AManager> with a default
 	--	    orientation and a default mapping.
diff --git a/src/Visual3d/Visual3d_ViewManager.cdl b/src/Visual3d/Visual3d_ViewManager.cdl
index 9eb8d936ff..aadee62c90 100644
--- a/src/Visual3d/Visual3d_ViewManager.cdl
+++ b/src/Visual3d/Visual3d_ViewManager.cdl
@@ -53,7 +53,7 @@ uses
 is
 
 	Create ( theDriver: GraphicDriver from Graphic3d)
-		returns mutable ViewManager from Visual3d;
+		returns ViewManager from Visual3d;
 	---Level: Public
 	---Purpose: Creates a 3D visualizer.
 	--  Currently creating of more than 100 viewer instances 
diff --git a/src/Voxel/Voxel_Prs.cdl b/src/Voxel/Voxel_Prs.cdl
index 90764e7a3c..3bdc3cdac1 100644
--- a/src/Voxel/Voxel_Prs.cdl
+++ b/src/Voxel/Voxel_Prs.cdl
@@ -32,7 +32,7 @@ is
 
     Create
     ---Purpose: An empty constructor.
-    returns mutable Prs from Voxel;
+    returns Prs from Voxel;
 
 
     ---Category: Set Voxels
@@ -102,13 +102,13 @@ is
 
     Compute(me : mutable;
     	    thePresentationManager : PresentationManager3d from PrsMgr;
-    	    thePresentation : mutable Presentation from Prs3d;
+    	    thePresentation : Presentation from Prs3d;
     	    theMode         : Integer from Standard = 0) 
     is redefined 
     protected;
 
     ComputeSelection(me : mutable;
-    	    	     theSelection : mutable Selection from SelectMgr;
+    	    	     theSelection : Selection from SelectMgr;
     	    	     theMode      : Integer from Standard)
     is private;
 
diff --git a/src/Vrml/Vrml_AsciiText.cdl b/src/Vrml/Vrml_AsciiText.cdl
index b2e73c8ead..4ba396bb14 100644
--- a/src/Vrml/Vrml_AsciiText.cdl
+++ b/src/Vrml/Vrml_AsciiText.cdl
@@ -34,13 +34,13 @@ uses
 
 is
  
-    Create  returns  mutable  AsciiText from Vrml;
+    Create  returns  AsciiText from Vrml;
 
     Create ( aString        : HArray1OfAsciiString   from  TColStd;
     	     aSpacing       : Real    from  Standard;
     	     aJustification : AsciiTextJustification;
 	     aWidth         : Real    from  Standard ) 
-        returns mutable AsciiText from Vrml;
+        returns AsciiText from Vrml;
  
     SetString ( me :  mutable; aString  : HArray1OfAsciiString   from  TColStd );
     String ( me )  returns HArray1OfAsciiString  from  TColStd;
diff --git a/src/Vrml/Vrml_Coordinate3.cdl b/src/Vrml/Vrml_Coordinate3.cdl
index 47b58876e0..02e99944ba 100644
--- a/src/Vrml/Vrml_Coordinate3.cdl
+++ b/src/Vrml/Vrml_Coordinate3.cdl
@@ -28,9 +28,9 @@ uses
 
 is
     Create ( aPoint : HArray1OfVec  from  TColgp )
-    	returns mutable Coordinate3 from Vrml; 
+    	returns Coordinate3 from Vrml; 
      
-    Create  returns mutable Coordinate3 from Vrml;
+    Create  returns Coordinate3 from Vrml;
     
     SetPoint ( me  :  mutable; aPoint : HArray1OfVec  from  TColgp );
     Point ( me )  returns  HArray1OfVec  from  TColgp; 
diff --git a/src/Vrml/Vrml_IndexedFaceSet.cdl b/src/Vrml/Vrml_IndexedFaceSet.cdl
index efc5a01b21..e3bb19d886 100644
--- a/src/Vrml/Vrml_IndexedFaceSet.cdl
+++ b/src/Vrml/Vrml_IndexedFaceSet.cdl
@@ -41,9 +41,9 @@ is
     	     aMaterialIndex     : HArray1OfInteger from TColStd;
 	     aNormalIndex       : HArray1OfInteger from TColStd;
 	     aTextureCoordIndex : HArray1OfInteger from TColStd )
-        returns mutable IndexedFaceSet from Vrml;
+        returns IndexedFaceSet from Vrml;
 
-    Create  returns mutable IndexedFaceSet from Vrml; 
+    Create  returns IndexedFaceSet from Vrml; 
     
     SetCoordIndex ( me : mutable; aCoordIndex : HArray1OfInteger from TColStd );
     CoordIndex ( me )  returns HArray1OfInteger from TColStd;
diff --git a/src/Vrml/Vrml_IndexedLineSet.cdl b/src/Vrml/Vrml_IndexedLineSet.cdl
index 11ff34eb49..f25e38cd84 100644
--- a/src/Vrml/Vrml_IndexedLineSet.cdl
+++ b/src/Vrml/Vrml_IndexedLineSet.cdl
@@ -39,9 +39,9 @@ is
     	     aMaterialIndex     : HArray1OfInteger from TColStd;
 	     aNormalIndex       : HArray1OfInteger from TColStd;
 	     aTextureCoordIndex : HArray1OfInteger from TColStd )
-        returns mutable IndexedLineSet from Vrml; 
+        returns IndexedLineSet from Vrml; 
 	
-    Create  returns mutable IndexedLineSet from Vrml; 
+    Create  returns IndexedLineSet from Vrml; 
     
     SetCoordIndex ( me : mutable; aCoordIndex : HArray1OfInteger from TColStd );
     CoordIndex ( me )  returns HArray1OfInteger from TColStd;
diff --git a/src/Vrml/Vrml_LOD.cdl b/src/Vrml/Vrml_LOD.cdl
index 6647304ac3..487bfc4f1e 100644
--- a/src/Vrml/Vrml_LOD.cdl
+++ b/src/Vrml/Vrml_LOD.cdl
@@ -45,11 +45,11 @@ uses
 
 is
  
-    Create  returns mutable LOD from Vrml; 
+    Create  returns LOD from Vrml; 
  
     Create  ( aRange  :  HArray1OfReal from TColStd; 
     	      aCenter :  Vec          from  gp ) 
-         returns mutable LOD from Vrml; 
+         returns LOD from Vrml; 
 	 
     SetRange ( me : mutable;  aRange  : HArray1OfReal from TColStd ); 
     Range ( me )  returns  HArray1OfReal from TColStd; 
diff --git a/src/Vrml/Vrml_Material.cdl b/src/Vrml/Vrml_Material.cdl
index 8400dccb19..7862112331 100644
--- a/src/Vrml/Vrml_Material.cdl
+++ b/src/Vrml/Vrml_Material.cdl
@@ -38,9 +38,9 @@ is
 	       aEmissiveColor  :  HArray1OfColor  from   Quantity; 
 	       aShininess      :  HArray1OfReal   from   TColStd; 
 	       aTransparency   :  HArray1OfReal   from   TColStd ) 
-	  returns mutable Material from Vrml; 
+	  returns Material from Vrml; 
 
-    Create  returns mutable Material from Vrml;
+    Create  returns Material from Vrml;
 
     SetAmbientColor  ( me : mutable; aAmbientColor   :  HArray1OfColor  from  Quantity );
     AmbientColor  ( me )  returns  HArray1OfColor  from  Quantity;
diff --git a/src/Vrml/Vrml_Normal.cdl b/src/Vrml/Vrml_Normal.cdl
index c78c3249a2..7de2f4ae8e 100644
--- a/src/Vrml/Vrml_Normal.cdl
+++ b/src/Vrml/Vrml_Normal.cdl
@@ -30,9 +30,9 @@ uses
 is
  
     Create  (  aVector :  HArray1OfVec  from  TColgp  ) 
-      returns  mutable Normal from Vrml;
+      returns Normal from Vrml;
 
-    Create  returns  mutable  Normal  from  Vrml; 
+    Create  returns  Normal  from  Vrml; 
     
     SetVector ( me  :  mutable;  aVector : HArray1OfVec  from  TColgp );
     Vector ( me )  returns  HArray1OfVec  from  TColgp;
diff --git a/src/Vrml/Vrml_SFImage.cdl b/src/Vrml/Vrml_SFImage.cdl
index 8b467706e9..730633e196 100644
--- a/src/Vrml/Vrml_SFImage.cdl
+++ b/src/Vrml/Vrml_SFImage.cdl
@@ -51,12 +51,12 @@ uses
 
 is
  
-    Create returns mutable SFImage from Vrml; 
+    Create returns SFImage from Vrml; 
 
     Create ( aWidth, aHeight : Integer         from Standard; 
              aNumber         : SFImageNumber   from Vrml; 
     	     anArray         : HArray1OfInteger from TColStd)
-        returns  mutable SFImage from Vrml; 
+        returns SFImage from Vrml; 
 
     SetWidth ( me : mutable; aWidth : Integer from Standard );
     Width ( me )  returns Integer from Standard;
diff --git a/src/Vrml/Vrml_TextureCoordinate2.cdl b/src/Vrml/Vrml_TextureCoordinate2.cdl
index 300d8fa067..bd8342f472 100644
--- a/src/Vrml/Vrml_TextureCoordinate2.cdl
+++ b/src/Vrml/Vrml_TextureCoordinate2.cdl
@@ -33,10 +33,10 @@ uses
     HArray1OfVec2d  from TColgp 
 
 is
-    Create returns  mutable TextureCoordinate2 from Vrml; 
+    Create returns TextureCoordinate2 from Vrml; 
 
     Create  ( aPoint  :  HArray1OfVec2d   from  TColgp ) 
-    	returns  mutable TextureCoordinate2 from Vrml; 
+    	returns TextureCoordinate2 from Vrml; 
 	  
     SetPoint ( me : mutable;  aPoint : HArray1OfVec2d   from  TColgp );
     Point ( me )  returns  HArray1OfVec2d   from  TColgp;
diff --git a/src/VrmlConverter/VrmlConverter_Drawer.cdl b/src/VrmlConverter/VrmlConverter_Drawer.cdl
index 25eaa9dd3a..cbfc738f4e 100644
--- a/src/VrmlConverter/VrmlConverter_Drawer.cdl
+++ b/src/VrmlConverter/VrmlConverter_Drawer.cdl
@@ -31,7 +31,7 @@ uses
     Length from Quantity
 
 is
-    Create returns mutable Drawer from VrmlConverter;
+    Create returns Drawer from VrmlConverter;
 
 ---Category: deviation definition.
 -- 
@@ -125,7 +125,7 @@ is
 -- 
 -- Attributes for the U Isoparametric lines of patches.
 --    
-    UIsoAspect (me: mutable) returns mutable IsoAspect from VrmlConverter
+    UIsoAspect (me: mutable) returns IsoAspect from VrmlConverter
     ---Purpose: Defines the attributes which are used when drawing an 
     --          U isoparametric curve of a face. Defines the number
     --          of U isoparametric curves to be drawn for a single face.
@@ -142,7 +142,7 @@ is
 -- Attributes for the V Isoparametric line of patches.
 
 
-    VIsoAspect (me: mutable) returns mutable IsoAspect from VrmlConverter
+    VIsoAspect (me: mutable) returns IsoAspect from VrmlConverter
     ---Purpose: Defines the attributes which are used when drawing an 
     --          V isoparametric curve of a face. Defines the number
     --          of V isoparametric curves to be drawn for a single face.
@@ -158,7 +158,7 @@ is
 
 -- Attributes for the free boundaries
 
-    FreeBoundaryAspect (me: mutable) returns mutable LineAspect from VrmlConverter
+    FreeBoundaryAspect (me: mutable) returns LineAspect from VrmlConverter
     ---Purpose: 
     --          The default values are the same default values from Vrml package.
     --          These attributes are used by the following algorithms:
@@ -182,7 +182,7 @@ is
 
 -- Attributes for the wires
 
-    WireAspect (me: mutable) returns mutable LineAspect from VrmlConverter
+    WireAspect (me: mutable) returns LineAspect from VrmlConverter
     ---Purpose: 
     --          The default values are the same default values from Vrml package.
     --          These attributes are used by the following algorithms:
@@ -206,7 +206,7 @@ is
 
 -- Attributes for the unfree boundaries
 
-    UnFreeBoundaryAspect (me: mutable) returns mutable LineAspect from VrmlConverter
+    UnFreeBoundaryAspect (me: mutable) returns LineAspect from VrmlConverter
     ---Purpose: 
     --          The default values are the same default values from Vrml package.
     --          These attributes are used by the following algorithms:
@@ -231,7 +231,7 @@ is
 --  Attributes for the lines.
 -- 
 
-    LineAspect(me: mutable) returns mutable LineAspect from VrmlConverter
+    LineAspect(me: mutable) returns LineAspect from VrmlConverter
     ---Purpose: 
     --          The default values are the same default values from Vrml package.
     is static;
@@ -242,7 +242,7 @@ is
 --
 --  Attributes for the points
 -- 
-    PointAspect(me: mutable) returns mutable PointAspect from VrmlConverter
+    PointAspect(me: mutable) returns PointAspect from VrmlConverter
     --          The default values are the same default values from Vrml package.
     --          These attributes are used by the following algorithms:
     --          VrmlConverter_WFShape 
@@ -255,7 +255,7 @@ is
 
 --  Attributes for the faces:
 --  
-    ShadingAspect (me: mutable) returns mutable ShadingAspect from VrmlConverter
+    ShadingAspect (me: mutable) returns ShadingAspect from VrmlConverter
     ---Purpose: 
     --          The default values are the same default values from Vrml package.
     is static;
@@ -282,7 +282,7 @@ is
     ---Purpose: sets DrawHiddenLine  =  Standard_False  -  the hidden lines are not drawn.
     is static;
 
-    HiddenLineAspect(me: mutable) returns mutable LineAspect from VrmlConverter
+    HiddenLineAspect(me: mutable) returns LineAspect from VrmlConverter
     ---Purpose: returns LineAspect  for  the hidden lines.
     --          The default values are the same default values from Vrml package.
     is static;
@@ -291,7 +291,7 @@ is
     ---Purpose: sets LineAspect  for  the hidden lines.
     is static;
     
-    SeenLineAspect(me: mutable) returns mutable LineAspect from VrmlConverter
+    SeenLineAspect(me: mutable) returns LineAspect from VrmlConverter
     ---Purpose: returns LineAspect  for  the seen lines.
     --          The default values are the same default values from Vrml package.
     is static;
diff --git a/src/VrmlConverter/VrmlConverter_IsoAspect.cdl b/src/VrmlConverter/VrmlConverter_IsoAspect.cdl
index 92de3d19ef..e1c2a45635 100644
--- a/src/VrmlConverter/VrmlConverter_IsoAspect.cdl
+++ b/src/VrmlConverter/VrmlConverter_IsoAspect.cdl
@@ -26,7 +26,7 @@ uses
 is
 
     Create
-    returns mutable IsoAspect from VrmlConverter;
+    returns IsoAspect from VrmlConverter;
 
     ---Purpose: create a default IsoAspect. 
     --  Default value: myNumber  - 10.
@@ -34,7 +34,7 @@ is
     Create  (aMaterial: Material from Vrml; 
     	    	 OnOff: Boolean from Standard;
                aNumber: Integer from Standard)
-    returns mutable IsoAspect from VrmlConverter;
+    returns IsoAspect from VrmlConverter;
 	    
 
     SetNumber (me: mutable; aNumber: Integer from Standard) 
diff --git a/src/VrmlConverter/VrmlConverter_LineAspect.cdl b/src/VrmlConverter/VrmlConverter_LineAspect.cdl
index 113527cf1c..e2867ae8c8 100644
--- a/src/VrmlConverter/VrmlConverter_LineAspect.cdl
+++ b/src/VrmlConverter/VrmlConverter_LineAspect.cdl
@@ -26,19 +26,19 @@ uses
 is
 
     Create
-    returns mutable LineAspect from VrmlConverter;
+    returns LineAspect from VrmlConverter;
 
     ---Purpose: create a default LineAspect. 
     --  Default value: HasMaterial  =  False  - a  line  hasn't  own  material (color) 
 
     Create  (aMaterial: Material from Vrml; 
     	    	 OnOff: Boolean from Standard)
-    returns mutable LineAspect from VrmlConverter;
+    returns LineAspect from VrmlConverter;
  
     SetMaterial(me: mutable; aMaterial: Material from Vrml)
     is static;
  
-    Material(me) returns mutable Material from Vrml 
+    Material(me) returns Material from Vrml 
     is  static; 
 
     SetHasMaterial(me: mutable; OnOff: Boolean from Standard)
@@ -51,7 +51,7 @@ is
     ---Purpose: returns True if the  materials is  writing into OStream.
     is static;
  
---    Copy (me)  returns mutable like me;
+--    Copy (me)  returns like me;
     
 fields
      
diff --git a/src/VrmlConverter/VrmlConverter_PointAspect.cdl b/src/VrmlConverter/VrmlConverter_PointAspect.cdl
index c7d4e22ff4..cdb80da381 100644
--- a/src/VrmlConverter/VrmlConverter_PointAspect.cdl
+++ b/src/VrmlConverter/VrmlConverter_PointAspect.cdl
@@ -26,19 +26,19 @@ uses
 is
 
     Create
-    returns mutable PointAspect from VrmlConverter;
+    returns PointAspect from VrmlConverter;
 
     ---Purpose: create a default PointAspect. 
     --  Default value: HasMaterial  =  False  - a  line  hasn't  own  material (color) 
 
     Create  (aMaterial: Material from Vrml; 
     	    	 OnOff: Boolean from Standard)
-    returns mutable PointAspect from VrmlConverter;
+    returns PointAspect from VrmlConverter;
  
     SetMaterial(me: mutable; aMaterial: Material from Vrml)
     is static;
  
-    Material(me) returns mutable Material from Vrml 
+    Material(me) returns Material from Vrml 
     is  static; 
 
     SetHasMaterial(me: mutable; OnOff: Boolean from Standard)
diff --git a/src/VrmlConverter/VrmlConverter_Projector.cdl b/src/VrmlConverter/VrmlConverter_Projector.cdl
index 5446ad70c4..0b993835a5 100644
--- a/src/VrmlConverter/VrmlConverter_Projector.cdl
+++ b/src/VrmlConverter/VrmlConverter_Projector.cdl
@@ -45,7 +45,7 @@ is
 	     XUp, YUp, ZUp: Length from Quantity;                          -- High Point Direction
 	     Camera:  TypeOfCamera from VrmlConverter  = VrmlConverter_NoCamera;
    	     Light:   TypeOfLight from VrmlConverter   = VrmlConverter_NoLight ) 
-    returns mutable Projector from VrmlConverter; 
+    returns Projector from VrmlConverter; 
     
 
     SetCamera ( me: mutable; aCamera : TypeOfCamera from VrmlConverter );
diff --git a/src/VrmlConverter/VrmlConverter_ShadingAspect.cdl b/src/VrmlConverter/VrmlConverter_ShadingAspect.cdl
index 89120a1912..7e057571ea 100644
--- a/src/VrmlConverter/VrmlConverter_ShadingAspect.cdl
+++ b/src/VrmlConverter/VrmlConverter_ShadingAspect.cdl
@@ -28,12 +28,12 @@ is
  
     Create
     ---Purpose: create a default ShadingAspect.
-    returns mutable ShadingAspect from VrmlConverter;
+    returns ShadingAspect from VrmlConverter;
  
     SetFrontMaterial(me: mutable; aMaterial: Material from Vrml)
     is static;
  
-    FrontMaterial(me) returns mutable Material from Vrml 
+    FrontMaterial(me) returns Material from Vrml 
     is  static; 
     
 --    SetBackMaterial(me: mutable; aMaterial: Material from Vrml)
diff --git a/src/WNT/WNT_WClass.cdl b/src/WNT/WNT_WClass.cdl
index a626dd2d45..763b890607 100644
--- a/src/WNT/WNT_WClass.cdl
+++ b/src/WNT/WNT_WClass.cdl
@@ -57,7 +57,7 @@ class WClass from WNT inherits TShared from MMgt
      anIcon        : Handle    from Aspect = 0;
      aMenuName     : CString   from Standard = 0
     )
-     returns mutable WClass from WNT
+     returns WClass from WNT
     	---Level:   Public
     	---Purpose: Creates a Windows NT window class and registers it.
     	---Trigger: Raises if class registration failed.
diff --git a/src/WNT/WNT_Window.cdl b/src/WNT/WNT_Window.cdl
index be5a33d387..bc5243860b 100644
--- a/src/WNT/WNT_Window.cdl
+++ b/src/WNT/WNT_Window.cdl
@@ -48,7 +48,7 @@ class Window from WNT inherits Window from Aspect
             theParent       : Handle        from Aspect = 0;
             theMenu         : Handle        from Aspect = 0;
             theClientStruct : Address       from Standard = 0)
-     returns mutable Window from WNT
+     returns Window from WNT
      ---Level:   Public
      ---Purpose: Creates a Window defined by his position and size
      --	    in pixles from the Parent Window.
@@ -60,7 +60,7 @@ class Window from WNT inherits Window from Aspect
      aHandle    : Handle        from Aspect;
      aBackColor : NameOfColor   from Quantity = Quantity_NOC_MATRAGRAY
     )
-     returns mutable Window from WNT;
+     returns Window from WNT;
      	---Level:   Public
      	---Purpose: Creates a Window based on the existing window handle.
         --          This handle equals ( aPart1 << 16 ) + aPart2.
@@ -70,7 +70,7 @@ class Window from WNT inherits Window from Aspect
      aPart2     : Integer       from Standard;
      aBackColor : NameOfColor   from Quantity = Quantity_NOC_MATRAGRAY
     )
-     returns mutable Window from WNT;
+     returns Window from WNT;
      	---Level:   Public
      	---Purpose: Creates a Window based on the existing window <aHandle>.
 
diff --git a/src/XCAFApp/XCAFApp_Application.cdl b/src/XCAFApp/XCAFApp_Application.cdl
index 9cb57b45cd..029ca25e8e 100644
--- a/src/XCAFApp/XCAFApp_Application.cdl
+++ b/src/XCAFApp/XCAFApp_Application.cdl
@@ -23,7 +23,7 @@ uses
 
 is
 
-    Create returns mutable Application from XCAFApp is protected;
+    Create returns Application from XCAFApp is protected;
 
 
     ---Purpose: methods from CDF_Application
diff --git a/src/XCAFDoc/XCAFDoc_Area.cdl b/src/XCAFDoc/XCAFDoc_Area.cdl
index 9b05160561..c616bc33d7 100644
--- a/src/XCAFDoc/XCAFDoc_Area.cdl
+++ b/src/XCAFDoc/XCAFDoc_Area.cdl
@@ -56,10 +56,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/XCAFDoc/XCAFDoc_Centroid.cdl b/src/XCAFDoc/XCAFDoc_Centroid.cdl
index 707a1a3e7d..02f8c9af75 100644
--- a/src/XCAFDoc/XCAFDoc_Centroid.cdl
+++ b/src/XCAFDoc/XCAFDoc_Centroid.cdl
@@ -59,10 +59,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     	returns OStream from Standard
diff --git a/src/XCAFDoc/XCAFDoc_Color.cdl b/src/XCAFDoc/XCAFDoc_Color.cdl
index 83a9322c77..bbf1e925da 100644
--- a/src/XCAFDoc/XCAFDoc_Color.cdl
+++ b/src/XCAFDoc/XCAFDoc_Color.cdl
@@ -77,10 +77,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 --    Dump(me; anOS : in out OStream from Standard)
 --    	returns OStream from Standard
diff --git a/src/XCAFDoc/XCAFDoc_ColorTool.cdl b/src/XCAFDoc/XCAFDoc_ColorTool.cdl
index c98fb5de5b..b9590b409f 100644
--- a/src/XCAFDoc/XCAFDoc_ColorTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_ColorTool.cdl
@@ -217,10 +217,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 fields
 
diff --git a/src/XCAFDoc/XCAFDoc_Datum.cdl b/src/XCAFDoc/XCAFDoc_Datum.cdl
index fc03b4795e..e42d5caa26 100644
--- a/src/XCAFDoc/XCAFDoc_Datum.cdl
+++ b/src/XCAFDoc/XCAFDoc_Datum.cdl
@@ -55,10 +55,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 fields
     myName : HAsciiString from TCollection;
diff --git a/src/XCAFDoc/XCAFDoc_DimTol.cdl b/src/XCAFDoc/XCAFDoc_DimTol.cdl
index 3f5f220cbf..50e11fcafc 100644
--- a/src/XCAFDoc/XCAFDoc_DimTol.cdl
+++ b/src/XCAFDoc/XCAFDoc_DimTol.cdl
@@ -59,10 +59,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 fields
     myKind : Integer from Standard;
diff --git a/src/XCAFDoc/XCAFDoc_DimTolTool.cdl b/src/XCAFDoc/XCAFDoc_DimTolTool.cdl
index 829b7bcef3..3c92e453c7 100644
--- a/src/XCAFDoc/XCAFDoc_DimTolTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_DimTolTool.cdl
@@ -168,10 +168,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 fields
 
diff --git a/src/XCAFDoc/XCAFDoc_DocumentTool.cdl b/src/XCAFDoc/XCAFDoc_DocumentTool.cdl
index 5768f82cd7..98d8d1d0fb 100644
--- a/src/XCAFDoc/XCAFDoc_DocumentTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_DocumentTool.cdl
@@ -88,7 +88,7 @@ is
         
     
     Create 
-    returns mutable DocumentTool from XCAFDoc;
+    returns DocumentTool from XCAFDoc;
 
     Init(me);
     ---Purpose: to be called when reading this attribute from file
@@ -103,10 +103,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
     
     Destroy (me: mutable) is virtual;
     ---C++    : alias ~
diff --git a/src/XCAFDoc/XCAFDoc_GraphNode.cdl b/src/XCAFDoc/XCAFDoc_GraphNode.cdl
index 907ae52ae2..a77b5c12f9 100644
--- a/src/XCAFDoc/XCAFDoc_GraphNode.cdl
+++ b/src/XCAFDoc/XCAFDoc_GraphNode.cdl
@@ -61,7 +61,7 @@ is
 	    ---Purpose: Instance methods: 
 	    --          ================ 
     
-    Create returns mutable GraphNode from XCAFDoc;
+    Create returns GraphNode from XCAFDoc;
     
     SetGraphID (me : mutable; explicitID : GUID  from Standard);
 	
@@ -142,12 +142,12 @@ is
     Restore (me: mutable; with : Attribute from TDF) 
     is virtual;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF) 
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF) 
     is virtual;    
 
     NewEmpty(me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 	
     References(me;
diff --git a/src/XCAFDoc/XCAFDoc_LayerTool.cdl b/src/XCAFDoc/XCAFDoc_LayerTool.cdl
index 4e17a6901b..59743484cf 100644
--- a/src/XCAFDoc/XCAFDoc_LayerTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_LayerTool.cdl
@@ -219,10 +219,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 fields
 
diff --git a/src/XCAFDoc/XCAFDoc_Location.cdl b/src/XCAFDoc/XCAFDoc_Location.cdl
index 5388ce7dd6..d879827639 100644
--- a/src/XCAFDoc/XCAFDoc_Location.cdl
+++ b/src/XCAFDoc/XCAFDoc_Location.cdl
@@ -59,10 +59,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 --    Dump(me; anOS : in out OStream from Standard)
 --    	returns OStream from Standard
diff --git a/src/XCAFDoc/XCAFDoc_Material.cdl b/src/XCAFDoc/XCAFDoc_Material.cdl
index 8b6ea52d94..414cbfa161 100644
--- a/src/XCAFDoc/XCAFDoc_Material.cdl
+++ b/src/XCAFDoc/XCAFDoc_Material.cdl
@@ -60,10 +60,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 fields
     myName        : HAsciiString from TCollection;
diff --git a/src/XCAFDoc/XCAFDoc_MaterialTool.cdl b/src/XCAFDoc/XCAFDoc_MaterialTool.cdl
index 61af94e866..6ba7960687 100644
--- a/src/XCAFDoc/XCAFDoc_MaterialTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_MaterialTool.cdl
@@ -100,10 +100,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
 fields
 
diff --git a/src/XCAFDoc/XCAFDoc_ShapeMapTool.cdl b/src/XCAFDoc/XCAFDoc_ShapeMapTool.cdl
index c2468c3ed6..c8bbd9172b 100644
--- a/src/XCAFDoc/XCAFDoc_ShapeMapTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_ShapeMapTool.cdl
@@ -58,10 +58,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     GetMap (me) returns IndexedMapOfShape from TopTools;
     ---C++: return const & 
diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.cdl b/src/XCAFDoc/XCAFDoc_ShapeTool.cdl
index 2d58cdfdc5..9faa64c7cf 100644
--- a/src/XCAFDoc/XCAFDoc_ShapeTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_ShapeTool.cdl
@@ -394,10 +394,10 @@ is
     Restore (me: mutable; with : Attribute from TDF);
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     IsExternRef (myclass; L: Label from TDF) returns Boolean;
     	---Purpose: Returns True if the label is a label of external references, i.e.
diff --git a/src/XCAFDoc/XCAFDoc_Volume.cdl b/src/XCAFDoc/XCAFDoc_Volume.cdl
index 16c812cbcd..2f7e0d1538 100644
--- a/src/XCAFDoc/XCAFDoc_Volume.cdl
+++ b/src/XCAFDoc/XCAFDoc_Volume.cdl
@@ -56,10 +56,10 @@ is
     Restore (me: mutable; With : Attribute from TDF);
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
-    Paste (me; Into : mutable Attribute from TDF;
-	       RT   : mutable RelocationTable from TDF);    
+    Paste (me; Into : Attribute from TDF;
+	       RT   : RelocationTable from TDF);    
 
     Dump(me; anOS : in out OStream from Standard)
     returns OStream from Standard
diff --git a/src/XCAFDrivers/XCAFDrivers_DocumentRetrievalDriver.cdl b/src/XCAFDrivers/XCAFDrivers_DocumentRetrievalDriver.cdl
index b0984b82db..c747887d3b 100644
--- a/src/XCAFDrivers/XCAFDrivers_DocumentRetrievalDriver.cdl
+++ b/src/XCAFDrivers/XCAFDrivers_DocumentRetrievalDriver.cdl
@@ -23,7 +23,7 @@ uses
     MessageDriver from CDM
 
 is
-    Create returns mutable DocumentRetrievalDriver from XCAFDrivers;    
+    Create returns DocumentRetrievalDriver from XCAFDrivers;    
 
     AttributeDrivers(me : mutable; theMessageDriver : MessageDriver from CDM)
     returns ARDriverTable from MDF
diff --git a/src/XCAFDrivers/XCAFDrivers_DocumentStorageDriver.cdl b/src/XCAFDrivers/XCAFDrivers_DocumentStorageDriver.cdl
index c634799cfd..a14c7ea0b9 100644
--- a/src/XCAFDrivers/XCAFDrivers_DocumentStorageDriver.cdl
+++ b/src/XCAFDrivers/XCAFDrivers_DocumentStorageDriver.cdl
@@ -23,7 +23,7 @@ uses
     MessageDriver from CDM
 
 is
-    Create returns mutable DocumentStorageDriver from XCAFDrivers;
+    Create returns DocumentStorageDriver from XCAFDrivers;
 
     AttributeDrivers(me : mutable; theMessageDriver : MessageDriver from CDM)
     returns ASDriverTable from MDF
diff --git a/src/XCAFPrs/XCAFPrs_AISObject.cdl b/src/XCAFPrs/XCAFPrs_AISObject.cdl
index 1127c6fe68..debf2c7ff1 100644
--- a/src/XCAFPrs/XCAFPrs_AISObject.cdl
+++ b/src/XCAFPrs/XCAFPrs_AISObject.cdl
@@ -50,13 +50,13 @@ is
     AddStyledItem (me: mutable; style: Style from XCAFPrs;
                    shape: Shape from TopoDS;
                    aPresentationManager : PresentationManager3d from PrsMgr;
-                   aPresentation        : mutable Presentation from Prs3d;
+                   aPresentation        : Presentation from Prs3d;
     	           aMode                : Integer from Standard = 0) 
     is private;
 
     Compute (me                   : mutable;
              aPresentationManager : PresentationManager3d from PrsMgr;
-             aPresentation        : mutable Presentation from Prs3d;
+             aPresentation        : Presentation from Prs3d;
     	     aMode                : Integer from Standard = 0) 
     is redefined virtual protected;
     	---Purpose: Redefined method to compute presentation
diff --git a/src/XSAlgo/XSAlgo_AlgoContainer.cdl b/src/XSAlgo/XSAlgo_AlgoContainer.cdl
index c9151db233..e153b73aa2 100644
--- a/src/XSAlgo/XSAlgo_AlgoContainer.cdl
+++ b/src/XSAlgo/XSAlgo_AlgoContainer.cdl
@@ -35,7 +35,7 @@ uses
     
 is
 
-    Create returns mutable AlgoContainer from XSAlgo;
+    Create returns AlgoContainer from XSAlgo;
     	---Purpose: Empty constructor
 	
     SetToolContainer (me: mutable; TC: ToolContainer from XSAlgo);
diff --git a/src/XSAlgo/XSAlgo_ToolContainer.cdl b/src/XSAlgo/XSAlgo_ToolContainer.cdl
index 1829d0871a..e5171726ce 100644
--- a/src/XSAlgo/XSAlgo_ToolContainer.cdl
+++ b/src/XSAlgo/XSAlgo_ToolContainer.cdl
@@ -18,7 +18,7 @@ class ToolContainer from XSAlgo inherits TShared from MMgt
     ---Purpose: 
 
 is
-    Create returns mutable ToolContainer from XSAlgo;
+    Create returns ToolContainer from XSAlgo;
     	---Purpose: Empty constructor
 	
 end ToolContainer;
diff --git a/src/XSControl/XSControl_Controller.cdl b/src/XSControl/XSControl_Controller.cdl
index 2c4cda3ea6..516557bcdf 100644
--- a/src/XSControl/XSControl_Controller.cdl
+++ b/src/XSControl/XSControl_Controller.cdl
@@ -75,7 +75,7 @@ is
     ---Purpose : Records <me> in a general dictionary under a name
     --           Error if <name> already used for another one
 
-    Recorded (myclass; name : CString) returns mutable Controller;
+    Recorded (myclass; name : CString) returns Controller;
     ---Purpose : Returns the Controller attached to a given name
     --           Returns a Null Handle if <name> is unknown
 
@@ -138,17 +138,17 @@ is
     ---Purpose : Returns the WorkLibrary attached to the Norm. Remark that it
     --           has to be in phase with the Protocol  (read from field)
 
-    NewModel      (me) returns mutable InterfaceModel from Interface  is deferred;
+    NewModel      (me) returns InterfaceModel from Interface  is deferred;
     ---Purpose : Creates a new empty Model ready to receive data of the Norm
     --           Used to write data from Imagine to an interface file
 
     ActorRead     (me; model : InterfaceModel)
-                 returns mutable ActorOfTransientProcess from Transfer  is deferred;
+                 returns ActorOfTransientProcess from Transfer  is deferred;
     ---Purpose : Returns the Actor for Read attached to the pair (norm,appli)
     --           It can be adapted for data of the input Model, as required
     --           Can be read from field then adapted with Model as required
 
-    ActorWrite    (me) returns mutable ActorOfFinderProcess from Transfer
+    ActorWrite    (me) returns ActorOfFinderProcess from Transfer
     	is virtual;
     ---Purpose : Returns the Actor for Write attached to the pair (norm,appli)
     --           Read from field. Can be redefined
@@ -202,8 +202,8 @@ is
     --           TransientMapper). Can be redefined
 
     TransferWriteTransient (me; obj : Transient;
-                        FP        : mutable FinderProcess  from Transfer;
-                        model     : mutable InterfaceModel from Interface;
+                        FP        : FinderProcess  from Transfer;
+                        model     : InterfaceModel from Interface;
                         modetrans : Integer = 0)
     	returns ReturnStatus  is virtual;
     ---Purpose : Takes one Transient Object and transfers it to an
@@ -223,8 +223,8 @@ is
     --           Asks the ActorWrite (through a ShapeMapper)
 
     TransferWriteShape (me; shape : Shape from TopoDS;
-                        FP        : mutable FinderProcess  from Transfer;
-                        model     : mutable InterfaceModel from Interface;
+                        FP        : FinderProcess  from Transfer;
+                        model     : InterfaceModel from Interface;
                         modetrans : Integer = 0)
     	returns ReturnStatus  is virtual;
     ---Purpose : Takes one Shape and transfers it to an
@@ -242,7 +242,7 @@ is
     	--  - ResolveCluster performs the resolution, its result consists in
     	--    having all data gathered in one final model
 
-    ClusterContext (me; WS : WorkSession) returns mutable Transient is virtual;
+    ClusterContext (me; WS : WorkSession) returns Transient is virtual;
     ---Purpose : Prepares and returns a context to resolve a cluster
     --           All data to be used are detained by the WorkSession
     --           The definition of this context is free and proper to each case
@@ -254,7 +254,7 @@ is
     --           If no cluster has to be resolved, should return a null handle
     --           This is the default case, which can be redefined
 
-    ResolveCluster (me; WS : mutable WorkSession; context : mutable Transient)
+    ResolveCluster (me; WS : WorkSession; context : Transient)
     	returns CheckIterator  is virtual;
     ---Purpose : Performs the resolution itself, from the starting data and
     --           the cluster context
diff --git a/src/XSControl/XSControl_FuncShape.cdl b/src/XSControl/XSControl_FuncShape.cdl
index ecbfb30ec9..9a97ffa231 100644
--- a/src/XSControl/XSControl_FuncShape.cdl
+++ b/src/XSControl/XSControl_FuncShape.cdl
@@ -36,7 +36,7 @@ is
     ---Purpose : Defines and loads all functions which work on shapes for XSControl (as ActFunc)
 
     MoreShapes (myclass; session : WorkSession from XSControl;
-    	    	list : in out mutable HSequenceOfShape from TopTools;
+    	    	list : in out HSequenceOfShape from TopTools;
                 name : CString) returns Integer;
     ---Purpose : Analyses a name as designating Shapes from a Vars or from
     --           XSTEP transfer (last Transfer on Reading). <name> can be :
diff --git a/src/XSControl/XSControl_Reader.cdl b/src/XSControl/XSControl_Reader.cdl
index b0a4566831..f5a016c77e 100644
--- a/src/XSControl/XSControl_Reader.cdl
+++ b/src/XSControl/XSControl_Reader.cdl
@@ -65,7 +65,7 @@ is
     ---Purpose : Creates a Reader from scratch, with a norm name which
     --           identifies a Controller
 
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True) returns Reader;
     ---Purpose : Creates a Reader from an already existing Session, with a
     --           Controller already set
@@ -77,7 +77,7 @@ is
     ---Purpose : Sets a specific norm to <me>
     --           Returns True if done, False if <norm> is not available
 
-    SetWS (me : in out; WS : mutable WorkSession from XSControl;
+    SetWS (me : in out; WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True);
     ---Purpose : Sets a specific session to <me>
 
diff --git a/src/XSControl/XSControl_SelectForTransfer.cdl b/src/XSControl/XSControl_SelectForTransfer.cdl
index 144ce75c6d..9c493f2ad5 100644
--- a/src/XSControl/XSControl_SelectForTransfer.cdl
+++ b/src/XSControl/XSControl_SelectForTransfer.cdl
@@ -35,11 +35,11 @@ uses AsciiString from TCollection, InterfaceModel,
 
 is
 
-    Create returns mutable SelectForTransfer;
+    Create returns SelectForTransfer;
     ---Purpose : Creates a SelectForTransfer, non initialised
     --           it sorts nothing, unless an Actor has been defined
 
-    Create (TR : TransferReader) returns mutable SelectForTransfer;
+    Create (TR : TransferReader) returns SelectForTransfer;
     ---Purpose : Creates a SelectForTransfer, which will work with the
     --           currently defined Actor brought by the TransferReader
 
@@ -47,7 +47,7 @@ is
     ---Purpose : Sets a TransferReader to sort entities : it brings the Actor,
     --           which may change, while the TransferReader does not
 
-    SetActor (me : mutable; act : mutable ActorOfTransientProcess);
+    SetActor (me : mutable; act : ActorOfTransientProcess);
     ---Purpose : Sets a precise actor to sort entities
     --           This definition oversedes the creation with a TransferReader
 
diff --git a/src/XSControl/XSControl_SignTransferStatus.cdl b/src/XSControl/XSControl_SignTransferStatus.cdl
index cac86b2da3..f3e5762438 100644
--- a/src/XSControl/XSControl_SignTransferStatus.cdl
+++ b/src/XSControl/XSControl_SignTransferStatus.cdl
@@ -35,11 +35,11 @@ uses CString, Transient, InterfaceModel,
 
 is
 
-    Create returns mutable SignTransferStatus;
+    Create returns SignTransferStatus;
     ---Purpose : Creates a SignTransferStatus, not initialised
     --           it gives nothing (empty string)
 
-    Create (TR : TransferReader) returns mutable SignTransferStatus;
+    Create (TR : TransferReader) returns SignTransferStatus;
     ---Purpose : Creates a SignTransferStatus, which will work on the current
     --           TransientProcess brought by the TransferReader (its MapReader)
 
diff --git a/src/XSControl/XSControl_TransferReader.cdl b/src/XSControl/XSControl_TransferReader.cdl
index f6eb5e8f2a..68dadd4b1a 100644
--- a/src/XSControl/XSControl_TransferReader.cdl
+++ b/src/XSControl/XSControl_TransferReader.cdl
@@ -44,20 +44,20 @@ uses CString, AsciiString, Transient,
 
 is
 
-    Create returns mutable TransferReader;
+    Create returns TransferReader;
     ---Purpose : Creates a TransferReader, empty
 
     	--    General Management    --
 
-    SetController (me : mutable; control : mutable Controller from XSControl);
+    SetController (me : mutable; control : Controller from XSControl);
     ---Purpose : Sets a Controller. It is required to generate the Actor.
     --           Elsewhere, the Actor must be provided directly
 
-    SetActor (me : mutable; actor : mutable ActorOfTransientProcess);
+    SetActor (me : mutable; actor : ActorOfTransientProcess);
     ---Purpose : Sets the Actor directly : this value will be used if the
     --           Controller is not set
 
-    Actor    (me : mutable) returns mutable ActorOfTransientProcess;
+    Actor    (me : mutable) returns ActorOfTransientProcess;
     ---Purpose : Returns the Actor, determined by the Controller, or if this
     --           one is unknown, directly set.
     --           Once it has been defined, it can then be edited.
@@ -100,12 +100,12 @@ is
     --           +1 final results
     --           +2 working data (model, context, transfer process)
 
-    TransientProcess (me) returns mutable TransientProcess;
+    TransientProcess (me) returns TransientProcess;
     ---Purpose : Returns the currently used TransientProcess
     --           It is computed from the model by TransferReadRoots, or by
     --           BeginTransferRead
 
-    SetTransientProcess (me : mutable; TP : mutable TransientProcess);
+    SetTransientProcess (me : mutable; TP : TransientProcess);
     ---Purpose : Forces the TransientProcess
     --           Remark : it also changes the Model and the Actor, from those
     --           recorded in the new TransientProcess
@@ -164,7 +164,7 @@ is
     ---Purpose : Returns the final result recorded for a NUMBER of entity
     --           (internal use). Null if out of range
 
-    TransientResult   (me; ent : Transient) returns mutable Transient;
+    TransientResult   (me; ent : Transient) returns Transient;
     ---Purpose : Returns the resulting object as a Transient
     --           Null Handle if no result or result not transient
 
diff --git a/src/XSControl/XSControl_TransferWriter.cdl b/src/XSControl/XSControl_TransferWriter.cdl
index 88f4e5bfe4..6f66c87e78 100644
--- a/src/XSControl/XSControl_TransferWriter.cdl
+++ b/src/XSControl/XSControl_TransferWriter.cdl
@@ -31,14 +31,14 @@ uses Transient,
 
 is
 
-    Create  returns mutable TransferWriter;
+    Create  returns TransferWriter;
     ---Purpose : Creates a TransferWriter, empty, ready to run
     --           with an empty FinderProcess (but no controller, etc)
 
-    FinderProcess (me) returns mutable FinderProcess;
+    FinderProcess (me) returns FinderProcess;
     ---Purpose : Returns the FinderProcess itself
 
-    SetFinderProcess (me : mutable; FP : mutable FinderProcess);
+    SetFinderProcess (me : mutable; FP : FinderProcess);
     ---Purpose : Sets a new FinderProcess and forgets the former one
 
     Controller (me) returns Controller;
@@ -73,7 +73,7 @@ is
     --           Asks the Controller (RecognizeWriteTransient)
     --           If <obj> is a HShape, calls RecognizeShape
 
-    TransferWriteTransient (me : mutable; model : mutable InterfaceModel;
+    TransferWriteTransient (me : mutable; model : InterfaceModel;
     	 obj : Transient)
         returns ReturnStatus;
     ---Purpose : Transfers a Transient object (from an application) to a model
@@ -86,7 +86,7 @@ is
     ---Purpose : Tells if a Shape is valid for a transfer to a model
     --           Asks the Controller (RecognizeWriteShape)
 
-    TransferWriteShape (me : mutable; model : mutable InterfaceModel;
+    TransferWriteShape (me : mutable; model : InterfaceModel;
     	 shape : Shape from TopoDS)
         returns ReturnStatus;
     ---Purpose : Transfers a Shape from CasCade to a model of current norm,
diff --git a/src/XSControl/XSControl_Utils.cdl b/src/XSControl/XSControl_Utils.cdl
index 69bc6a72eb..260afc7ff7 100644
--- a/src/XSControl/XSControl_Utils.cdl
+++ b/src/XSControl/XSControl_Utils.cdl
@@ -76,12 +76,12 @@ is
     	--    List of Transients (HSequence or HArray1)    --
 
     TraValue  (me; list : Transient; num : Integer)
-    	returns mutable Transient;
+    	returns Transient;
     --  allowed : HSequenceOfTransient    -> Transient,
     --            HSequenceOfHAsciiString -> HAsciiString
     --  out of range gives Null Handle
-    NewSeqTra (me) returns mutable HSequenceOfTransient;    -- empty new
-    AppendTra (me; seqval : mutable HSequenceOfTransient;
+    NewSeqTra (me) returns HSequenceOfTransient;    -- empty new
+    AppendTra (me; seqval : HSequenceOfTransient;
     			traval : Transient);
 
     	--    Dates
@@ -94,14 +94,14 @@ is
 
     ToCString (me; strval : HAsciiString) returns CString;
     ToCString (me; strval :  AsciiString) returns CString;
-    ToHString (me; strcon : CString) returns mutable HAsciiString;
+    ToHString (me; strcon : CString) returns HAsciiString;
     ToAString (me; strcon : CString) returns AsciiString;
 
     	--    Extended    --
 
     ToEString (me; strval : HExtendedString) returns ExtString;
     ToEString (me; strval :  ExtendedString) returns ExtString;
-    ToHString (me; strcon : ExtString) returns mutable HExtendedString;
+    ToHString (me; strcon : ExtString) returns HExtendedString;
     ToXString (me; strcon : ExtString) returns ExtendedString;
 
     	--    Ascii <-> Extended    --
@@ -118,11 +118,11 @@ is
     --  conversions Ascii<->Extended are done if required
     --  out of range gives empty string
 
-    NewSeqCStr (me) returns mutable HSequenceOfHAsciiString;      -- empty
-    AppendCStr (me; seqval : mutable HSequenceOfHAsciiString;
+    NewSeqCStr (me) returns HSequenceOfHAsciiString;      -- empty
+    AppendCStr (me; seqval : HSequenceOfHAsciiString;
     	    	    	 strval : CString);
-    NewSeqEStr (me) returns mutable HSequenceOfHExtendedString;   -- empty
-    AppendEStr (me; seqval : mutable HSequenceOfHExtendedString;
+    NewSeqEStr (me) returns HSequenceOfHExtendedString;   -- empty
+    AppendEStr (me; seqval : HSequenceOfHExtendedString;
     	    	    	 strval : ExtString);
 
     	--    --    Shapes    --    --
@@ -177,14 +177,14 @@ is
     ShapeValue  (me; seqv : HSequenceOfShape from TopTools; num : Integer)
     	returns Shape from TopoDS;
     --  out of range gives Null Handle
-    NewSeqShape (me) returns mutable HSequenceOfShape;    -- empty new
-    AppendShape (me; seqv  : mutable HSequenceOfShape;
+    NewSeqShape (me) returns HSequenceOfShape;    -- empty new
+    AppendShape (me; seqv  : HSequenceOfShape;
     	    	    	  shape : Shape from TopoDS);
 
     	--    Shape <-> Transient    --
 
     ShapeBinder (me; shape : Shape from TopoDS; hs : Boolean = Standard_True)
-    	returns mutable Transient;
+    	returns Transient;
     ---Purpose : Creates a Transient Object from a Shape : it is either a Binder
     --           (used by functions which require a Transient but can process
     --           a Shape, such as viewing functions) or a HShape (according to hs)
@@ -200,11 +200,11 @@ is
     --  list : HSequence of Transient,(H)Ascii/ExtendedString,Shape,Integer
 
     SeqToArr  (me; seq : Transient; first : Integer = 1)
-    	returns mutable Transient   raises TypeMismatch;
+    	returns Transient   raises TypeMismatch;
     --   <first> gives the lower index of produced array
     --   empty sequence gives a null handle
     ArrToSeq  (me; arr : Transient)
-    	returns mutable Transient   raises TypeMismatch;
+    	returns Transient   raises TypeMismatch;
     -- allowed combinations :
     --    HSequenceOfTransient       <-> HArray1OfTransient
     --    HSequenceOfHAsciiString    <-> HArray1OfHAsciiString (from Interface)
diff --git a/src/XSControl/XSControl_Vars.cdl b/src/XSControl/XSControl_Vars.cdl
index 0032fad4c4..c17612fb71 100644
--- a/src/XSControl/XSControl_Vars.cdl
+++ b/src/XSControl/XSControl_Vars.cdl
@@ -34,7 +34,7 @@ uses CString, Transient, DictionaryOfTransient,
 
 is
 
-    Create returns mutable Vars;
+    Create returns Vars;
 
     Set (me : mutable; name : CString; val : Transient)  is virtual;
 
diff --git a/src/XSControl/XSControl_WorkSession.cdl b/src/XSControl/XSControl_WorkSession.cdl
index 75ddc4d18c..b554f22b16 100644
--- a/src/XSControl/XSControl_WorkSession.cdl
+++ b/src/XSControl/XSControl_WorkSession.cdl
@@ -34,7 +34,7 @@ uses CString, Transient, DictionaryOfTransient,
 
 is
 
-    Create returns mutable WorkSession from XSControl;
+    Create returns WorkSession from XSControl;
 
     ClearData (me : mutable; mode : Integer) is redefined;
     ---Purpose : In addition to basic ClearData, clears Transfer and Management
@@ -63,7 +63,7 @@ is
     --           
     --           For more infos on Profile, query the Profile of the Controller
 
-    SetController (me : mutable; ctl : mutable Controller);
+    SetController (me : mutable; ctl : Controller);
     ---Purpose : Selects a Norm defined by its Controller itself
 
     AdaptNorm  (me : mutable) is virtual;
@@ -76,7 +76,7 @@ is
     --           By default, returns the complete name of the norm
     --           If <rsc> is True, returns the short name used for resource
 
-    NormAdaptor (me) returns mutable Controller;
+    NormAdaptor (me) returns Controller;
     ---Purpose : Returns the norm controller itself
 
     	--  Context used for Transfer : it is a DictionaryOfTransient (no control here)
@@ -112,23 +112,23 @@ is
     --           4 begins a new transfer (by BeginTransfer)
     --           5 recreates TransferReader then begins a new transfer
 
-    SetTransferReader (me : mutable; TR : mutable TransferReader);
+    SetTransferReader (me : mutable; TR : TransferReader);
     ---Purpose : Sets a Transfer Reader, which manages transfers on reading
 
-    TransferReader (me) returns mutable TransferReader;
+    TransferReader (me) returns TransferReader;
     ---Purpose : Returns the Transfer Reader, Null if not set
 
-    MapReader      (me) returns mutable TransientProcess;
+    MapReader      (me) returns TransientProcess;
     ---Purpose : Returns the TransientProcess(internal data for TransferReader)
 
-    SetMapReader   (me : mutable; TP : mutable TransientProcess) returns Boolean;
+    SetMapReader   (me : mutable; TP : TransientProcess) returns Boolean;
     ---Purpose : Changes the Map Reader, i.e. considers that the new one
     --           defines the relevant read results (forgets the former ones)
     --           Returns True when done, False in case of bad definition, i.e.
     --           if Model from TP differs from that of Session
 
     Result (me; ent : Transient; mode : Integer)
-    	 returns mutable Transient;
+    	 returns Transient;
     ---Purpose : Returns the result attached to a starting entity
     --           If <mode> = 0, returns Final Result
     --           If <mode> = 1, considers Last Result
@@ -173,18 +173,18 @@ is
     	--  Management of Transfer (Write)  --
     	--  It is actually oriented to shapes
 
-    NewModel (me : mutable) returns mutable InterfaceModel from Interface;
+    NewModel (me : mutable) returns InterfaceModel from Interface;
     ---Purpose : produces and returns a new Model well conditionned
     --           It is produced by the Norm Controller
     --           It can be Null (if this function is not implemented)
 
-    TransferWriter (me) returns mutable TransferWriter;
+    TransferWriter (me) returns TransferWriter;
     ---Purpose : Returns the Transfer Reader, Null if not set
 
-    MapWriter      (me) returns mutable FinderProcess;
+    MapWriter      (me) returns FinderProcess;
     ---Purpose : Returns the FinderProcess (internal data for TransferWriter)
 
-    SetMapWriter   (me : mutable; FP : mutable FinderProcess) returns Boolean;
+    SetMapWriter   (me : mutable; FP : FinderProcess) returns Boolean;
     ---Purpose : Changes the Map Reader, i.e. considers that the new one
     --           defines the relevant read results (forgets the former ones)
     --           Returns True when done, False if <FP> is Null
diff --git a/src/XSControl/XSControl_Writer.cdl b/src/XSControl/XSControl_Writer.cdl
index f1414c451e..942083b5f4 100644
--- a/src/XSControl/XSControl_Writer.cdl
+++ b/src/XSControl/XSControl_Writer.cdl
@@ -34,7 +34,7 @@ is
     ---Purpose : Creates a Writer from scratch, with a norm name which
     --           identifie a Controller
 
-    Create (WS : mutable WorkSession from XSControl;
+    Create (WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True) returns Writer;
     ---Purpose : Creates a Writer from an already existing Session
     --           If <scratch> is True (D), clears already recorded data
@@ -43,7 +43,7 @@ is
     ---Purpose : Sets a specific norm to <me>
     --           Returns True if done, False if <norm> is not available
 
-    SetWS (me : in out; WS : mutable WorkSession from XSControl;
+    SetWS (me : in out; WS : WorkSession from XSControl;
     	    	 scratch : Boolean = Standard_True);
     ---Purpose : Sets a specific session to <me>
 
diff --git a/src/XSDRAW/XSDRAW.cdl b/src/XSDRAW/XSDRAW.cdl
index 0414a7ff26..a9631fdec4 100644
--- a/src/XSDRAW/XSDRAW.cdl
+++ b/src/XSDRAW/XSDRAW.cdl
@@ -91,10 +91,10 @@ is
     --             Execute ("command args %s args..",var)  [var is a CString]
     --           Returns the same value as returned by call from DRAW
 
-    Pilot   returns mutable SessionPilot from IFSelect;
+    Pilot   returns SessionPilot from IFSelect;
     ---Purpose : Returns the SessionPilot (can be used for direct call)
 
-    Session returns mutable WorkSession from XSControl;
+    Session returns WorkSession from XSControl;
     ---Purpose : Returns the WorkSession defined in AddDraw (through Pilot)
     --           It is from XSControl, it brings functionnalities for Transfers
 
@@ -116,10 +116,10 @@ is
     Protocol  returns Protocol from Interface;
     ---Purpose : Returns the actually defined Protocol
 
-    Model returns mutable InterfaceModel from Interface;
+    Model returns InterfaceModel from Interface;
     ---Purpose : Returns the Model of the Session (it is Session()->Model() )
 
-    SetModel (model : mutable InterfaceModel from Interface; file : CString = "");
+    SetModel (model : InterfaceModel from Interface; file : CString = "");
     ---Purpose : Sets a Model in session (it is Session()->SetModel(model) )
     --           If <file> is defined, SetLoadedFile is also done
 
@@ -136,7 +136,7 @@ is
     ---Purpose : Returns the number of an entity in the Model (StartingNumber)
     --           0 if <ent> unknown in the model, or null
 
-    SetTransferProcess (TP : mutable Transient);
+    SetTransferProcess (TP : Transient);
     ---Purpose : Sets a TransferProcess in order to analyse it (see Activator)
     --           It can be either a FinderProcess or a TransientProcess, in
     --           that case a new TransferReader is created on it
@@ -199,7 +199,7 @@ is
     --           Else, the root part of <resfile> is considered, if defined
     --           Else, <def> is taken
 
-    MoreShapes (list : in out mutable HSequenceOfShape from TopTools;
+    MoreShapes (list : in out HSequenceOfShape from TopTools;
     	    	name : CString) returns Integer;
     ---Purpose : Analyses a name as designating Shapes from DRAW variables or
     --           XSTEP transfer (last Transfer on Reading). <name> can be :
diff --git a/src/XSDRAW/XSDRAW_Vars.cdl b/src/XSDRAW/XSDRAW_Vars.cdl
index 771860a080..a17c4d7089 100644
--- a/src/XSDRAW/XSDRAW_Vars.cdl
+++ b/src/XSDRAW/XSDRAW_Vars.cdl
@@ -25,7 +25,7 @@ uses CString, Transient,
 
 is
 
-    Create returns mutable Vars from XSDRAW;
+    Create returns Vars from XSDRAW;
 
     Set (me : mutable; name : CString; val : Transient)  is redefined;
 
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cdl b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cdl
index c810f60653..d8e1a9e65a 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cdl
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.cdl
@@ -36,7 +36,7 @@ uses
 
 is
 
-  Create ( aMesh : Mesh from StlMesh ) returns mutable DataSource from XSDRAWSTLVRML;
+  Create ( aMesh : Mesh from StlMesh ) returns DataSource from XSDRAWSTLVRML;
 	---Purpose: Constructor
 
   GetGeom ( me; ID     : Integer;
diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cdl b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cdl
index 6f4e115f12..e601a06f26 100644
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cdl
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DrawableMesh.cdl
@@ -21,7 +21,7 @@ uses
   Mesh    from MeshVS
 
 is
-    Create ( aMesh : Mesh from MeshVS ) returns mutable DrawableMesh from XSDRAWSTLVRML;
+    Create ( aMesh : Mesh from MeshVS ) returns DrawableMesh from XSDRAWSTLVRML;
     DrawOn(me; dis : in out Display) is redefined virtual;
 
     GetMesh( me ) returns Mesh;
diff --git a/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.cdl b/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.cdl
index 950a91610b..699243823e 100644
--- a/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.cdl
+++ b/src/XmlDrivers/XmlDrivers_DocumentRetrievalDriver.cdl
@@ -23,7 +23,7 @@ uses
     MessageDriver               from CDM
 
 is
-    Create returns mutable DocumentRetrievalDriver from XmlDrivers;
+    Create returns DocumentRetrievalDriver from XmlDrivers;
     -- Constructor
 
     AttributeDrivers	(me : mutable; theMsgDriver: MessageDriver from CDM)
diff --git a/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.cdl b/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.cdl
index 13f01cc145..ef7274e785 100644
--- a/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.cdl
+++ b/src/XmlDrivers/XmlDrivers_DocumentStorageDriver.cdl
@@ -23,7 +23,7 @@ uses
 
 is
     Create (theCopyright: ExtendedString from TCollection)
-    	returns mutable DocumentStorageDriver from XmlDrivers;
+    	returns DocumentStorageDriver from XmlDrivers;
     -- Constructor
 
     AttributeDrivers  (me : mutable; theMsgDriver: MessageDriver from CDM)
diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cdl b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cdl
index 4a44b8c615..53ea25c661 100644
--- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cdl
+++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cdl
@@ -29,7 +29,7 @@ uses
     MessageDriver               from CDM
 
 is
-    Create returns mutable DocumentRetrievalDriver from XmlLDrivers;
+    Create returns DocumentRetrievalDriver from XmlLDrivers;
     -- Constructor
 
     SchemaName		(me)
diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cdl b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cdl
index 9ac532d49b..ae6c94fb47 100644
--- a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cdl
+++ b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cdl
@@ -29,7 +29,7 @@ uses
 
 is
     Create (theCopyright: ExtendedString from TCollection)
-    	returns mutable DocumentStorageDriver from XmlLDrivers;
+    	returns DocumentStorageDriver from XmlLDrivers;
     -- Constructor
 
     SchemaName(me) returns ExtendedString from TCollection is redefined virtual;
diff --git a/src/XmlMDF/XmlMDF_ADriver.cdl b/src/XmlMDF/XmlMDF_ADriver.cdl
index d01f2a71ee..2862d2abde 100644
--- a/src/XmlMDF/XmlMDF_ADriver.cdl
+++ b/src/XmlMDF/XmlMDF_ADriver.cdl
@@ -38,7 +38,7 @@ is
         --          is available.
 
     NewEmpty    (me)
-        returns mutable Attribute from TDF
+        returns Attribute from TDF
         is deferred;
         ---Purpose: Creates a new attribute from TDF.
 
@@ -53,7 +53,7 @@ is
         ---Purpose: Returns the full XML tag name (including NS prefix)
 
     Paste       (me; aSource     : Persistent from XmlObjMgt;
-                     aTarget     : mutable Attribute from TDF;
+                     aTarget     : Attribute from TDF;
                      aRelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard
         is deferred;
diff --git a/src/XmlMDF/XmlMDF_ADriverTable.cdl b/src/XmlMDF/XmlMDF_ADriverTable.cdl
index 6a3fec708a..800548357f 100644
--- a/src/XmlMDF/XmlMDF_ADriverTable.cdl
+++ b/src/XmlMDF/XmlMDF_ADriverTable.cdl
@@ -28,7 +28,7 @@ uses
     TypeADriverMap     from XmlMDF
 
 is
-    Create returns mutable ADriverTable from XmlMDF;
+    Create returns ADriverTable from XmlMDF;
         ---Purpose: Creates a mutable ADriverTable from XmlMDF.
 
     AddDriver(me : mutable; anHDriver : ADriver from XmlMDF);
diff --git a/src/XmlMDF/XmlMDF_ReferenceDriver.cdl b/src/XmlMDF/XmlMDF_ReferenceDriver.cdl
index 8092572e8d..d062208f00 100644
--- a/src/XmlMDF/XmlMDF_ReferenceDriver.cdl
+++ b/src/XmlMDF/XmlMDF_ReferenceDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ReferenceDriver from XmlMDF;
+        returns ReferenceDriver from XmlMDF;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDF/XmlMDF_TagSourceDriver.cdl b/src/XmlMDF/XmlMDF_TagSourceDriver.cdl
index c1b28a6e5c..0b435eed86 100644
--- a/src/XmlMDF/XmlMDF_TagSourceDriver.cdl
+++ b/src/XmlMDF/XmlMDF_TagSourceDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver : MessageDriver from CDM)
-        returns mutable TagSourceDriver from XmlMDF;
+        returns TagSourceDriver from XmlMDF;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cdl b/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cdl
index eb94c5c95d..71cbe7027f 100644
--- a/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable AsciiStringDriver from XmlMDataStd;
+        returns AsciiStringDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
     ---Purpose: persistent -> transient (retrieve)
diff --git a/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cdl b/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cdl
index ad0d091db1..7dbf0e93bf 100644
--- a/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_BooleanArrayDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable BooleanArrayDriver from XmlMDataStd;
+    returns BooleanArrayDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cdl b/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cdl
index 8a639275f0..6548f42781 100644
--- a/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_BooleanListDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable BooleanListDriver from XmlMDataStd;
+    returns BooleanListDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cdl b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cdl
index 171aa72bf3..e9a79c5e05 100644
--- a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ByteArrayDriver from XmlMDataStd;
+    returns ByteArrayDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_CommentDriver.cdl b/src/XmlMDataStd/XmlMDataStd_CommentDriver.cdl
index 7d0a5920f3..179290b8c4 100644
--- a/src/XmlMDataStd/XmlMDataStd_CommentDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_CommentDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable CommentDriver from XmlMDataStd;
+        returns CommentDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cdl b/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cdl
index c1dc9d135b..565fca85a4 100644
--- a/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_DirectoryDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable DirectoryDriver from XmlMDataStd;
+        returns DirectoryDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cdl b/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cdl
index 1584b530c2..e1e66fa140 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_ExpressionDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ExpressionDriver from XmlMDataStd;
+        returns ExpressionDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cdl b/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cdl
index 0640efc8e8..fb0fef6204 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ExtStringArrayDriver from XmlMDataStd;
+        returns ExtStringArrayDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cdl b/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cdl
index bd64ee518b..36fc1fd372 100644
--- a/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_ExtStringListDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ExtStringListDriver from XmlMDataStd;
+    returns ExtStringListDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cdl b/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cdl
index 2334d51e59..6e3d4b1241 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cdl
@@ -27,12 +27,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable IntPackedMapDriver from XmlMDataStd;
+        returns IntPackedMapDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
     ---Purpose: persistent -> transient (retrieve)
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cdl b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cdl
index 6247fbeacd..69e77ebe4b 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable IntegerArrayDriver from XmlMDataStd;
+        returns IntegerArrayDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerDriver.cdl b/src/XmlMDataStd/XmlMDataStd_IntegerDriver.cdl
index ab360c9e44..202926a9b5 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable IntegerDriver from XmlMDataStd;
+        returns IntegerDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cdl b/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cdl
index d5f9f355b5..751f3cff49 100644
--- a/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_IntegerListDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable IntegerListDriver from XmlMDataStd;
+    returns IntegerListDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_NameDriver.cdl b/src/XmlMDataStd/XmlMDataStd_NameDriver.cdl
index 94a9013742..b058cae3a8 100644
--- a/src/XmlMDataStd/XmlMDataStd_NameDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_NameDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable NameDriver from XmlMDataStd;
+        returns NameDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cdl b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cdl
index d19c85e910..3674496e47 100644
--- a/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_NamedDataDriver.cdl
@@ -27,13 +27,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable  NamedDataDriver from XmlMDataStd;
+    returns  NamedDataDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cdl b/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cdl
index 24e1c53a72..c9a46e9a20 100644
--- a/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_NoteBookDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable NoteBookDriver from XmlMDataStd;
+        returns NoteBookDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cdl b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cdl
index 32f9f19371..05bd8d4e30 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable RealArrayDriver from XmlMDataStd;
+        returns RealArrayDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RealDriver.cdl b/src/XmlMDataStd/XmlMDataStd_RealDriver.cdl
index ea7859f013..f0bc7332e5 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_RealDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable RealDriver from XmlMDataStd;
+        returns RealDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RealListDriver.cdl b/src/XmlMDataStd/XmlMDataStd_RealListDriver.cdl
index 86173277d0..05ba46b115 100644
--- a/src/XmlMDataStd/XmlMDataStd_RealListDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_RealListDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable RealListDriver from XmlMDataStd;
+    returns RealListDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cdl b/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cdl
index d08be57d1c..78c8ffcb41 100644
--- a/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_ReferenceArrayDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ReferenceArrayDriver from XmlMDataStd;
+    returns ReferenceArrayDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cdl b/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cdl
index 7235f208ed..35d61f2be1 100644
--- a/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_ReferenceListDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create (theMessageDriver:MessageDriver from CDM)
-    returns mutable ReferenceListDriver from XmlMDataStd;
+    returns ReferenceListDriver from XmlMDataStd;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_RelationDriver.cdl b/src/XmlMDataStd/XmlMDataStd_RelationDriver.cdl
index d06697b504..31b83bf178 100644
--- a/src/XmlMDataStd/XmlMDataStd_RelationDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_RelationDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable RelationDriver from XmlMDataStd;
+        returns RelationDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_TickDriver.cdl b/src/XmlMDataStd/XmlMDataStd_TickDriver.cdl
index 23e4cd0368..06e858efc6 100644
--- a/src/XmlMDataStd/XmlMDataStd_TickDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_TickDriver.cdl
@@ -26,13 +26,13 @@ uses
 is
 
     Create(theMessageDriver:MessageDriver from CDM)
-    returns mutable TickDriver from XmlMDataStd;
+    returns TickDriver from XmlMDataStd;
 
     NewEmpty(me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cdl b/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cdl
index 95d3b6bfbd..e3e0bb0a55 100644
--- a/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable TreeNodeDriver from XmlMDataStd;
+        returns TreeNodeDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cdl b/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cdl
index 0c5b8f4b9a..6bbf76b79d 100644
--- a/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_UAttributeDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable UAttributeDriver from XmlMDataStd;
+        returns UAttributeDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataStd/XmlMDataStd_VariableDriver.cdl b/src/XmlMDataStd/XmlMDataStd_VariableDriver.cdl
index 72277b45be..7d72e7f053 100644
--- a/src/XmlMDataStd/XmlMDataStd_VariableDriver.cdl
+++ b/src/XmlMDataStd/XmlMDataStd_VariableDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable VariableDriver from XmlMDataStd;
+        returns VariableDriver from XmlMDataStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cdl b/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cdl
index adc7f50ee7..4802aee547 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cdl
+++ b/src/XmlMDataXtd/XmlMDataXtd_AxisDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable AxisDriver from XmlMDataXtd;
+        returns AxisDriver from XmlMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.cdl b/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.cdl
index 53b5be5395..855a7870be 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.cdl
+++ b/src/XmlMDataXtd/XmlMDataXtd_ConstraintDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ConstraintDriver from XmlMDataXtd;
+        returns ConstraintDriver from XmlMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cdl b/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cdl
index 77e2b9ebf7..d3ea7f6706 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cdl
+++ b/src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable GeometryDriver from XmlMDataXtd;
+        returns GeometryDriver from XmlMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.cdl b/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.cdl
index fc52d4c6af..e2075ae188 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.cdl
+++ b/src/XmlMDataXtd/XmlMDataXtd_PatternStdDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PatternStdDriver from XmlMDataXtd;
+        returns PatternStdDriver from XmlMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.cdl b/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.cdl
index bcde8d7976..dd7c1fa4ee 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.cdl
+++ b/src/XmlMDataXtd/XmlMDataXtd_PlacementDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PlacementDriver from XmlMDataXtd;
+        returns PlacementDriver from XmlMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cdl b/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cdl
index 218880b0cc..625a632c14 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cdl
+++ b/src/XmlMDataXtd/XmlMDataXtd_PlaneDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PlaneDriver from XmlMDataXtd;
+        returns PlaneDriver from XmlMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_PointDriver.cdl b/src/XmlMDataXtd/XmlMDataXtd_PointDriver.cdl
index ee70a7b4a4..e133d5f486 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_PointDriver.cdl
+++ b/src/XmlMDataXtd/XmlMDataXtd_PointDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PointDriver from XmlMDataXtd;
+        returns PointDriver from XmlMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cdl b/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cdl
index a4a0f428b4..c119adcec6 100644
--- a/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cdl
+++ b/src/XmlMDataXtd/XmlMDataXtd_ShapeDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ShapeDriver from XmlMDataXtd;
+        returns ShapeDriver from XmlMDataXtd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMDocStd/XmlMDocStd_XLinkDriver.cdl b/src/XmlMDocStd/XmlMDocStd_XLinkDriver.cdl
index bbb1368484..b84bea2b84 100644
--- a/src/XmlMDocStd/XmlMDocStd_XLinkDriver.cdl
+++ b/src/XmlMDocStd/XmlMDocStd_XLinkDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable XLinkDriver from XmlMDocStd;
+        returns XLinkDriver from XmlMDocStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMFunction/XmlMFunction_FunctionDriver.cdl b/src/XmlMFunction/XmlMFunction_FunctionDriver.cdl
index 1e06a23068..5e41203986 100644
--- a/src/XmlMFunction/XmlMFunction_FunctionDriver.cdl
+++ b/src/XmlMFunction/XmlMFunction_FunctionDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable FunctionDriver from XmlMFunction;
+        returns FunctionDriver from XmlMFunction;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMFunction/XmlMFunction_GraphNodeDriver.cdl b/src/XmlMFunction/XmlMFunction_GraphNodeDriver.cdl
index fa8e226870..d6a176d0ae 100644
--- a/src/XmlMFunction/XmlMFunction_GraphNodeDriver.cdl
+++ b/src/XmlMFunction/XmlMFunction_GraphNodeDriver.cdl
@@ -28,13 +28,13 @@ uses
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable GraphNodeDriver from XmlMFunction;
+    returns GraphNodeDriver from XmlMFunction;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMFunction/XmlMFunction_ScopeDriver.cdl b/src/XmlMFunction/XmlMFunction_ScopeDriver.cdl
index ae63523b4e..db8c862244 100644
--- a/src/XmlMFunction/XmlMFunction_ScopeDriver.cdl
+++ b/src/XmlMFunction/XmlMFunction_ScopeDriver.cdl
@@ -28,13 +28,13 @@ uses
 is
 
     Create (theMessageDriver : MessageDriver from CDM)
-    returns mutable ScopeDriver from XmlMFunction;
+    returns ScopeDriver from XmlMFunction;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard;
 
diff --git a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cdl b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cdl
index 01b33bb033..9248ce0eac 100644
--- a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cdl
+++ b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cdl
@@ -30,14 +30,14 @@ uses
 
 is
     Create (aMessageDriver: MessageDriver from CDM)
-        returns mutable NamedShapeDriver from XmlMNaming;
+        returns NamedShapeDriver from XmlMNaming;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
         is redefined;
 
     Paste(me; theSource     : Persistent from XmlObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard
         is redefined;
diff --git a/src/XmlMNaming/XmlMNaming_NamingDriver.cdl b/src/XmlMNaming/XmlMNaming_NamingDriver.cdl
index af28d1ed2a..f2b69c8f42 100644
--- a/src/XmlMNaming/XmlMNaming_NamingDriver.cdl
+++ b/src/XmlMNaming/XmlMNaming_NamingDriver.cdl
@@ -26,13 +26,13 @@ uses
 
 is
     Create (aMessageDriver: MessageDriver from CDM)
-        returns mutable NamingDriver from XmlMNaming;
+        returns NamingDriver from XmlMNaming;
 
     NewEmpty (me)
-    returns mutable Attribute from TDF;
+    returns Attribute from TDF;
 
     Paste(me; theSource     : Persistent from XmlObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cdl b/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cdl
index f1567b8bcc..540ec13d5b 100644
--- a/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cdl
+++ b/src/XmlMPrsStd/XmlMPrsStd_AISPresentationDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable AISPresentationDriver from XmlMPrsStd;
+        returns AISPresentationDriver from XmlMPrsStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cdl b/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cdl
index 91d1f4f8fd..ad3d76c61e 100644
--- a/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cdl
+++ b/src/XmlMPrsStd/XmlMPrsStd_PositionDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable PositionDriver from XmlMPrsStd;
+        returns PositionDriver from XmlMPrsStd;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cdl
index 59a773d546..c12334b3bc 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_AreaDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable AreaDriver from XmlMXCAFDoc;
+        returns AreaDriver from XmlMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.cdl
index 454902ba06..0e35d1e799 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_CentroidDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable CentroidDriver from XmlMXCAFDoc;
+        returns CentroidDriver from XmlMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cdl
index c005b0fcc2..498a5b5012 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable ColorDriver from XmlMXCAFDoc;
+        returns ColorDriver from XmlMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.cdl
index e53e9d44b1..3a2f0c9758 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ColorToolDriver.cdl
@@ -26,14 +26,14 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable ColorToolDriver from XmlMXCAFDoc;
+    returns ColorToolDriver from XmlMXCAFDoc;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from XmlObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard
     is redefined;
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cdl
index d1a7a29ec0..c2b9caf4b7 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DatumDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable DatumDriver from XmlMXCAFDoc;
+        returns DatumDriver from XmlMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cdl
index 880a8c2afa..c07f7bed0a 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable DimTolDriver from XmlMXCAFDoc;
+        returns DimTolDriver from XmlMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.cdl
index ee84771c47..f88d6e3583 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DimTolToolDriver.cdl
@@ -26,14 +26,14 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable DimTolToolDriver from XmlMXCAFDoc;
+    returns DimTolToolDriver from XmlMXCAFDoc;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from XmlObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard
     is redefined;
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.cdl
index 0073e31ac8..a483bc254c 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_DocumentToolDriver.cdl
@@ -26,14 +26,14 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable DocumentToolDriver from XmlMXCAFDoc;
+    returns DocumentToolDriver from XmlMXCAFDoc;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from XmlObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard
     is redefined;
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.cdl
index 9e30e0af5b..9ae63cc651 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_GraphNodeDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable GraphNodeDriver from XmlMXCAFDoc;
+        returns GraphNodeDriver from XmlMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.cdl
index bdd22962e9..db4c785e95 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_LayerToolDriver.cdl
@@ -26,14 +26,14 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable LayerToolDriver from XmlMXCAFDoc;
+    returns LayerToolDriver from XmlMXCAFDoc;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from XmlObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard
     is redefined;
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.cdl
index c844771b27..3b237b7817 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.cdl
@@ -30,17 +30,17 @@ uses    Location         from TopLoc,
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable LocationDriver from XmlMXCAFDoc;
+        returns LocationDriver from XmlMXCAFDoc;
 
 
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
 
 
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cdl
index f43f9f6962..7dda0c269a 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable MaterialDriver from XmlMXCAFDoc;
+        returns MaterialDriver from XmlMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.cdl
index 5b36d5e82b..00bdc55231 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_MaterialToolDriver.cdl
@@ -26,14 +26,14 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable MaterialToolDriver from XmlMXCAFDoc;
+    returns MaterialToolDriver from XmlMXCAFDoc;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from XmlObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard
     is redefined;
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.cdl
index 6534f26fe9..1e8aa9d19e 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_ShapeToolDriver.cdl
@@ -26,14 +26,14 @@ uses
 
 is
     Create (theMsgDriver:MessageDriver from CDM)
-    returns mutable ShapeToolDriver from XmlMXCAFDoc;
+    returns ShapeToolDriver from XmlMXCAFDoc;
 
     NewEmpty (me)  
-    returns mutable Attribute from TDF
+    returns Attribute from TDF
     is redefined;
 
     Paste(me; theSource     : Persistent from XmlObjMgt;
-              theTarget     : mutable Attribute from TDF;
+              theTarget     : Attribute from TDF;
               theRelocTable : out RRelocationTable from XmlObjMgt)
     returns Boolean from Standard
     is redefined;
diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cdl b/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cdl
index c50a83c76a..591b7f738a 100644
--- a/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cdl
+++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_VolumeDriver.cdl
@@ -26,12 +26,12 @@ uses
 
 is
     Create (theMessageDriver:MessageDriver from CDM)
-        returns mutable VolumeDriver from XmlMXCAFDoc;
+        returns VolumeDriver from XmlMXCAFDoc;
 
-    NewEmpty (me)  returns mutable Attribute from TDF;
+    NewEmpty (me)  returns Attribute from TDF;
 
     Paste(me; Source     : Persistent from XmlObjMgt;
-              Target     : mutable Attribute from TDF;
+              Target     : Attribute from TDF;
               RelocTable : out RRelocationTable from XmlObjMgt)
         returns Boolean from Standard;
 
diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.cdl b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.cdl
index 46c7306c4d..57f39070db 100644
--- a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.cdl
+++ b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentRetrievalDriver.cdl
@@ -23,7 +23,7 @@ uses
     MessageDriver from CDM
 
 is
-    Create returns mutable DocumentRetrievalDriver from XmlXCAFDrivers;    
+    Create returns DocumentRetrievalDriver from XmlXCAFDrivers;    
 
     AttributeDrivers(me : mutable; theMsgDriver: MessageDriver from CDM)
     returns ADriverTable from XmlMDF is redefined;
diff --git a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.cdl b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.cdl
index 15158e8dbe..76bce921af 100644
--- a/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.cdl
+++ b/src/XmlXCAFDrivers/XmlXCAFDrivers_DocumentStorageDriver.cdl
@@ -25,7 +25,7 @@ uses
 
 is
     Create (theCopyright: ExtendedString from TCollection)
-        returns mutable DocumentStorageDriver from XmlXCAFDrivers;
+        returns DocumentStorageDriver from XmlXCAFDrivers;
 
     AttributeDrivers(me : mutable; theMsgDriver: MessageDriver from CDM)
     returns ADriverTable from XmlMDF is redefined;