From 8fa1a15ed17177cee14e9eb24894ddfb29cb0a26 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Mon, 28 Feb 2011 14:50:50 +0000
Subject: [PATCH] Rename Engines::Component to Engines::EngineComponent

---
 doc/salome/kernel_services.dox                |  5 +-
 .../tui/KERNEL/HTML/SALOME_Component.html     |  6 +-
 .../tui/KERNEL/HTML/SALOME_ModuleCatalog.html |  2 +-
 .../tui/KERNEL/HTML/SALOME_Session.html       |  2 +-
 .../sources/static/examples_Kernel.html       |  2 +-
 .../sources/static/examples_Life_cycle.html   |  2 +-
 .../sources/static/examples_Naming.html       |  2 +-
 .../sources/static/overview_Kernel.html       |  8 +--
 .../sources/static/overview_Life_Cycle.html   |  2 +-
 .../tui/KERNEL/sources/static/tree.js.in      |  6 +-
 idl/DSC_Engines.idl                           |  2 +-
 idl/SALOME_Component.idl                      | 64 +++++++++--------
 idl/SALOME_Component.xml                      |  2 +-
 idl/SALOME_PACOExtension.idl                  |  6 +-
 idl/SALOME_Session.idl                        | 31 ++++-----
 idl/SALOME_TestComponent.idl                  | 11 ++-
 idl/SALOME_TestMPIComponent.idl               |  2 +-
 idl/SALOME_TestModuleCatalog.idl              |  7 +-
 src/Container/Container_i.cxx                 | 68 +++++++++----------
 src/Container/SALOME_ComponentPy.py           |  2 +-
 src/Container/SALOME_Component_i.hxx          |  2 +-
 src/Container/SALOME_Container_i.hxx          | 21 +++---
 src/DSC/ParallelDSC/ParallelDSC_i.cxx         |  4 +-
 src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx  | 63 ++++++++---------
 src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx  | 20 +++---
 .../Test/LifeCycleCORBATest.cxx               | 34 +++++-----
 src/LifeCycleCORBA/TestContainerManager.cxx   |  2 +-
 src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx    |  9 ++-
 .../libSALOME_LifeCycleCORBA.i                |  3 +-
 src/MPIContainer/MPIContainer_i.cxx           | 55 ++++++++-------
 src/MPIContainer/MPIContainer_i.hxx           | 17 +++--
 src/ModuleGenerator/README                    |  2 +-
 src/ModuleGenerator/tests/AddComponent.idl    | 11 ++-
 src/ModuleGenerator/tests/SubComponent.idl    |  5 +-
 .../SALOME_ParallelComponent_i.cxx            |  5 +-
 .../SALOME_ParallelContainerProxy_i.cxx       | 24 +++----
 .../SALOME_ParallelContainerProxy_i.hxx       | 20 +++---
 .../SALOME_ParallelContainer_i.cxx            | 56 ++++++++-------
 .../SALOME_ParallelContainer_i.hxx            | 22 +++---
 src/SALOMEDS/SALOMEDS_Driver_i.cxx            |  3 +-
 40 files changed, 289 insertions(+), 321 deletions(-)

diff --git a/doc/salome/kernel_services.dox b/doc/salome/kernel_services.dox
index 5e659cf58..5c1400e4f 100644
--- a/doc/salome/kernel_services.dox
+++ b/doc/salome/kernel_services.dox
@@ -174,7 +174,7 @@ See <a href="Batch.html/index.html"> Batch documentation </a> (in french only).
 
 -# <b>Containers and component life cycle, File transfer service</b>
    - Engines : engines CORBA module.                         
-   - Engines::Component : generic component interface. All %SALOME components inherit this interface.
+   - Engines::EngineComponent : generic component interface. All %SALOME components inherit this interface.
    - Engines::Container : host for C++ and Python components components instances                          
    - Engines::fileTransfer : agent for file transfer created by a container copy a local file to a distent client         
    - Engines::fileRef : reference to a file, used by a container for file transfers                                
@@ -202,7 +202,7 @@ See <a href="Batch.html/index.html"> Batch documentation </a> (in french only).
    .
 -# <b>Other idl for test purposes</b>
    - NSTEST : for naming service test
-   - SALOME_TestComponent.idl : for Component test
+   - SALOME_TestComponent.idl : for EngineComponent test
    - SALOME_TestModuleCatalog : for SALOME_ModuleCatalog test
    - SALOME_TestMPIComponent.idl : \copybrief SALOME_TestMPIComponent.idl
    - TestNotif.idl : \copybrief TestNotif.idl
@@ -321,4 +321,3 @@ AttributePersistentRef interface(creations/saving/restoring)\n
 SALOMEDS methods : FindOrCreateAttribute,  SaveAs, FindComponent FindAttribute Open\n
 Attribute methods : SetValue, Value
 */
-
diff --git a/doc/salome/tui/KERNEL/HTML/SALOME_Component.html b/doc/salome/tui/KERNEL/HTML/SALOME_Component.html
index 2d802860c..c08a8166c 100644
--- a/doc/salome/tui/KERNEL/HTML/SALOME_Component.html
+++ b/doc/salome/tui/KERNEL/HTML/SALOME_Component.html
@@ -11,11 +11,11 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = start_impl ( ContainerName )</b></div></td>
 </tr>
 <tr>
-<td bgcolor= "lightgreen"><div align="center"><b>Component  load_impl ( in string nameToRegister, in string componentName )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>EngineComponent  load_impl ( in string nameToRegister, in string componentName )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = load_impl ( nameToRegister, componentName )</b></div></td>
 </tr>
 <tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void remove_impl ( in Component component_i )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>void remove_impl ( in EngineComponent component_i )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>remove_impl ( component_i )</b></div></td>
 </tr>
 <tr>
@@ -41,7 +41,7 @@
 </table><br>
 <table width="100%" BORDER>
 <tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface Component</i></div></b></font></td>
+<td colspan="11"><font size="+3"><b><div align="center"><i>interface EngineComponent</i></div></b></font></td>
 </tr>
 <td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
 <td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
diff --git a/doc/salome/tui/KERNEL/HTML/SALOME_ModuleCatalog.html b/doc/salome/tui/KERNEL/HTML/SALOME_ModuleCatalog.html
index 5f618eb1a..856aacc1d 100644
--- a/doc/salome/tui/KERNEL/HTML/SALOME_ModuleCatalog.html
+++ b/doc/salome/tui/KERNEL/HTML/SALOME_ModuleCatalog.html
@@ -67,7 +67,7 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = GetComponent ( componentname )</b></div></td>
 </tr>
 <tr>
-<td bgcolor= "lightgreen"><div align="center"><b>Component  GetComponentInfo ( in string componentName )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>EngineComponent  GetComponentInfo ( in string componentName )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = GetComponentInfo ( componentName )</b></div></td>
 </tr>
 <tr>
diff --git a/doc/salome/tui/KERNEL/HTML/SALOME_Session.html b/doc/salome/tui/KERNEL/HTML/SALOME_Session.html
index 37b46747d..3420dc238 100644
--- a/doc/salome/tui/KERNEL/HTML/SALOME_Session.html
+++ b/doc/salome/tui/KERNEL/HTML/SALOME_Session.html
@@ -11,7 +11,7 @@
 <td bgcolor= "lightgreen"><div align="center"><b>GetInterface (  )</b></div></td>
 </tr>
 <tr>
-<td bgcolor= "lightgreen"><div align="center"><b>Component  GetVisuComponent (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>EngineComponent  GetVisuComponent (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = GetVisuComponent (  )</b></div></td>
 </tr>
 <tr>
diff --git a/doc/salome/tui/KERNEL/sources/static/examples_Kernel.html b/doc/salome/tui/KERNEL/sources/static/examples_Kernel.html
index beb74ae4f..c9da77e75 100755
--- a/doc/salome/tui/KERNEL/sources/static/examples_Kernel.html
+++ b/doc/salome/tui/KERNEL/sources/static/examples_Kernel.html
@@ -84,7 +84,7 @@ interface</b></font></big></big></u><br>
 <br>
 <br>
 <div align="left"><big><b><a class="el"
- href="interfaceEngines_1_1Component.html">Component</a>
+ href="interfaceEngines_1_1EngineComponent.html">EngineComponent</a>
 load_impl  (in string <i>nameToRegister</i>, in string <i>componentName</i>)</b></big><br>
 <br>
 <i><u><a name="load_com_ex"></a>Load component with defined component name:</u></i><br>
diff --git a/doc/salome/tui/KERNEL/sources/static/examples_Life_cycle.html b/doc/salome/tui/KERNEL/sources/static/examples_Life_cycle.html
index 080112eb4..db2064945 100755
--- a/doc/salome/tui/KERNEL/sources/static/examples_Life_cycle.html
+++ b/doc/salome/tui/KERNEL/sources/static/examples_Life_cycle.html
@@ -55,7 +55,7 @@ to the root POA<br>
 <br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; SALOME_LifeCycleCORBA _LCC(&amp;_NS) ;<br>
 <br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Engines::Component_var myComponent = _LCC.FindOrLoad_Component("FactoryServerPy","TestComponentPy");<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Engines::EngineComponent_var myComponent = _LCC.FindOrLoad_Component("FactoryServerPy","TestComponentPy");<br>
 &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; if(!CORBA::is_nil(myComponent)){<br>
 &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Engines::TestComponent_var
 myConcreateComponent = TestComponent::_narrow(myComponent);<br>
diff --git a/doc/salome/tui/KERNEL/sources/static/examples_Naming.html b/doc/salome/tui/KERNEL/sources/static/examples_Naming.html
index ac08a6753..4a495024e 100755
--- a/doc/salome/tui/KERNEL/sources/static/examples_Naming.html
+++ b/doc/salome/tui/KERNEL/sources/static/examples_Naming.html
@@ -59,7 +59,7 @@ myLocalVisu = myLifeCycleCORBA.FindOrLoadComponent("FactoryServer", "Visu")<br>
 SALOME_NamingService aNamingService(orb);<br>
 CORBA::Object_ptr anObject = aNamingService.Resolve("/Kernel/Session");<br>
 SALOME::Session_var aSession = SALOME::Session::_narrow(anObject);<br>
-Engines::Component_var aComponent = aSession-&gt;GetVisuGen();<br>
+Engines::EngineComponent_var aComponent = aSession-&gt;GetVisuGen();<br>
 myVisuGen = VISU::VISU_Gen::_narrow(aComponent);<br>
 <br>
 </body>
diff --git a/doc/salome/tui/KERNEL/sources/static/overview_Kernel.html b/doc/salome/tui/KERNEL/sources/static/overview_Kernel.html
index 7f64f4369..9351696cf 100755
--- a/doc/salome/tui/KERNEL/sources/static/overview_Kernel.html
+++ b/doc/salome/tui/KERNEL/sources/static/overview_Kernel.html
@@ -38,7 +38,7 @@
 		<li><a href="#3_6">3.6 Resource catalog  </a></li>
 		<li><a href="#3_7">3.7 Engine  </a></li>
 			<ul>
-			<li><a href="#3_7_1">3.7.1 Component class  </a></li>
+			<li><a href="#3_7_1">3.7.1 EngineComponent class  </a></li>
 			<li><a href="#3_7_2">3.7.2 Container class  </a></li>
 			</ul>
 		</ul>
@@ -174,13 +174,13 @@ name. The container dynamically resolves  an extern_C function in the library,
 which constructs the CORBA Engine servant object.</p>
 <p>The SALOME engine in
  the current version of the application is implemented 
-  as <b>Engines</b> package of interfaces. It encapsulates two classes: Component, Container.</p> 
+  as <b>Engines</b> package of interfaces. It encapsulates two classes: EngineComponent, Container.</p> 
 <p>The API refernce for <b>Engines</b> package can be found <a href="namespaceEngines.html">here</a>. 
 </p>
-<a name="3_7_1"></a><h4>3.7.1 Component class</h4> 
+<a name="3_7_1"></a><h4>3.7.1 EngineComponent class</h4> 
 <p>This class is used for interaction between the container and the component and between the components inside the container. 
 </p> 
-<p>The API reference for this class can be found <a href="interfaceEngines_1_1Component.html">here</a>.</p>
+<p>The API reference for this class can be found <a href="interfaceEngines_1_1EngineComponent.html">here</a>.</p>
 
 <a name="3_7_2"></a><h4>3.7.2 Container class</h4> 
 <p>This class provides a set of methods which are necessary for definition of the process of loading and registration of new components in SALOME application.</p> 
diff --git a/doc/salome/tui/KERNEL/sources/static/overview_Life_Cycle.html b/doc/salome/tui/KERNEL/sources/static/overview_Life_Cycle.html
index f1a1fb8af..41f3e8df6 100755
--- a/doc/salome/tui/KERNEL/sources/static/overview_Life_Cycle.html
+++ b/doc/salome/tui/KERNEL/sources/static/overview_Life_Cycle.html
@@ -51,7 +51,7 @@ life cycle operations on objects in different locations. This overview describes
 <p>From general point of view, the SALOME  Life Cycle service allows to <i>find</i> or <i>load</i> with the help of a given container a definte SALOME component with its further
 initialization and registration in the Naming service.</p>
 <p><b>Container</b>  - it's a certain engine realizing the mechanism of loading a SALOME module.</p>
-  <p><b>Component</b> - it's a certain abstract shell wrapping SALOME modules, performing all operations concerned with their initialization and registration. </p>
+  <p><b>EngineComponent</b> - it's a certain abstract shell wrapping SALOME modules, performing all operations concerned with their initialization and registration. </p>
 <p>From the point of view of the service user, the Life Cycle provides a set of functions allowing to :</p>
 <ul>
 <li>Locate a machine (more generally a container) by a logical set of required features (of both container and
diff --git a/doc/salome/tui/KERNEL/sources/static/tree.js.in b/doc/salome/tui/KERNEL/sources/static/tree.js.in
index b7422d7b8..48cde6cdd 100755
--- a/doc/salome/tui/KERNEL/sources/static/tree.js.in
+++ b/doc/salome/tui/KERNEL/sources/static/tree.js.in
@@ -55,7 +55,7 @@ aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
        insDoc(aux1, gLnk("SALOMEDS::Callback", "", "interfaceSALOMEDS_1_1Callback.html"))
        insDoc(aux1, gLnk("SALOMEDS::ChildIterator", "", "interfaceSALOMEDS_1_1ChildIterator.html"))
        insDoc(aux1, gLnk("SALOMEDS::Color", "", "structSALOMEDS_1_1Color.html"))
-       insDoc(aux1, gLnk("Engines::Component", "", "interfaceEngines_1_1Component.html"))
+       insDoc(aux1, gLnk("Engines::EngineComponent", "", "interfaceEngines_1_1EngineComponent.html"))
        insDoc(aux1, gLnk("Engines::Container", "", "interfaceEngines_1_1Container.html"))
        insDoc(aux1, gLnk("SALOME_ModuleCatalog::DefinitionInterface", "", "structSALOME__ModuleCatalog_1_1DefinitionInterface.html"))
        insDoc(aux1, gLnk("SALOMEDS::Driver", "", "interfaceSALOMEDS_1_1Driver.html"))
@@ -102,7 +102,7 @@ aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
        insDoc(aux1, gLnk("SALOMEDS::Callback", "", "interfaceSALOMEDS_1_1Callback.html"))
        insDoc(aux1, gLnk("SALOMEDS::ChildIterator", "", "interfaceSALOMEDS_1_1ChildIterator.html"))
        insDoc(aux1, gLnk("SALOMEDS::Color", "", "structSALOMEDS_1_1Color.html"))
-  aux2 = insFld(aux1, gFld("Engines::Component", "", "interfaceEngines_1_1Component.html"))
+  aux2 = insFld(aux1, gFld("Engines::EngineComponent", "", "interfaceEngines_1_1EngineComponent.html"))
        insDoc(aux1, gLnk("Engines::Container", "", "interfaceEngines_1_1Container.html"))
        insDoc(aux1, gLnk("SALOME_ModuleCatalog::DefinitionInterface", "", "structSALOME__ModuleCatalog_1_1DefinitionInterface.html"))
   aux2 = insFld(aux1, gFld("SALOMEDS::Driver", "", "interfaceSALOMEDS_1_1Driver.html"))
@@ -196,5 +196,3 @@ aux1 = insFld(foldersTree, gFld("Life Cycle", ""))
          insDoc(aux1, gLnk("Life Cycle Service Description ", "", "overview_Life_Cycle.html"))
          insDoc(aux1, gLnk("Salome_LifeCycleCorba Class Reference", "", "classSALOME__LifeCycleCORBA.html"))
          insDoc(aux1, gLnk("Examples", "", "examples_Life_cycle.html"))
-
-
diff --git a/idl/DSC_Engines.idl b/idl/DSC_Engines.idl
index 5b0c31c44..32e4c3b7f 100644
--- a/idl/DSC_Engines.idl
+++ b/idl/DSC_Engines.idl
@@ -58,7 +58,7 @@ module Engines {
     - First part permits to add an get ports of a component.
     - Second part permits to connect/disconnect ports.
   */
-  interface DSC : Engines::Component {
+  interface DSC : Engines::EngineComponent {
 
 /*--------------------------------------------------------------------------------------------*/
 /*-------------------------------------- Types Part ------------------------------------------*/
diff --git a/idl/SALOME_Component.idl b/idl/SALOME_Component.idl
index a8b862ebf..b013be987 100644
--- a/idl/SALOME_Component.idl
+++ b/idl/SALOME_Component.idl
@@ -19,11 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  File   : SALOME_Component.idl
 //  Author : Paul RASCLE, EDF
-//  $Header: 
-//
+
 #ifndef _SALOME_COMPONENT_IDL_
 #define _SALOME_COMPONENT_IDL_
 
@@ -31,7 +29,7 @@
 #include "SALOME_Exception.idl"
 #include "SALOME_PyNode.idl"
 
-/*! \file SALOME_Component.idl \brief interfaces for Component and Container
+/*! \file SALOME_Component.idl \brief interfaces for EngineComponent and Container
 */
 
 /*! \brief
@@ -62,7 +60,7 @@ module Engines
 
   typedef sequence<KeyValuePair> FieldsDict;
 
-  interface Component ;
+  interface EngineComponent ;
   interface fileRef ;
   interface fileTransfer ;
   interface Salome_file;
@@ -95,8 +93,8 @@ module Engines
                             >0 otherwise (== study id)
       \return a loaded component
     */
-    Engines::Component create_component_instance(in string componentName,
-                                                 in long studyId);
+    Engines::EngineComponent create_component_instance(in string componentName,
+                                                       in long studyId);
 
     //! Create a new servant instance of a component with environment variables specified.
     /*!
@@ -110,9 +108,9 @@ module Engines
       \param reason      in case of error (return nil) a string explaining the error
       \return a loaded component
     */
-    Engines::Component create_component_instance_env(in string componentName,
-                                                     in long studyId, in FieldsDict env,
-                                                     out string reason);
+    Engines::EngineComponent create_component_instance_env(in string componentName,
+                                                           in long studyId, in FieldsDict env,
+                                                           out string reason);
     //! Find a servant instance of a component
     /*!
       \param registeredName  Name of the component in Registry or Name Service,
@@ -121,8 +119,8 @@ module Engines
                             >0 otherwise (== study id)
       \return the first instance found with same studyId
     */
-    Component find_component_instance(in string registeredName,
-				      in long studyId);
+    EngineComponent find_component_instance(in string registeredName,
+                                            in long studyId);
 
     //! Find a servant instance of a component, or create a new one.
     /*!
@@ -134,14 +132,14 @@ module Engines
                             (not used any more, give empty string)
       \return a loaded component
     */
-    Component load_impl(in string nameToRegister,
-			in string componentName);
+    EngineComponent load_impl(in string nameToRegister,
+                              in string componentName);
 
     //! Remove the component servant, and deletes all related objects
     /*!
       \param component_i     Component to be removed
     */
-    void remove_impl(in Component component_i);
+    void remove_impl(in EngineComponent component_i);
 
     //!  Unload component libraries from the container. 
     void finalize_removal() ;
@@ -230,7 +228,7 @@ module Engines
   This interface is used for interaction between the %container and the
   %component and between the components inside the container.
   */
-  interface Component
+  interface EngineComponent
   {
     //!  The name of the instance of the %Component
     readonly attribute string instanceName ;
@@ -324,8 +322,8 @@ module Engines
       the data model of component
     */    
     TMPFile DumpPython(in Object theStudy,
-		       in boolean isPublished, 
-		       out boolean isValidScript);
+                       in boolean isPublished, 
+                       out boolean isValidScript);
 
     
     //! Returns a CORBA Ref of a input Salome_file managed by a service.
@@ -340,7 +338,7 @@ module Engines
       sends the file's reference.
     */
     Engines::Salome_file getInputFileToService(in string service_name, 
-					       in string Salome_file_name)	 raises(SALOME::SALOME_Exception);
+                                               in string Salome_file_name) raises(SALOME::SALOME_Exception);
 
     //! Check service input files (transfer them if needed) 
     /*!
@@ -358,7 +356,7 @@ module Engines
 
       \exception contains informations about files that are not in a good state.
     */
-    void checkInputFilesToService(in string service_name)				raises(SALOME::SALOME_Exception);
+    void checkInputFilesToService(in string service_name)           raises(SALOME::SALOME_Exception);
 
     //!  This method adds a input Salome_file to a service of the component.
     /*!
@@ -372,7 +370,7 @@ module Engines
       a Salome_file with this name for the service.
     */
     Engines::Salome_file setInputFileToService(in string service_name,
-					       in string Salome_file_name)	raises(SALOME::SALOME_Exception);
+                                               in string Salome_file_name)   raises(SALOME::SALOME_Exception);
 
     //!  Returns a CORBA Ref of a output Salome_file managed by a service.
     /*!
@@ -386,7 +384,7 @@ module Engines
       sends the file's reference.
     */
     Engines::Salome_file getOutputFileToService(in string service_name, 
-						in string Salome_file_name) raises(SALOME::SALOME_Exception);
+                                                in string Salome_file_name) raises(SALOME::SALOME_Exception);
 
     //! Check service output files (transfer them if needed) 
     /*!
@@ -404,7 +402,7 @@ module Engines
 
       \exception contains informations about files that are not in a good state.
     */
-    void checkOutputFilesToService(in string service_name)			 raises(SALOME::SALOME_Exception);
+    void checkOutputFilesToService(in string service_name)        raises(SALOME::SALOME_Exception);
 
     //!  This method adds an output Salome_file to a service of the component.
     /*!
@@ -418,7 +416,7 @@ module Engines
       a Salome_file with this name for the service.
     */
     Engines::Salome_file setOutputFileToService(in string service_name,
-						in string Salome_file_name)	 raises(SALOME::SALOME_Exception);
+                                                in string Salome_file_name)  raises(SALOME::SALOME_Exception);
 
     //! Indicate if the component instance provides custom information about its objects.
     /*!
@@ -537,7 +535,7 @@ module Engines
 
       \exception contains informations of errors if the loading doesn't succeed.
      */
-    void load(in string hdf5_file)			    raises (SALOME::SALOME_Exception);
+    void load(in string hdf5_file)                            raises (SALOME::SALOME_Exception);
 
     //!  Save a Salome_file into a hdf5_file.
     /*!
@@ -547,7 +545,7 @@ module Engines
       \exception contains informations of errors if the save doesn't succeed.
 
     */
-    void save(in string hdf5_file)			    raises (SALOME::SALOME_Exception);
+    void save(in string hdf5_file)                            raises (SALOME::SALOME_Exception);
 
     //!  Save a Salome_file into a hdf5_file. 
     /*!
@@ -558,7 +556,7 @@ module Engines
       \exception contains informations of errors if the save doesn't succeed.
 
     */
-    void save_all(in string hdf5_file)			    raises (SALOME::SALOME_Exception);
+    void save_all(in string hdf5_file)                            raises (SALOME::SALOME_Exception);
 
 /**************/
 
@@ -599,7 +597,7 @@ module Engines
       \exception raised if the file doesn't exist.
     */
     void connectDistributedFile(in string file_name,
-				in Engines::Salome_file source_Salome_file) raises (SALOME::SALOME_Exception);
+                                in Engines::Salome_file source_Salome_file) raises (SALOME::SALOME_Exception);
     
     //!  Connect the file_name with a Distributed file_name.
     /*!
@@ -610,7 +608,7 @@ module Engines
       \exception raised if the file doesn't exist.
     */
     void setDistributedSourceFile(in string file_name,
-				  in string source_file_name) raises (SALOME::SALOME_Exception);
+                                  in string source_file_name) raises (SALOME::SALOME_Exception);
 
 /**************/
 
@@ -619,7 +617,7 @@ module Engines
 
       \exception raised if some of the files are not ok.
     */
-    void recvFiles()					    raises (SALOME::SALOME_Exception) ;
+    void recvFiles()                                            raises (SALOME::SALOME_Exception) ;
 
 /**************/
 
@@ -630,7 +628,7 @@ module Engines
 
       \exception raised if the file doesn't exist.
     */
-    void removeFile(in string file_name)		    raises (SALOME::SALOME_Exception);
+    void removeFile(in string file_name)                    raises (SALOME::SALOME_Exception);
 
     //!  Remove all the files of the Salome_file.
     void removeFiles();
@@ -652,7 +650,7 @@ module Engines
 
       \exception raised if the file doesn't exist.
     */
-    Engines::file  getFileInfos(in string file_name)	    raises (SALOME::SALOME_Exception);
+    Engines::file  getFileInfos(in string file_name) raises (SALOME::SALOME_Exception);
 
     //!  Return the state of the Salome_file.
     Engines::SfState getSalome_fileState();
@@ -693,7 +691,7 @@ module Engines
     Container getContainer();
 
     boolean addRef(in string machine,
-		in string fileName);
+                   in string fileName);
 
     string getRef(in string machine);
   };
diff --git a/idl/SALOME_Component.xml b/idl/SALOME_Component.xml
index 424992ceb..f055d13c4 100644
--- a/idl/SALOME_Component.xml
+++ b/idl/SALOME_Component.xml
@@ -35,7 +35,7 @@
   </Method>
  </Interface>
  <Interface>
-  <Name>Component</Name>
+  <Name>EngineComponent</Name>
   <Method>
    <Name>ping</Name>
    <Type>distributed</Type>
diff --git a/idl/SALOME_PACOExtension.idl b/idl/SALOME_PACOExtension.idl
index c8be9765b..1107f963e 100644
--- a/idl/SALOME_PACOExtension.idl
+++ b/idl/SALOME_PACOExtension.idl
@@ -16,11 +16,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  File   : SALOME_PACOExtension.idl
 //  Author : André RIBES, EDF
-//  $Header: 
-//
+
 #ifndef _SALOME_PACOExtension_IDL_
 #define _SALOME_PACOExtension_IDL_
 
@@ -33,7 +31,7 @@
 
 module Engines
 {
-  interface Parallel_Component : Engines::Component {
+  interface Parallel_Component : Engines::EngineComponent {
     void send_parallel_proxy_object(in Object proxy_ref);
   };
 
diff --git a/idl/SALOME_Session.idl b/idl/SALOME_Session.idl
index efa4e4126..105df3818 100644
--- a/idl/SALOME_Session.idl
+++ b/idl/SALOME_Session.idl
@@ -19,11 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  File   : SALOME_Session.idl
 //  Author : Paul RASCLE, EDF
-//  $Header$
-//
+
 #include "SALOME_Component.idl"
 
 /*! \file SALOME_Session.idl \brief file that contains interface of the session
@@ -32,32 +30,31 @@
 module SALOME
 {
 /*! \brief State of the session
-   
+
    This enumeration contains values defining the state of the session
-  
-*/ 
+
+*/
   enum SessionState {asleep, /*!< Session is inactive */
-		     running /*!< Session is running */
+                     running /*!< Session is running */
   } ;
 
 /*! \brief %Session State and Statistics
 
-
-    This struct contains a field list with general information about the session 
+    This struct contains a field list with general information about the session
 */
-   
+
   struct StatSession
   {
 /*! \brief State of the session
-  
+
    It can be:
         -# asleep  : no running study
         -# running : one or more running studies
 */
-    SessionState state ; 
-//! Number of running studies
+    SessionState state ;
+    //! Number of running studies
     short        runningStudies ;
-//! It is True if GUI is active in the session
+    //! It is True if GUI is active in the session
     boolean      activeGUI ;
   } ;
 
@@ -72,13 +69,13 @@ module SALOME
 //!  This exception is raised when trying to stop the %session with active GUI
     exception GUIActive {} ;
 //!  This exception is raised when trying to stop the %session with a number of running studies.
-    exception RunningStudies {} ;  
+    exception RunningStudies {} ;
 
 //!  Launches GUI in the session
-    void GetInterface(); 
+    void GetInterface();
 
 //!  Returns a standalone component
-    Engines::Component GetComponent(in string theLibraryName);
+    Engines::EngineComponent GetComponent(in string theLibraryName);
 
 //!  Stops the %Session (It must be idle)
     void StopSession() raises(GUIActive, RunningStudies) ;
diff --git a/idl/SALOME_TestComponent.idl b/idl/SALOME_TestComponent.idl
index ab0801e45..5726511b6 100644
--- a/idl/SALOME_TestComponent.idl
+++ b/idl/SALOME_TestComponent.idl
@@ -19,26 +19,23 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  File   : SALOME_TestComponent.idl
 //  Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
-//  $Header$
-//
+
 #include "SALOME_Component.idl"
 
-/*! \file SALOME_TestComponent.idl \brief an interface for testing Component and Container
+/*! \file SALOME_TestComponent.idl \brief an interface for testing EngineComponent and Container
 */
 
 module Engines
 {
-  
+
 /*! \brief a component with 2 operations (Coucou and Setenv)
 */
-  interface TestComponent : Component
+  interface TestComponent : EngineComponent
   {
     string Coucou(in long L);
     void Setenv();
   };
 
 };
-
diff --git a/idl/SALOME_TestMPIComponent.idl b/idl/SALOME_TestMPIComponent.idl
index a684c5f34..703fadbca 100644
--- a/idl/SALOME_TestMPIComponent.idl
+++ b/idl/SALOME_TestMPIComponent.idl
@@ -37,7 +37,7 @@
 module Engines
 {
   
-  interface TestMPIComponent : Component, MPIObject
+  interface TestMPIComponent : EngineComponent, MPIObject
   {
     // version synchrone (process 0)
     void Coucou(in long L);
diff --git a/idl/SALOME_TestModuleCatalog.idl b/idl/SALOME_TestModuleCatalog.idl
index d36391c55..1495c91b8 100644
--- a/idl/SALOME_TestModuleCatalog.idl
+++ b/idl/SALOME_TestModuleCatalog.idl
@@ -19,10 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  File   : SALOME_TestModuleCatalog.idl
 //  Author : 
-//
+
 #ifndef _TestModuleCatalog_IDL
 #define _TestModuleCatalog_IDL
 
@@ -38,7 +37,7 @@ module SALOME_TestModuleCatalog {
 
   interface Adder ;
 
-  interface AddComponent : Engines::Component {
+  interface AddComponent : Engines::EngineComponent {
 
 // DataStreamPorts Addition istream(INTEGER, in, T), ostream(STRING, out, I)
 // DataStreamPorts Addition Ostream(FLOAT, out, T)
@@ -48,7 +47,7 @@ module SALOME_TestModuleCatalog {
     double LastResult() ;
   };
 
-  interface Adder : Engines::Component {
+  interface Adder : Engines::EngineComponent {
     double Add( in double x , in double y , out double z ) ;
     double AddAndCompare( in double x , in double y , in Adder anOtherAdder,
                           out double z ) ;
diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx
index ae0d32362..ede21c68a 100644
--- a/src/Container/Container_i.cxx
+++ b/src/Container/Container_i.cxx
@@ -334,7 +334,7 @@ void Engines_Container_i::Shutdown()
   /* For each component contained in this container
   * tell it to self-destroy
   */
-  std::map<std::string, Engines::Component_var>::iterator itm;
+  std::map<std::string, Engines::EngineComponent_var>::iterator itm;
   for (itm = _listInstances_map.begin(); itm != _listInstances_map.end(); itm++)
     {
       try
@@ -644,13 +644,14 @@ Engines_Container_i::load_component_ExecutableImplementation(const char* compone
 *  \return a loaded component
 */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Container_i::create_component_instance(const char*genericRegisterName,
                                                CORBA::Long studyId)
 {
   Engines::FieldsDict_var env = new Engines::FieldsDict;
   char* reason;
-  Engines::Component_ptr compo = create_component_instance_env(genericRegisterName, studyId, env, reason);
+  Engines::EngineComponent_ptr compo =
+    create_component_instance_env(genericRegisterName, studyId, env, reason);
   CORBA::string_free(reason);
   return compo;
 }
@@ -669,7 +670,7 @@ Engines_Container_i::create_component_instance(const char*genericRegisterName,
 *  \return a loaded component
 */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Container_i::create_component_instance_env(const char*genericRegisterName,
                                                    CORBA::Long studyId,
                                                    const Engines::FieldsDict& env,
@@ -679,14 +680,14 @@ Engines_Container_i::create_component_instance_env(const char*genericRegisterNam
     {
       INFOS("studyId must be > 0 for mono study instance, =0 for multiStudy");
       reason=CORBA::string_dup("studyId must be > 0 for mono study instance, =0 for multiStudy");
-      return Engines::Component::_nil() ;
+      return Engines::EngineComponent::_nil() ;
     }
 
   std::string error;
   if (_library_map.count(genericRegisterName) != 0)
     {
       // It's a Python component
-      Engines::Component_ptr compo = createPythonInstance(genericRegisterName, studyId, error);
+      Engines::EngineComponent_ptr compo = createPythonInstance(genericRegisterName, studyId, error);
       reason=CORBA::string_dup(error.c_str());
       return compo;
     }
@@ -696,7 +697,7 @@ Engines_Container_i::create_component_instance_env(const char*genericRegisterNam
     {
       // It's a C++ component
       void* handle = _library_map[impl_name];
-      Engines::Component_ptr compo = createInstance(genericRegisterName, handle, studyId, error);
+      Engines::EngineComponent_ptr compo = createInstance(genericRegisterName, handle, studyId, error);
       reason=CORBA::string_dup(error.c_str());
       return compo;
     }
@@ -705,7 +706,7 @@ Engines_Container_i::create_component_instance_env(const char*genericRegisterNam
   if (_library_map.count(impl_name) != 0)
     {
       //It's an executable component
-      Engines::Component_ptr compo = createExecutableInstance(genericRegisterName, studyId, env, error);
+      Engines::EngineComponent_ptr compo = createExecutableInstance(genericRegisterName, studyId, env, error);
       reason=CORBA::string_dup(error.c_str());
       return compo;
     }
@@ -714,7 +715,7 @@ Engines_Container_i::create_component_instance_env(const char*genericRegisterNam
   error += genericRegisterName;
   INFOS(error);
   reason=CORBA::string_dup(error.c_str());
-  return Engines::Component::_nil() ;
+  return Engines::EngineComponent::_nil() ;
 }
 
 //=============================================================================
@@ -732,12 +733,12 @@ Engines_Container_i::create_component_instance_env(const char*genericRegisterNam
 *   it's registration.
 */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Container_i::createExecutableInstance(std::string CompName, int studyId,
                                               const Engines::FieldsDict& env,
                                               std::string& reason)
 {
-  Engines::Component_var iobject = Engines::Component::_nil() ;
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil() ;
 
   _numInstanceMutex.lock() ; // lock on the instance number
   _numInstance++ ;
@@ -825,14 +826,14 @@ Engines_Container_i::createExecutableInstance(std::string CompName, int studyId,
   {
     reason="SALOME_Container::create_component_instance system failed (system command status -1)";
     MESSAGE(reason);
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
   }
 #ifndef WIN32
   else if (WEXITSTATUS(status) == 217)
   {
     reason="SALOME_Container::create_component_instance system failed (system command status 217)";
     MESSAGE(reason);
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
   }
 #endif
   else
@@ -855,12 +856,12 @@ Engines_Container_i::createExecutableInstance(std::string CompName, int studyId,
     {
       reason="SALOME_Container::create_component_instance failed";
       MESSAGE(reason);
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
     else
     {
       MESSAGE("SALOME_Container::create_component_instance successful");
-      iobject=Engines::Component::_narrow(obj);
+      iobject = Engines::EngineComponent::_narrow(obj);
       _listInstances_map[instanceName] = iobject;
       return iobject._retn();
     }
@@ -878,11 +879,11 @@ Engines_Container_i::createExecutableInstance(std::string CompName, int studyId,
 *  \return a loaded component
 */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Container_i::createPythonInstance(std::string CompName, int studyId,
                                           std::string& reason)
 {
-  Engines::Component_var iobject = Engines::Component::_nil() ;
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil() ;
 
   _numInstanceMutex.lock() ; // lock on the instance number
   _numInstance++ ;
@@ -912,7 +913,7 @@ Engines_Container_i::createPythonInstance(std::string CompName, int studyId,
   if( iors!="" )
     {
       CORBA::Object_var obj = _orb->string_to_object(iors.c_str());
-      iobject = Engines::Component::_narrow( obj ) ;
+      iobject = Engines::EngineComponent::_narrow( obj ) ;
       _listInstances_map[instanceName] = iobject;
     }
   return iobject._retn();
@@ -940,7 +941,7 @@ Engines_Container_i::createPythonInstance(std::string CompName, int studyId,
 *    - component_registerName = /Containers/cli76ce/FactoryServer/COMPONENT_inst_1
 */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Container_i::createInstance(std::string genericRegisterName,
                                     void *handle,
                                     int studyId,
@@ -971,12 +972,12 @@ Engines_Container_i::createInstance(std::string genericRegisterName,
     reason=dlerror();
     INFOS(reason);
 #endif
-    return Engines::Component::_nil() ;
+    return Engines::EngineComponent::_nil() ;
   }
 
   // --- create instance
 
-  Engines::Component_var iobject = Engines::Component::_nil() ;
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil() ;
 
   try
   {
@@ -1006,7 +1007,7 @@ Engines_Container_i::createInstance(std::string genericRegisterName,
     // --- get reference & servant from id
 
     CORBA::Object_var obj = _poa->id_to_reference(*id);
-    iobject = Engines::Component::_narrow( obj ) ;
+    iobject = Engines::EngineComponent::_narrow( obj ) ;
 
     Engines_Component_i *servant =
       dynamic_cast<Engines_Component_i*>(_poa->reference_to_servant(iobject));
@@ -1047,12 +1048,12 @@ Engines_Container_i::createInstance(std::string genericRegisterName,
 *  \return the first instance found with same studyId
 */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Container_i::find_component_instance( const char* registeredName,
                                               CORBA::Long studyId)
 {
-  Engines::Component_var anEngine = Engines::Component::_nil();
-  std::map<std::string,Engines::Component_var>::iterator itm =_listInstances_map.begin();
+  Engines::EngineComponent_var anEngine = Engines::EngineComponent::_nil();
+  std::map<std::string,Engines::EngineComponent_var>::iterator itm =_listInstances_map.begin();
   while (itm != _listInstances_map.end())
   {
     std::string instance = (*itm).first;
@@ -1078,7 +1079,7 @@ Engines_Container_i::find_component_instance( const char* registeredName,
 */
 //=============================================================================
 
-void Engines_Container_i::remove_impl(Engines::Component_ptr component_i)
+void Engines_Container_i::remove_impl(Engines::EngineComponent_ptr component_i)
 {
   ASSERT(! CORBA::is_nil(component_i));
   std::string instanceName = component_i->instanceName() ;
@@ -1165,13 +1166,13 @@ void Engines_Container_i::decInstanceCnt(std::string genericRegisterName)
 */
 //=============================================================================
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Container_i::load_impl( const char* genericRegisterName,
                                 const char* componentName )
 {
   char* reason;
   std::string impl_name = std::string(LIB) + genericRegisterName + ENGINESO;
-  Engines::Component_var iobject = Engines::Component::_nil() ;
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil() ;
   if (load_component_Library(genericRegisterName,reason))
     iobject = find_or_create_instance(genericRegisterName, impl_name);
   CORBA::string_free(reason);
@@ -1201,7 +1202,7 @@ Engines_Container_i::load_impl( const char* genericRegisterName,
 */
 //=============================================================================
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Container_i::find_or_create_instance(std::string genericRegisterName,
                                              std::string componentLibraryName)
 {
@@ -1210,7 +1211,7 @@ Engines_Container_i::find_or_create_instance(std::string genericRegisterName,
   if (_library_map.count(impl_name) == 0)
   {
     INFOS("shared library " << impl_name <<" must be loaded before creating instance");
-    return Engines::Component::_nil() ;
+    return Engines::EngineComponent::_nil() ;
   }
   else
   {
@@ -1219,7 +1220,7 @@ Engines_Container_i::find_or_create_instance(std::string genericRegisterName,
     void* handle = _library_map[impl_name];
     std::string component_registerBase =
       _containerName + "/" + aGenRegisterName;
-    Engines::Component_var iobject = Engines::Component::_nil() ;
+    Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil() ;
     std::string reason;
     try
     {
@@ -1234,7 +1235,7 @@ Engines_Container_i::find_or_create_instance(std::string genericRegisterName,
       }
       else
       {
-        iobject = Engines::Component::_narrow( obj ) ;
+        iobject = Engines::EngineComponent::_narrow( obj ) ;
         Engines_Component_i *servant =
           dynamic_cast<Engines_Component_i*>
           (_poa->reference_to_servant(iobject));
@@ -1248,7 +1249,7 @@ Engines_Container_i::find_or_create_instance(std::string genericRegisterName,
         }
         else // monoStudy instance: NOK
         {
-          iobject = Engines::Component::_nil();
+          iobject = Engines::EngineComponent::_nil();
           INFOS("load_impl & find_component_instance methods "
             << "NOT SUITABLE for mono study components");
         }
@@ -1728,4 +1729,3 @@ int findpathof(const std::string& path, std::string& pth, const std::string& fil
   }
   return found;
 }
-
diff --git a/src/Container/SALOME_ComponentPy.py b/src/Container/SALOME_ComponentPy.py
index 86ec00e6d..dc6187078 100755
--- a/src/Container/SALOME_ComponentPy.py
+++ b/src/Container/SALOME_ComponentPy.py
@@ -55,7 +55,7 @@ _Sleeping = 0
 ## define an implementation of the component interface Engines::Component
 #
 #  
-class SALOME_ComponentPy_i (Engines__POA.Component):
+class SALOME_ComponentPy_i (Engines__POA.EngineComponent):
     _orb = None
     _poa = None
     _fieldsDict = []
diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx
index 8c1c16ed7..04b8b64eb 100644
--- a/src/Container/SALOME_Component_i.hxx
+++ b/src/Container/SALOME_Component_i.hxx
@@ -50,7 +50,7 @@ class RegistryConnexion;
 class Engines_Container_i;
 
 class CONTAINER_EXPORT Engines_Component_i: 
-  public virtual POA_Engines::Component,
+  public virtual POA_Engines::EngineComponent,
   public virtual PortableServer::ServantBase
 {
 public:
diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx
index 11a5cbfe7..c9e43e3c6 100644
--- a/src/Container/SALOME_Container_i.hxx
+++ b/src/Container/SALOME_Container_i.hxx
@@ -66,25 +66,25 @@ public:
 
   virtual bool load_component_Library(const char* componentName, CORBA::String_out reason);
 
-  virtual Engines::Component_ptr
+  virtual Engines::EngineComponent_ptr
   create_component_instance( const char* componentName,
                              CORBA::Long studyId); // 0 for multiStudy
 
-  virtual Engines::Component_ptr
+  virtual Engines::EngineComponent_ptr
   create_component_instance_env( const char* componentName,
                                  CORBA::Long studyId,          // 0 for multiStudy
                                  const Engines::FieldsDict& env,
                                  CORBA::String_out reason); 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   find_component_instance( const char* registeredName,
                            CORBA::Long studyId); // 0 for multiStudy
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   load_impl(const char* nameToRegister,
             const char* componentName);
 
 
-  void remove_impl(Engines::Component_ptr component_i);
+  void remove_impl(Engines::EngineComponent_ptr component_i);
   void finalize_removal();
 
   virtual void ping();
@@ -108,7 +108,7 @@ public:
   Engines::PyScriptNode_ptr createPyScriptNode(const char* nodeName, const char* code);
   // --- local C++ methods
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   find_or_create_instance( std::string genericRegisterName,
                            std::string componentLibraryName);
 
@@ -116,9 +116,9 @@ public:
   bool load_component_PythonImplementation(const char* componentName,std::string& reason);
   bool load_component_ExecutableImplementation(const char* componentName,std::string& reason);
 
-  Engines::Component_ptr createPythonInstance(std::string CompName, int studyId, std::string& error);
-  Engines::Component_ptr createExecutableInstance(std::string CompName, int studyId, const Engines::FieldsDict& env, std::string& error);
-  Engines::Component_ptr createInstance(std::string genericRegisterName, void *handle, int studyId, std::string& error);
+  Engines::EngineComponent_ptr createPythonInstance(std::string CompName, int studyId, std::string& error);
+  Engines::EngineComponent_ptr createExecutableInstance(std::string CompName, int studyId, const Engines::FieldsDict& env, std::string& error);
+  Engines::EngineComponent_ptr createInstance(std::string genericRegisterName, void *handle, int studyId, std::string& error);
 
   static bool isPythonContainer(const char* ContainerName);
   static void decInstanceCnt(std::string genericRegisterName);
@@ -146,7 +146,7 @@ protected:
   PortableServer::POA_var _poa;
   PortableServer::ObjectId * _id ;
   int _numInstance ;
-  std::map<std::string,Engines::Component_var> _listInstances_map;
+  std::map<std::string,Engines::EngineComponent_var> _listInstances_map;
   std::map<std::string,Engines::fileRef_var> _fileRef_map;
   std::map<std::string,Engines::Salome_file_var> _Salome_file_map;
   Engines::fileTransfer_var _fileTransfer;
@@ -158,4 +158,3 @@ protected:
 };
 
 #endif
-
diff --git a/src/DSC/ParallelDSC/ParallelDSC_i.cxx b/src/DSC/ParallelDSC/ParallelDSC_i.cxx
index 0b22f79b1..c071f5602 100644
--- a/src/DSC/ParallelDSC/ParallelDSC_i.cxx
+++ b/src/DSC/ParallelDSC/ParallelDSC_i.cxx
@@ -38,8 +38,8 @@ Engines_ParallelDSC_i::Engines_ParallelDSC_i(CORBA::ORB_ptr orb,
   Engines::DSC_base_serv(orb, ior, rank),
   Engines::Superv_Component_serv(orb, ior, rank),
   Engines::Superv_Component_base_serv(orb, ior, rank),
-  Engines::Component_serv(orb, ior, rank),
-  Engines::Component_base_serv(orb, ior, rank),
+  Engines::EngineComponent_serv(orb, ior, rank),
+  Engines::EngineComponent_base_serv(orb, ior, rank),
   Engines::Parallel_Component_serv(orb, ior, rank),
   Engines::Parallel_Component_base_serv(orb, ior, rank),
   InterfaceParallel_impl(orb, ior, rank)
diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index e616e68aa..410de42c0 100644
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -18,14 +18,12 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 //  SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++
 //  File   : SALOME_LifeCycleCORBA.cxx
 //  Author : Paul RASCLE, EDF
 //  Module : SALOME
-//  $Header$
-//
+
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -129,13 +127,13 @@ SALOME_LifeCycleCORBA::~SALOME_LifeCycleCORBA()
  *  \return a CORBA reference of the component instance, or _nil if not found
  */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 SALOME_LifeCycleCORBA::FindComponent(const Engines::MachineParameters& params,
                                      const char *componentName,
                                      int studyId)
 {
   if (! isKnownComponentClass(componentName))
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
 
   Engines::ContainerParameters new_params;
   convert(params, new_params);
@@ -148,10 +146,10 @@ SALOME_LifeCycleCORBA::FindComponent(const Engines::MachineParameters& params,
     }
   catch( const SALOME::SALOME_Exception& ex )
     {
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
 
-  Engines::Component_var compo = _FindComponent(new_params,
+  Engines::EngineComponent_var compo = _FindComponent(new_params,
                                                 componentName,
                                                 studyId,
                                                 listOfResources);
@@ -169,7 +167,7 @@ SALOME_LifeCycleCORBA::FindComponent(const Engines::MachineParameters& params,
  */
 //=============================================================================
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 SALOME_LifeCycleCORBA::LoadComponent(const Engines::MachineParameters& params,
                                      const char *componentName,
                                      int studyId)
@@ -177,7 +175,7 @@ SALOME_LifeCycleCORBA::LoadComponent(const Engines::MachineParameters& params,
   // --- Check if Component Name is known in ModuleCatalog
 
   if (! isKnownComponentClass(componentName))
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
 
   Engines::ContainerParameters new_params;
   convert(params, new_params);
@@ -191,11 +189,11 @@ SALOME_LifeCycleCORBA::LoadComponent(const Engines::MachineParameters& params,
     }
   catch( const SALOME::SALOME_Exception& ex )
     {
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
   new_params.resource_params.resList = listOfResources;
 
-  Engines::Component_var compo = _LoadComponent(new_params,
+  Engines::EngineComponent_var compo = _LoadComponent(new_params,
                                                 componentName,
                                                 studyId);
 
@@ -213,7 +211,7 @@ SALOME_LifeCycleCORBA::LoadComponent(const Engines::MachineParameters& params,
  */
 //=============================================================================
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 SALOME_LifeCycleCORBA::
 FindOrLoad_Component(const Engines::MachineParameters& params,
                      const char *componentName,
@@ -222,7 +220,7 @@ FindOrLoad_Component(const Engines::MachineParameters& params,
   // --- Check if Component Name is known in ModuleCatalog
 
   if (! isKnownComponentClass(componentName))
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
 
   Engines::ContainerParameters new_params;
   convert(params, new_params);
@@ -243,10 +241,10 @@ FindOrLoad_Component(const Engines::MachineParameters& params,
     }
   catch( const SALOME::SALOME_Exception& ex )
     {
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
 
-  Engines::Component_var compo = _FindComponent(new_params,
+  Engines::EngineComponent_var compo = _FindComponent(new_params,
                                                 componentName,
                                                 studyId,
                                                 listOfResources);
@@ -262,7 +260,7 @@ FindOrLoad_Component(const Engines::MachineParameters& params,
   return compo._retn();
 }
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 SALOME_LifeCycleCORBA::
 FindOrLoad_Component(const Engines::ContainerParameters& params,
                      const char *componentName,
@@ -271,7 +269,7 @@ FindOrLoad_Component(const Engines::ContainerParameters& params,
   // --- Check if Component Name is known in ModuleCatalog
 
   if (! isKnownComponentClass(componentName))
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
 
   Engines::ContainerParameters new_params(params);
   new_params.resource_params.componentList.length(1);
@@ -284,10 +282,10 @@ FindOrLoad_Component(const Engines::ContainerParameters& params,
     }
   catch( const SALOME::SALOME_Exception& ex )
     {
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
 
-  Engines::Component_var compo = _FindComponent(new_params,
+  Engines::EngineComponent_var compo = _FindComponent(new_params,
                                                 componentName,
                                                 studyId,
                                                 listOfResources);
@@ -315,7 +313,7 @@ FindOrLoad_Component(const Engines::ContainerParameters& params,
  */
 //=============================================================================
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 SALOME_LifeCycleCORBA::FindOrLoad_Component(const char *containerName,
                                             const char *componentName)
 {
@@ -323,7 +321,7 @@ SALOME_LifeCycleCORBA::FindOrLoad_Component(const char *containerName,
 
   // --- Check if Component Name is known in ModuleCatalog
   if (! isKnownComponentClass(componentName))
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
 
   // --- Check if containerName contains machine name (if yes: rg>0)
   char *stContainer=strdup(containerName);
@@ -734,7 +732,7 @@ void SALOME_LifeCycleCORBA::killOmniNames()
  */
 //=============================================================================
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 SALOME_LifeCycleCORBA::
 _FindComponent(const Engines::ContainerParameters& params,
                const char *componentName,
@@ -770,10 +768,10 @@ _FindComponent(const Engines::ContainerParameters& params,
                                                   containerName,
                                                   componentName,
                                                   nbproc);
-    return Engines::Component::_narrow(obj);
+    return Engines::EngineComponent::_narrow(obj);
   }
   else
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
 }
 
 //=============================================================================
@@ -790,7 +788,7 @@ _FindComponent(const Engines::ContainerParameters& params,
  */
 //=============================================================================
 
-Engines::Component_ptr 
+Engines::EngineComponent_ptr 
 SALOME_LifeCycleCORBA::
 _LoadComponent(const Engines::ContainerParameters& params, 
               const char *componentName,
@@ -802,7 +800,7 @@ _LoadComponent(const Engines::ContainerParameters& params,
   Engines::ContainerParameters local_params(params);
   local_params.mode = CORBA::string_dup("findorstart");
   Engines::Container_var cont = _ContManager->GiveContainer(local_params);
-  if (CORBA::is_nil(cont)) return Engines::Component::_nil();
+  if (CORBA::is_nil(cont)) return Engines::EngineComponent::_nil();
 
   char* reason;
   bool isLoadable = cont->load_component_Library(componentName,reason);
@@ -810,11 +808,11 @@ _LoadComponent(const Engines::ContainerParameters& params,
     {
       //std::cerr << reason << std::endl;
       CORBA::string_free(reason);
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
   CORBA::string_free(reason);
 
-  Engines::Component_var myInstance =
+  Engines::EngineComponent_var myInstance =
     cont->create_component_instance(componentName, studyId);
   return myInstance._retn();
 }
@@ -828,7 +826,7 @@ _LoadComponent(const Engines::ContainerParameters& params,
  *  \return a CORBA reference of the parallel component instance, or _nil if problem
  */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 SALOME_LifeCycleCORBA::Load_ParallelComponent(const Engines::ContainerParameters& params,
                                               const char *componentName,
                                               int studyId)
@@ -849,7 +847,7 @@ SALOME_LifeCycleCORBA::Load_ParallelComponent(const Engines::ContainerParameters
   Engines::Container_var cont = _ContManager->GiveContainer(parms);
   if (CORBA::is_nil(cont)) {
     INFOS("FindOrStartParallelContainer() returns a NULL container !");
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
   }
 
   MESSAGE("Loading component library");
@@ -859,7 +857,7 @@ SALOME_LifeCycleCORBA::Load_ParallelComponent(const Engines::ContainerParameters
     INFOS(componentName <<" library is not loadable !");
     //std::cerr << reason << std::endl;
     CORBA::string_free(reason);
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
   }
   CORBA::string_free(reason);
 
@@ -867,7 +865,7 @@ SALOME_LifeCycleCORBA::Load_ParallelComponent(const Engines::ContainerParameters
   // @PARALLEL@ permits to identify that the component requested
   // is a parallel component.
   std::string name = std::string(componentName);
-  Engines::Component_var myInstance = cont->create_component_instance(name.c_str(), studyId);
+  Engines::EngineComponent_var myInstance = cont->create_component_instance(name.c_str(), studyId);
   if (CORBA::is_nil(myInstance))
     INFOS("create_component_instance returns a NULL component !");
   return myInstance._retn();
@@ -921,4 +919,3 @@ CORBA::ORB_ptr SALOME_LifeCycleCORBA::orb()
 {
   return _NS->orb();
 }
-
diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
index d5c0bb67f..5cf394ce0 100644
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
@@ -19,13 +19,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++
 //  File   : SALOME_LifeCycleCORBA.hxx
 //  Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
 //  Module : SALOME
-//  $Header$
-//
+
 #ifndef _SALOME_LIFECYCLECORBA_HXX_
 #define _SALOME_LIFECYCLECORBA_HXX_
 
@@ -67,33 +65,33 @@ public:
   SALOME_LifeCycleCORBA(SALOME_NamingService *ns = 0);
   virtual ~SALOME_LifeCycleCORBA();
 
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
   FindComponent(const Engines::MachineParameters& params,
                 const char *componentName,
                 int studyId=0);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   LoadComponent(const Engines::MachineParameters& params,
                 const char *componentName,
                 int studyId=0);
 
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
   FindOrLoad_Component(const Engines::MachineParameters& params,
                        const char *componentName,
                        int studyId =0);
 
   // SALOME 6 - Interface
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
   FindOrLoad_Component(const Engines::ContainerParameters& params,
                        const char *componentName,
                        int studyId =0);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   FindOrLoad_Component(const char *containerName,
                        const char *componentName); // for compatibility
   
   // Parallel extension
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
     Load_ParallelComponent(const Engines::ContainerParameters& params,
                            const char *componentName,
                            int studyId);
@@ -129,13 +127,13 @@ protected:
    *  exists among the list of resources in "listOfMachines".
    *  This method uses Naming Service to find the component.
    */
-  Engines::Component_ptr 
+  Engines::EngineComponent_ptr 
   _FindComponent(const Engines::ContainerParameters& params,
                  const char *componentName,
                  int studyId,
                  const Engines::ResourceList& listOfResources);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   _LoadComponent(const Engines::ContainerParameters& params,
                  const char *componentName,
                  int studyId);
diff --git a/src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx b/src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx
index 3c39e3c6d..5034657ff 100644
--- a/src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx
+++ b/src/LifeCycleCORBA/Test/LifeCycleCORBATest.cxx
@@ -128,7 +128,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_LaunchContainer()
   //     load an engine, check that the CORBA object is not null
 
   std::string containerName = "myContainer";
-  Engines::Component_var mycompo =
+  Engines::EngineComponent_var mycompo =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo));
 
@@ -157,11 +157,11 @@ LifeCycleCORBATest::testFindOrLoad_Component_SameInstance()
 
   std::string containerName = "myContainer";
 
-  Engines::Component_var mycompo1 =
+  Engines::EngineComponent_var mycompo1 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo1));
 
-  Engines::Component_var mycompo2 =
+  Engines::EngineComponent_var mycompo2 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo2));
 
@@ -200,7 +200,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_PythonInCppContainer()
 
   std::string containerName = "myContainer";
 
-  Engines::Component_var mycompo1 =
+  Engines::EngineComponent_var mycompo1 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SALOME_TestComponentPy");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo1));
 
@@ -229,11 +229,11 @@ LifeCycleCORBATest::testFindOrLoad_Component_PythonSameInstance()
 
   std::string containerName = "myContainer";
 
-  Engines::Component_var mycompo1 =
+  Engines::EngineComponent_var mycompo1 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SALOME_TestComponentPy");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo1));
 
-  Engines::Component_var mycompo2 =
+  Engines::EngineComponent_var mycompo2 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SALOME_TestComponentPy");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo2));
 
@@ -273,7 +273,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_UnknownInCatalog()
 
   std::string containerName = "myContainer";
 
-  Engines::Component_var mycompo1 =
+  Engines::EngineComponent_var mycompo1 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"MyNewComponent");
   CPPUNIT_ASSERT(CORBA::is_nil(mycompo1));
 }
@@ -298,7 +298,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_LaunchContainerHostname()
   std::string containerName = Kernel_Utils::GetHostname();
   containerName += "/theContainer";
   DEVTRACE("containerName = " << containerName);
-  Engines::Component_var mycompo =
+  Engines::EngineComponent_var mycompo =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo));
 
@@ -326,14 +326,14 @@ LifeCycleCORBATest::testFindOrLoad_Component_SameContainer()
 
   std::string containerName = "aContainer";
 
-  Engines::Component_var mycompo1 =
+  Engines::EngineComponent_var mycompo1 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo1));
 
   containerName = Kernel_Utils::GetHostname();
   containerName += "/aContainer";
   DEVTRACE("containerName = " << containerName);
-  Engines::Component_var mycompo2 =
+  Engines::EngineComponent_var mycompo2 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo2));
 
@@ -391,7 +391,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_UnknownMachine()
 //                     _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");,SALOME::SALOME_Exception);
   try
     {
-      Engines::Component_var mycompo =
+      Engines::EngineComponent_var mycompo =
         _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
     }
   catch(const SALOME::SALOME_Exception &ex)
@@ -419,7 +419,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_ParamsEmpty()
 
   Engines::MachineParameters params;
   _LCC.preSet(params);
-  Engines::Component_var mycompo =
+  Engines::EngineComponent_var mycompo =
     _LCC.FindOrLoad_Component(params,"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo));
 
@@ -444,7 +444,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_ParamsLocalContainer()
   _LCC.preSet(params);
   std::string hostname=Kernel_Utils::GetHostname();
   params.hostname=hostname.c_str();
-  Engines::Component_var mycompo =
+  Engines::EngineComponent_var mycompo =
     _LCC.FindOrLoad_Component(params,"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo));
 
@@ -478,7 +478,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_ParamsContainerName()
   _LCC.preSet(params);
   std::string containerName = "myContainer";
   params.container_name = containerName.c_str();
-  Engines::Component_var mycompo =
+  Engines::EngineComponent_var mycompo =
     _LCC.FindOrLoad_Component(params,"SalomeTestComponent");
   CPPUNIT_ASSERT(!CORBA::is_nil(mycompo));
 
@@ -514,7 +514,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_RemoteComputer()
   std::string containerName = remoteHost;
   containerName += "/aContainer";
   DEVTRACE("containerName = " << containerName);
-  Engines::Component_var mycompo1 =
+  Engines::EngineComponent_var mycompo1 =
     _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
   CPPUNIT_ASSERT_MESSAGE("Test validity requires connection to remote "\
                          "computers from ResourcesCatalog",
@@ -552,7 +552,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_ParamsRemoteComputer()
   _LCC.preSet(params); 
   params.hostname = remoteHost.c_str();
 
-  Engines::Component_var mycompo1 =
+  Engines::EngineComponent_var mycompo1 =
     _LCC.FindOrLoad_Component(params,"SalomeTestComponent");
   CPPUNIT_ASSERT_MESSAGE("Test validity requires connection to remote "\
                          "computers from ResourcesCatalog",
@@ -591,7 +591,7 @@ LifeCycleCORBATest::testFindOrLoad_Component_ParamsRemoteComputer2()
   params.hostname = remoteHost.c_str();
   params.container_name = "anotherContainer";
 
-  Engines::Component_var mycompo1 =
+  Engines::EngineComponent_var mycompo1 =
     _LCC.FindOrLoad_Component(params,"SalomeTestComponent");
   CPPUNIT_ASSERT_MESSAGE("Test validity requires connection to remote "\
                          "computers from ResourcesCatalog",
diff --git a/src/LifeCycleCORBA/TestContainerManager.cxx b/src/LifeCycleCORBA/TestContainerManager.cxx
index acfbe3c14..fa9f3a2e5 100644
--- a/src/LifeCycleCORBA/TestContainerManager.cxx
+++ b/src/LifeCycleCORBA/TestContainerManager.cxx
@@ -45,7 +45,7 @@ int main (int argc, char * argv[])
   std::map<std::string, int> cycle;
   std::map<std::string, int> first;
   Engines::Container_ptr cont;
-  Engines::Component_ptr compo;
+  Engines::EngineComponent_ptr compo;
   bool error = false;
   bool bestImplemented;
   int status;
diff --git a/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
index 2444f3941..ff39138bf 100644
--- a/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
@@ -64,7 +64,7 @@ int main (int argc, char * argv[])
       std::string containerName = "myServer";
       MESSAGE("FindOrLoadComponent " + containerName + "/" + "SalomeTestComponent" );
 
-      Engines::Component_var mycompo =
+      Engines::EngineComponent_var mycompo =
         _LCC.FindOrLoad_Component(containerName.c_str(),"SalomeTestComponent");
       ASSERT(!CORBA::is_nil(mycompo));
       Engines::TestComponent_var m1;
@@ -78,7 +78,7 @@ int main (int argc, char * argv[])
 
       std::string containerName2 = "otherServer";
 
-      Engines::Component_var mycompo2 =
+      Engines::EngineComponent_var mycompo2 =
         _LCC.FindOrLoad_Component(containerName2.c_str(),"SALOME_TestComponentPy");
       ASSERT(!CORBA::is_nil(mycompo2));
       Engines::TestComponent_var m2;
@@ -91,7 +91,7 @@ int main (int argc, char * argv[])
       // --- get a third container,
       //     load an engine, and invoque methods on that engine
 
-      Engines::Component_var mycompo3 =
+      Engines::EngineComponent_var mycompo3 =
         _LCC.FindOrLoad_Component("totoPy","SALOME_TestComponentPy");
       ASSERT(!CORBA::is_nil(mycompo3));
       Engines::TestComponent_var m3 = Engines::TestComponent::_narrow(mycompo3);
@@ -103,7 +103,7 @@ int main (int argc, char * argv[])
 
       std::string containerName4 = Kernel_Utils::GetHostname();
       containerName4  += "/titiPy";
-      Engines::Component_var mycompo4 = 
+      Engines::EngineComponent_var mycompo4 = 
         _LCC.FindOrLoad_Component(containerName4.c_str(),"SALOME_TestComponentPy");
       ASSERT(!CORBA::is_nil(mycompo4));
       Engines::TestComponent_var m4 = Engines::TestComponent::_narrow(mycompo4);
@@ -144,4 +144,3 @@ int main (int argc, char * argv[])
 
   return 0;
 }
-
diff --git a/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i b/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i
index b05a99c9e..fde17ecda 100644
--- a/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i
+++ b/src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i
@@ -92,7 +92,7 @@ omniORBpyAPI* api;
 
 // ----------------------------------------------------------------------------
 
-%typemap(out) Engines::Container_ptr, Engines::Component_ptr, Engines::fileRef_ptr,
+%typemap(out) Engines::Container_ptr, Engines::EngineComponent_ptr, Engines::fileRef_ptr,
               Engines::ContainerManager_ptr, Engines::ResourcesManager_ptr 
 {
   MESSAGE("typemap out on CORBA object ptr");
@@ -237,4 +237,3 @@ omniORBpyAPI* api;
 
 %include <SALOME_LifeCycleCORBA.hxx>
 %include <SALOME_FileTransferCORBA.hxx>
-
diff --git a/src/MPIContainer/MPIContainer_i.cxx b/src/MPIContainer/MPIContainer_i.cxx
index 35437916d..554452f40 100644
--- a/src/MPIContainer/MPIContainer_i.cxx
+++ b/src/MPIContainer/MPIContainer_i.cxx
@@ -19,11 +19,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  SALOME MPIContainer : implemenation of container based on MPI libraries
 //  File   : MPIContainer_i.cxx
 //  Module : SALOME
-//
+
 #include <iostream>
 #include <dlfcn.h>
 #include <stdio.h>
@@ -92,7 +91,7 @@ void Engines_MPIContainer_i::Shutdown()
       (Engines::MPIContainer::_narrow((*_tior)[ip]))->Shutdown();
   }
 
-  std::map<std::string, Engines::Component_var>::iterator itm;
+  std::map<std::string, Engines::EngineComponent_var>::iterator itm;
   for (itm = _listInstances_map.begin(); itm != _listInstances_map.end(); itm++)
     {
       try
@@ -210,7 +209,7 @@ bool Engines_MPIContainer_i::Lload_component_Library(const char* componentName)
 }
 
 // Create an instance of component
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_MPIContainer_i::create_component_instance_env( const char* componentName,
                                                        CORBA::Long studyId,
                                                        const Engines::FieldsDict& env,
@@ -231,7 +230,7 @@ Engines_MPIContainer_i::create_component_instance_env( const char* componentName
     }
   }
 
-  Engines::Component_ptr cptr = Lcreate_component_instance(componentName,studyId);
+  Engines::EngineComponent_ptr cptr = Lcreate_component_instance(componentName,studyId);
 
   if(_numproc == 0){
     for(int ip=1;ip<_nbproc;ip++)
@@ -242,22 +241,22 @@ Engines_MPIContainer_i::create_component_instance_env( const char* componentName
   return cptr;
 }
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_MPIContainer_i::Lcreate_component_instance( const char* genericRegisterName, CORBA::Long studyId)
 {
   if (studyId < 0) {
     INFOS("studyId must be > 0 for mono study instance, =0 for multiStudy");
-    return Engines::Component::_nil() ;
+    return Engines::EngineComponent::_nil() ;
   }
 
-  Engines::Component_var iobject = Engines::Component::_nil() ;
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil() ;
   Engines::MPIObject_var pobj;
 
   std::string aCompName = genericRegisterName;
   if (_library_map[aCompName]) { // Python component
     if (_isSupervContainer) {
       INFOS("Supervision Container does not support Python Component Engines");
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
     _numInstanceMutex.lock() ; // lock on the instance number
     _numInstance++ ;
@@ -288,7 +287,7 @@ Engines_MPIContainer_i::Lcreate_component_instance( const char* genericRegisterN
     Py_RELEASE_NEW_THREAD;
   
     CORBA::Object_var obj = _orb->string_to_object(iors.c_str());
-    iobject = Engines::Component::_narrow( obj ) ;
+    iobject = Engines::EngineComponent::_narrow( obj ) ;
     pobj = Engines::MPIObject::_narrow(obj) ;
     if( _numproc == 0 )
       _NS->Register(iobject, component_registerName.c_str()) ;
@@ -310,15 +309,15 @@ Engines_MPIContainer_i::Lcreate_component_instance( const char* genericRegisterN
       return iobject._retn();
     }
 
-  return Engines::Component::_nil() ;
+  return Engines::EngineComponent::_nil() ;
 }
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_MPIContainer_i::createMPIInstance(std::string genericRegisterName,
                                           void *handle,
                                           int studyId)
 {
-  Engines::Component_var iobject;
+  Engines::EngineComponent_var iobject;
   Engines::MPIObject_var pobj;
   // --- find the factory
 
@@ -341,12 +340,12 @@ Engines_MPIContainer_i::createMPIInstance(std::string genericRegisterName,
       SCRUTE( dlerror() );
       pobj = Engines::MPIObject::_nil();
       BCastIOR(_orb,pobj,false);
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
 
   // --- create instance
 
-  iobject = Engines::Component::_nil() ;
+  iobject = Engines::EngineComponent::_nil() ;
 
   try
     {
@@ -369,10 +368,10 @@ Engines_MPIContainer_i::createMPIInstance(std::string genericRegisterName,
       // --- get reference & servant from id
 
       CORBA::Object_var obj = _poa->id_to_reference(*id);
-      iobject = Engines::Component::_narrow( obj ) ;
+      iobject = Engines::EngineComponent::_narrow( obj ) ;
       pobj = Engines::MPIObject::_narrow(obj) ;
 
-      Engines_Component_i *servant =
+      Engines_EngineComponent_i *servant =
         dynamic_cast<Engines_Component_i*>(_poa->reference_to_servant(iobject));
       ASSERT(servant);
       //SCRUTE(servant->pd_refCount);
@@ -401,13 +400,13 @@ Engines_MPIContainer_i::createMPIInstance(std::string genericRegisterName,
     }
   catch(const std::exception &ex){
     INFOS( ex.what() ) ;
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
   }
   return iobject._retn();
 }
 
 // Load component
-Engines::Component_ptr Engines_MPIContainer_i::load_impl(const char* nameToRegister,
+Engines::EngineComponent_ptr Engines_MPIContainer_i::load_impl(const char* nameToRegister,
                                                  const char* componentName)
 {
   pthread_t *th;
@@ -423,7 +422,7 @@ Engines::Component_ptr Engines_MPIContainer_i::load_impl(const char* nameToRegis
     }
   }
 
-  Engines::Component_ptr cptr =  Lload_impl(nameToRegister,componentName);
+  Engines::EngineComponent_ptr cptr =  Lload_impl(nameToRegister,componentName);
 
   if(_numproc == 0){
     for(int ip=1;ip<_nbproc;ip++)
@@ -435,11 +434,11 @@ Engines::Component_ptr Engines_MPIContainer_i::load_impl(const char* nameToRegis
 }
 
 // Load component
-Engines::Component_ptr Engines_MPIContainer_i::Lload_impl(
+Engines::EngineComponent_ptr Engines_MPIContainer_i::Lload_impl(
                                    const char* nameToRegister,
                                    const char* componentName)
 {
-  Engines::Component_var iobject;
+  Engines::EngineComponent_var iobject;
   Engines::MPIObject_var pobj;
   char cproc[4];
 
@@ -463,7 +462,7 @@ Engines::Component_ptr Engines_MPIContainer_i::Lload_impl(
   if(!handle){
     INFOS("[" << _numproc << "] Can't load shared library : " << absolute_impl_name);
     INFOS("[" << _numproc << "] error dlopen: " << dlerror());
-    return Engines::Component::_nil() ;
+    return Engines::EngineComponent::_nil() ;
   }
 
   std::string factory_name = _nameToRegister + std::string("Engine_factory");
@@ -488,7 +487,7 @@ Engines::Component_ptr Engines_MPIContainer_i::Lload_impl(
     MESSAGE("[" << _numproc << "] Try to load a sequential component");
     _numInstanceMutex.unlock() ;
     iobject = Engines_Container_i::load_impl(nameToRegister,componentName);
-    if( CORBA::is_nil(iobject) ) return Engines::Component::_duplicate(iobject);
+    if( CORBA::is_nil(iobject) ) return Engines::EngineComponent::_duplicate(iobject);
   }
   else{
     // Instanciation du composant parallele
@@ -498,7 +497,7 @@ Engines::Component_ptr Engines_MPIContainer_i::Lload_impl(
     // get reference from id
     CORBA::Object_var o = _poa->id_to_reference(*id);
     pobj = Engines::MPIObject::_narrow(o) ;
-    iobject = Engines::Component::_narrow(o) ;
+    iobject = Engines::EngineComponent::_narrow(o) ;
   }
 
   if( _numproc == 0 ){
@@ -514,11 +513,11 @@ Engines::Component_ptr Engines_MPIContainer_i::Lload_impl(
   BCastIOR(_orb,pobj,false);
 
   END_OF("[" <<_numproc << "] MPIContainer_i::Lload_impl");
-  return Engines::Component::_duplicate(iobject);
+  return Engines::EngineComponent::_duplicate(iobject);
 
 }
 
-void Engines_MPIContainer_i::remove_impl(Engines::Component_ptr component_i)
+void Engines_MPIContainer_i::remove_impl(Engines::EngineComponent_ptr component_i)
 {
   Engines::MPIObject_ptr pcptr;
   Engines::MPIObject_ptr spcptr;
@@ -532,7 +531,7 @@ void Engines_MPIContainer_i::remove_impl(Engines::Component_ptr component_i)
       st->ip = ip;
       st->tior = _tior;
       spcptr = Engines::MPIObject::_narrow((*(pcptr->tior()))[ip]);
-      st->cptr = (Engines::Component_ptr)spcptr;
+      st->cptr = (Engines::EngineComponent_ptr)spcptr;
       pthread_create(&(th[ip]),NULL,th_removeimpl,(void*)st);
     }
   }
diff --git a/src/MPIContainer/MPIContainer_i.hxx b/src/MPIContainer/MPIContainer_i.hxx
index 88b29e4d1..3d6604377 100644
--- a/src/MPIContainer/MPIContainer_i.hxx
+++ b/src/MPIContainer/MPIContainer_i.hxx
@@ -19,11 +19,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  SALOME MPIContainer : implemenation of container based on MPI libraries
 //  File   : MPIContainer_i.hxx
 //  Module : SALOME
-//
+
 #ifndef _SALOME_PCONTAINER_
 #define _SALOME_PCONTAINER_ 
 
@@ -44,7 +43,7 @@ typedef struct {
   std::string compoName;
   std::string nameToRegister;
   long studyId;
-  Engines::Component_ptr cptr;
+  Engines::EngineComponent_ptr cptr;
 } thread_st;
 
 class Engines_MPIContainer_i : public POA_Engines::MPIContainer,
@@ -71,7 +70,7 @@ class Engines_MPIContainer_i : public POA_Engines::MPIContainer,
 
   // Create an instance of component
   // synchronous version for process 0
-  virtual Engines::Component_ptr
+  virtual Engines::EngineComponent_ptr
   create_component_instance_env( const char* componentName,
                                  CORBA::Long studyId,          // 0 for multiStudy
                                  const Engines::FieldsDict& env,
@@ -79,25 +78,25 @@ class Engines_MPIContainer_i : public POA_Engines::MPIContainer,
 
   // Load a component in current MPI container
   // synchronous version for process 0
-  Engines::Component_ptr load_impl(const char* nameToRegister,
+  Engines::EngineComponent_ptr load_impl(const char* nameToRegister,
                                    const char* componentName);
 
   // Unload a component from current MPI container
   // synchronous version for process 0
-  void remove_impl(Engines::Component_ptr component_i);
+  void remove_impl(Engines::EngineComponent_ptr component_i);
 
   // synchronous version for process 0
   void finalize_removal();
 
  private:
   bool Lload_component_Library(const char* componentName);
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   Lcreate_component_instance( const char* componentName,
                               CORBA::Long studyId); // 0 for multiStudy
-  Engines::Component_ptr Lload_impl(const char* nameToRegister,
+  Engines::EngineComponent_ptr Lload_impl(const char* nameToRegister,
                                     const char* componentName);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   createMPIInstance(std::string genericRegisterName,
                     void *handle,
                     int studyId);
diff --git a/src/ModuleGenerator/README b/src/ModuleGenerator/README
index 5f270ac48..5fea0bf0e 100644
--- a/src/ModuleGenerator/README
+++ b/src/ModuleGenerator/README
@@ -75,7 +75,7 @@ ou <n> vaut 1, 1b, 2, 3, 4, 5
     a partir d'un fichier idl <fichier.idl>
     Le fichier idl contient un composant et une interface CORBA
     qui n'est pas un composant Salome (i.e. ne derive pas de
-    Engines::Component).
+    Engines::EngineComponent).
 
               _________________________________________
 2.  Un meme fichier idl est lu deux fois
diff --git a/src/ModuleGenerator/tests/AddComponent.idl b/src/ModuleGenerator/tests/AddComponent.idl
index 4b39ff54d..15285c090 100644
--- a/src/ModuleGenerator/tests/AddComponent.idl
+++ b/src/ModuleGenerator/tests/AddComponent.idl
@@ -19,10 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  File   : AddComponent.idl
 //  Author : Jean Rahuel
-//
+
 #ifndef _ADDCOMPONENT_IDL
 #define _ADDCOMPONENT_IDL
 
@@ -32,7 +31,7 @@ module SuperVisionTest {
 
   interface Adder ;
 
-  interface AddComponent : Engines::Component {
+  interface AddComponent : Engines::EngineComponent {
     double Add( in double x , in double y , out double z ) ;
     double AddWithoutSleep( in double x , in double y , out double z ) ;
     void Setx( in double x ) ;
@@ -53,15 +52,15 @@ module SuperVisionTest {
                              out AddComponent RetAdder3 ) ;
   };
 
-  interface Adder : Engines::Component {
+  interface Adder : Engines::EngineComponent {
     double Add( in double x , in double y , out double z ) ;
     double AddWithoutSleep( in double x , in double y , out double z ) ;
     double AddAndCompare( in double x , in double y , in Adder anOtherAdder,
                           out double z ) ;
     void SetLastResult( in double z ) ;
     void LastResult( out double z ) ;
-    Engines::Component LccAddComponent( in string aContainer ,
-                                        in string aComponentName ) ;
+    Engines::EngineComponent LccAddComponent( in string aContainer ,
+                                              in string aComponentName ) ;
   };
 
 } ;
diff --git a/src/ModuleGenerator/tests/SubComponent.idl b/src/ModuleGenerator/tests/SubComponent.idl
index ede763f87..585b899c2 100644
--- a/src/ModuleGenerator/tests/SubComponent.idl
+++ b/src/ModuleGenerator/tests/SubComponent.idl
@@ -19,10 +19,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  File   : SubComponent.idl
 //  Author : Jean Rahuel
-//
+
 #ifndef _SUBCOMPONENT_IDL
 #define _SUBCOMPONENT_IDL
 
@@ -30,7 +29,7 @@
 
 module SuperVisionTest {
 
-  interface SubComponent : Engines::Component {
+  interface SubComponent : Engines::EngineComponent {
   void Sub( in double x , in double y , out double z ) ;
   } ;
 };
diff --git a/src/ParallelContainer/SALOME_ParallelComponent_i.cxx b/src/ParallelContainer/SALOME_ParallelComponent_i.cxx
index fcebd659b..f45839afa 100644
--- a/src/ParallelContainer/SALOME_ParallelComponent_i.cxx
+++ b/src/ParallelContainer/SALOME_ParallelComponent_i.cxx
@@ -77,8 +77,8 @@ Engines_Parallel_Component_i::Engines_Parallel_Component_i(CORBA::ORB_ptr orb, c
                                          bool notif,
                                          bool regist) :
   InterfaceParallel_impl(orb,ior,rank), 
-  Engines::Component_serv(orb,ior,rank),
-  Engines::Component_base_serv(orb,ior,rank),
+  Engines::EngineComponent_serv(orb,ior,rank),
+  Engines::EngineComponent_base_serv(orb,ior,rank),
   Engines::Parallel_Component_serv(orb,ior,rank),
   Engines::Parallel_Component_base_serv(orb,ior,rank),
   _instanceName(instanceName),
@@ -1198,4 +1198,3 @@ Engines_Parallel_Component_i::configureSalome_file(std::string service_name,
 {
   // By default this method does nothing
 }
-
diff --git a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx b/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx
index 362d6cfbc..ba24c964e 100644
--- a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx
+++ b/src/ParallelContainer/SALOME_ParallelContainerProxy_i.cxx
@@ -270,12 +270,12 @@ Container_proxy_impl_final::load_component_Library(const char* componentName, CO
   return ret;
 }
 
-Engines::Component_ptr 
+Engines::EngineComponent_ptr 
 Container_proxy_impl_final::create_component_instance(const char* componentName, ::CORBA::Long studyId)
 {
   Engines::FieldsDict_var env = new Engines::FieldsDict;
   char* reason;
-  Engines::Component_ptr compo = create_component_instance_env(componentName, studyId, env, reason);
+  Engines::EngineComponent_ptr compo = create_component_instance_env(componentName, studyId, env, reason);
   CORBA::string_free(reason);
   return compo;
 }
@@ -284,7 +284,7 @@ Container_proxy_impl_final::create_component_instance(const char* componentName,
 // Composant sequentiel -> on le créer sur le noeud 0 (on pourrait faire une répartition de charge)
 // Composant parallèle -> création du proxy ici puis appel de la création de chaque objet participant
 // au composant parallèle
-Engines::Component_ptr 
+Engines::EngineComponent_ptr 
 Container_proxy_impl_final::create_component_instance_env(const char* componentName, ::CORBA::Long studyId,
                                                           const Engines::FieldsDict& env, CORBA::String_out reason)
 {
@@ -295,7 +295,7 @@ Container_proxy_impl_final::create_component_instance_env(const char* componentN
   {
     // Component is not loaded !
     INFOS("Proxy: component is not loaded ! : " << aCompName);
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
   }
 
   // If it is a sequential component
@@ -309,7 +309,7 @@ Container_proxy_impl_final::create_component_instance_env(const char* componentN
   }
 
   // Parallel Component !
-  Engines::Component_var component_proxy = Engines::Component::_nil();
+  Engines::EngineComponent_var component_proxy = Engines::EngineComponent::_nil();
 
   // On commence par créer le proxy
 #ifndef WIN32
@@ -329,7 +329,7 @@ Container_proxy_impl_final::create_component_instance_env(const char* componentN
 #ifndef WIN32
     INFOS("dlerror() result is : " << dlerror());
 #endif
-    return Engines::Component::_nil() ;
+    return Engines::EngineComponent::_nil() ;
   }
   try {
     _numInstanceMutex.lock() ; // lock on the instance number
@@ -355,7 +355,7 @@ Container_proxy_impl_final::create_component_instance_env(const char* componentN
 
     // --- get reference & servant from id
     CORBA::Object_var obj = _poa->id_to_reference(*(proxy->proxy_id));
-    component_proxy = Engines::Component::_narrow(obj);
+    component_proxy = Engines::EngineComponent::_narrow(obj);
     proxy->proxy_corba_ref = component_proxy;
 
     if (!CORBA::is_nil(component_proxy))
@@ -372,14 +372,14 @@ Container_proxy_impl_final::create_component_instance_env(const char* componentN
     else
     {
       INFOS("The factory returns a nil object !");
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
       
   }
   catch (...)
   {
     INFOS( "Exception catched in Proxy creation" );
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
   }
 
   // Create on each node a work node
@@ -398,18 +398,18 @@ Container_proxy_impl_final::create_component_instance_env(const char* componentN
       catch (SALOME::SALOME_Exception & ex)
       {
         INFOS("SALOME_EXCEPTION : " << ex.details.text);
-        return Engines::Component::_nil();
+        return Engines::EngineComponent::_nil();
       }
       catch (...)
       {
         INFOS("Unknown Exception catch during create_paco_component_node_instance on node : " << i);
-        return Engines::Component::_nil();
+        return Engines::EngineComponent::_nil();
       }
     }
     else
     {
       INFOS("Cannot call create_paco_component_node_instance on node " << i << " ref is nil !");
-      return Engines::Component::_nil();
+      return Engines::EngineComponent::_nil();
     }
   }
 
diff --git a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.hxx b/src/ParallelContainer/SALOME_ParallelContainerProxy_i.hxx
index 4be850dfd..3636c2100 100644
--- a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.hxx
+++ b/src/ParallelContainer/SALOME_ParallelContainerProxy_i.hxx
@@ -19,11 +19,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  SALOME_ParallelContainerProxy : implementation of container and engine for Parallel Kernel
 //  File   : SALOME_ParallelContainerProxy_i.hxx
 //  Author : André RIBES, EDF
-//
+
 #ifndef _SALOME_PARALLEL_CONTAINER_PROXY_I_HXX_
 #define _SALOME_PARALLEL_CONTAINER_PROXY_I_HXX_
 
@@ -56,20 +55,21 @@ class Container_proxy_impl_final :
     virtual void Shutdown();
 
     virtual ::CORBA::Boolean load_component_Library(const char* componentName,CORBA::String_out reason);
-    virtual Engines::Component_ptr create_component_instance(const char* componentName, ::CORBA::Long studyId);
-    virtual Engines::Component_ptr create_component_instance_env( const char* componentName,
-                                                                  CORBA::Long studyId,          // 0 for multiStudy
-                                                                  const Engines::FieldsDict& env,
-                                                                  CORBA::String_out reason);
+    virtual Engines::EngineComponent_ptr create_component_instance (const char* componentName,
+                                                                    ::CORBA::Long studyId);
+    virtual Engines::EngineComponent_ptr create_component_instance_env (const char* componentName,
+                                                                        CORBA::Long studyId,    // 0 for multiStudy
+                                                                        const Engines::FieldsDict& env,
+                                                                        CORBA::String_out reason);
 
   private:
     std::map<std::string, std::string> _libtype_map; // libname -> libtype (seq ou par)
 
     struct proxy_object
     {
-      Engines::Component_var     proxy_corba_ref;
-      PortableServer::ObjectId * proxy_id;
-      RegistryConnexion *        proxy_regist;
+      Engines::EngineComponent_var proxy_corba_ref;
+      PortableServer::ObjectId *   proxy_id;
+      RegistryConnexion *          proxy_regist;
     };
 
     // Cette liste contient les references vers les différentes
diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.cxx b/src/ParallelContainer/SALOME_ParallelContainer_i.cxx
index 6c4583216..9903e65c4 100644
--- a/src/ParallelContainer/SALOME_ParallelContainer_i.cxx
+++ b/src/ParallelContainer/SALOME_ParallelContainer_i.cxx
@@ -19,11 +19,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  SALOME_ParallelContainer : implementation of container and engine for ParallelKernel
 //  File   : SALOME_ParallelContainer_i.cxx
 //  Author : André RIBES, EDF
-//
+
 #include "SALOME_ParallelContainer_i.hxx"
 #include "SALOME_Component_i.hxx"
 #include "SALOME_FileRef_i.hxx"
@@ -243,7 +242,7 @@ void Engines_Parallel_Container_i::Shutdown()
   /* For each seq component contained in this container
   * tell it to self-destroy
   */
-  std::map<std::string, Engines::Component_var>::iterator itm;
+  std::map<std::string, Engines::EngineComponent_var>::iterator itm;
   for (itm = _listInstances_map.begin(); itm != _listInstances_map.end(); itm++)
   {
     try
@@ -383,13 +382,13 @@ Engines_Parallel_Container_i::load_component_Library(const char* componentName,
  *  \return a loaded component
  */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Parallel_Container_i::create_component_instance(const char*genericRegisterName,
                                                         CORBA::Long studyId)
 {
   Engines::FieldsDict_var env = new Engines::FieldsDict;
   char* reason;
-  Engines::Component_ptr compo = create_component_instance_env(genericRegisterName,studyId,env, reason);
+  Engines::EngineComponent_ptr compo = create_component_instance_env(genericRegisterName,studyId,env, reason);
   CORBA::string_free(reason);
   return compo;
 }
@@ -408,7 +407,7 @@ Engines_Parallel_Container_i::create_component_instance(const char*genericRegist
  */
 //=============================================================================
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Parallel_Container_i::create_component_instance_env(const char*genericRegisterName,
                                                             CORBA::Long studyId,
                                                             const Engines::FieldsDict& env,
@@ -420,7 +419,7 @@ Engines_Parallel_Container_i::create_component_instance_env(const char*genericRe
   if (studyId < 0)
   {
     INFOS("studyId must be > 0 for mono study instance, =0 for multiStudy");
-    return Engines::Component::_nil() ;
+    return Engines::EngineComponent::_nil() ;
   }
 
   std::string aCompName = genericRegisterName;
@@ -445,10 +444,10 @@ Engines_Parallel_Container_i::create_component_instance_env(const char*genericRe
   {
     std::cerr << "Component library is not loaded or imported ! lib was : " << aCompName << std::endl;
     _numInstanceMutex.unlock();
-    return Engines::Component::_nil();
+    return Engines::EngineComponent::_nil();
   }
 
-  Engines::Component_var iobject = Engines::Component::_nil();
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil();
   if (type_of_lib == "cpp")
     iobject = createCPPInstance(aCompName, handle, studyId);
   else
@@ -470,11 +469,11 @@ Engines_Parallel_Container_i::create_component_instance_env(const char*genericRe
  */
 //=============================================================================
 
-Engines::Component_ptr Engines_Parallel_Container_i::find_component_instance( const char* registeredName,
+Engines::EngineComponent_ptr Engines_Parallel_Container_i::find_component_instance( const char* registeredName,
                                                                               CORBA::Long studyId)
 {
-  Engines::Component_var anEngine = Engines::Component::_nil();
-  std::map<std::string,Engines::Component_var>::iterator itm =_listInstances_map.begin();
+  Engines::EngineComponent_var anEngine = Engines::EngineComponent::_nil();
+  std::map<std::string,Engines::EngineComponent_var>::iterator itm =_listInstances_map.begin();
   while (itm != _listInstances_map.end())
   {
     std::string instance = (*itm).first;
@@ -507,10 +506,10 @@ Engines::Component_ptr Engines_Parallel_Container_i::find_component_instance( co
  */
 //=============================================================================
 
-Engines::Component_ptr Engines_Parallel_Container_i::load_impl( const char* genericRegisterName,
+Engines::EngineComponent_ptr Engines_Parallel_Container_i::load_impl( const char* genericRegisterName,
                                                                 const char* componentName )
 {
-  Engines::Component_var iobject = Engines::Component::_nil();
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil();
   char* reason;
   if (load_component_Library(genericRegisterName,reason))
     iobject = find_or_create_instance(genericRegisterName);
@@ -527,13 +526,13 @@ Engines::Component_ptr Engines_Parallel_Container_i::load_impl( const char* gene
  */
 //=============================================================================
 
-void Engines_Parallel_Container_i::remove_impl(Engines::Component_ptr component_i)
+void Engines_Parallel_Container_i::remove_impl(Engines::EngineComponent_ptr component_i)
 {
   ASSERT(!CORBA::is_nil(component_i));
   std::string instanceName = component_i->instanceName();
   _numInstanceMutex.lock() ; // lock to be alone (stl container write)
   // Test if the component is in this container
-  std::map<std::string, Engines::Component_var>::iterator itm;
+  std::map<std::string, Engines::EngineComponent_var>::iterator itm;
   itm = _listInstances_map.find(instanceName);
   if (itm != _listInstances_map.end())
   {
@@ -711,10 +710,10 @@ Engines_Parallel_Container_i::createSalome_file(const char* origFileName)
  */
 //=============================================================================
 
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Parallel_Container_i::find_or_create_instance(std::string genericRegisterName)
 {
-  Engines::Component_var iobject = Engines::Component::_nil();
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil();
   try
   {
     std::string aGenRegisterName = genericRegisterName;
@@ -728,14 +727,14 @@ Engines_Parallel_Container_i::find_or_create_instance(std::string genericRegiste
     }
     else
     { 
-      iobject = Engines::Component::_narrow(obj) ;
+      iobject = Engines::EngineComponent::_narrow(obj) ;
       Engines_Component_i *servant = dynamic_cast<Engines_Component_i*>(_poa->reference_to_servant(iobject));
       ASSERT(servant)
       int studyId = servant->getStudyId();
       ASSERT (studyId >= 0);
       if (studyId != 0)  // monoStudy instance: NOK
       {
-        iobject = Engines::Component::_nil();
+        iobject = Engines::EngineComponent::_nil();
         INFOS("load_impl & find_component_instance methods "
               << "NOT SUITABLE for mono study components");
       }
@@ -769,11 +768,11 @@ Engines_Parallel_Container_i::find_or_create_instance(std::string genericRegiste
  *  component_registerName = /Containers/cli76ce/FactoryServer/COMPONENT_inst_1
  */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Parallel_Container_i::createPythonInstance(std::string genericRegisterName, int studyId)
 {
 
-  Engines::Component_var iobject = Engines::Component::_nil();
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil();
 
   int numInstance = _numInstance;
   char aNumI[12];
@@ -801,7 +800,7 @@ Engines_Parallel_Container_i::createPythonInstance(std::string genericRegisterNa
   if( iors!="" )
   {
     CORBA::Object_var obj = _orb->string_to_object(iors.c_str());
-    iobject = Engines::Component::_narrow(obj);
+    iobject = Engines::EngineComponent::_narrow(obj);
     _listInstances_map[instanceName] = iobject;
   }
   else
@@ -831,7 +830,7 @@ Engines_Parallel_Container_i::createPythonInstance(std::string genericRegisterNa
  *  component_registerName = /Containers/cli76ce/FactoryServer/COMPONENT_inst_1
  */
 //=============================================================================
-Engines::Component_ptr
+Engines::EngineComponent_ptr
 Engines_Parallel_Container_i::createCPPInstance(std::string genericRegisterName,
                                                 void *handle,
                                                 int studyId)
@@ -863,11 +862,11 @@ Engines_Parallel_Container_i::createCPPInstance(std::string genericRegisterName,
 #ifndef WIN32
     INFOS("dlerror() result is : " << dlerror());
 #endif
-    return Engines::Component::_nil() ;
+    return Engines::EngineComponent::_nil() ;
   }
 
   // --- create instance
-  Engines::Component_var iobject = Engines::Component::_nil() ;
+  Engines::EngineComponent_var iobject = Engines::EngineComponent::_nil() ;
   try
   {
     int numInstance = _numInstance;
@@ -890,7 +889,7 @@ Engines_Parallel_Container_i::createCPPInstance(std::string genericRegisterName,
 
     // --- get reference & servant from id
     CORBA::Object_var obj = _poa->id_to_reference(*id);
-    iobject = Engines::Component::_narrow(obj);
+    iobject = Engines::EngineComponent::_narrow(obj);
 
     Engines_Component_i *servant = 
       dynamic_cast<Engines_Component_i*>(_poa->reference_to_servant(iobject));
@@ -945,7 +944,7 @@ Engines_Parallel_Container_i::create_paco_component_node_instance(const char* co
   // Step 1 : Get proxy !
   string component_registerName = _proxy_containerName + "/" + instanceName;
   CORBA::Object_var temp = _NS->Resolve(component_registerName.c_str());
-  Engines::Component_var obj_proxy = Engines::Component::_narrow(temp);
+  Engines::EngineComponent_var obj_proxy = Engines::EngineComponent::_narrow(temp);
   if (CORBA::is_nil(obj_proxy))
   {
     INFOS("Proxy reference from NamingService is nil !");
@@ -1247,4 +1246,3 @@ void SigIntHandler( int what ) {
   }
 }
 #endif
-
diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
index df06e58d9..552590499 100644
--- a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
+++ b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
@@ -19,11 +19,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-
 //  SALOME_ParallelContainer : implementation of container and engine for Parallel Kernel
 //  File   : SALOME_ParallelContainer_i.hxx
 //  Author : André RIBES, EDF
-//
+
 #ifndef _SALOME_PARALLEL_CONTAINER_I_HXX_
 #define _SALOME_PARALLEL_CONTAINER_I_HXX_
 
@@ -74,21 +73,21 @@ public:
 
   virtual bool load_component_Library(const char* componentName, CORBA::String_out reason);
 
-  virtual Engines::Component_ptr
+  virtual Engines::EngineComponent_ptr
   create_component_instance( const char* componentName,
                              CORBA::Long studyId); // 0 for multiStudy
 
-  virtual Engines::Component_ptr
+  virtual Engines::EngineComponent_ptr
   create_component_instance_env( const char* componentName,
                                  CORBA::Long studyId,          // 0 for multiStudy
                                  const Engines::FieldsDict& env,
                                  CORBA::String_out reason);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   find_component_instance( const char* registeredName,
                            CORBA::Long studyId); // 0 for multiStudy
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   load_impl(const char* nameToRegister,
             const char* componentName);
 
@@ -99,7 +98,7 @@ public:
 
   void updateInstanceNumber();
 
-  void remove_impl(Engines::Component_ptr component_i);
+  void remove_impl(Engines::EngineComponent_ptr component_i);
   void finalize_removal();
 
   virtual void ping();
@@ -116,15 +115,15 @@ public:
   bool Kill_impl() ;
 
   // --- local C++ methods
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   find_or_create_instance(std::string genericRegisterName);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   createCPPInstance(std::string genericRegisterName,
                     void *handle,
                     int studyId);
 
-  Engines::Component_ptr
+  Engines::EngineComponent_ptr
   createPythonInstance(std::string genericRegisterName,
                        int studyId);
 
@@ -156,7 +155,7 @@ protected:
   bool   _isServantAloneInProcess;
   Engines::fileTransfer_var _fileTransfer;
 
-  typedef std::map<std::string,Engines::Component_var> _listInstances_map_t;
+  typedef std::map<std::string,Engines::EngineComponent_var> _listInstances_map_t;
   typedef std::map<std::string,Engines::fileRef_var> _fileRef_map_t;
   typedef std::map<std::string,Engines::Salome_file_var> _Salome_file_map_t;
   _listInstances_map_t _listInstances_map;
@@ -175,4 +174,3 @@ protected:
 };
 
 #endif
-
diff --git a/src/SALOMEDS/SALOMEDS_Driver_i.cxx b/src/SALOMEDS/SALOMEDS_Driver_i.cxx
index 15c5b770f..e4607be4b 100644
--- a/src/SALOMEDS/SALOMEDS_Driver_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Driver_i.cxx
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include "SALOMEDS_Driver_i.hxx"
 #include "SALOMEDS_TMPFile_i.hxx"
@@ -219,7 +218,7 @@ SALOMEDSImpl_TMPFile* SALOMEDS_Driver_i::DumpPython(SALOMEDSImpl_Study* theStudy
 {
   SALOMEDS_Study_i *  st_servant = SALOMEDS_Study_i::GetStudyServant(theStudy, _orb);//new SALOMEDS_Study_i (theStudy, _orb);
   SALOMEDS::Study_var st  = SALOMEDS::Study::_narrow(st_servant->_this());
-  Engines::Component_ptr aComponent = Engines::Component::_narrow(_driver);
+  Engines::EngineComponent_ptr aComponent = Engines::EngineComponent::_narrow(_driver);
 
   SALOMEDS::unlock();
   CORBA::Boolean aValidScript, aPublished = isPublished;
-- 
2.39.2