From: nri <nri@opencascade.com>
Date: Mon, 19 May 2003 07:18:06 +0000 (+0000)
Subject: NRI : Replace Geometry by GEOM.
X-Git-Tag: Start-v1_1a~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5608a7dcc05f69d8c5ffdb786d05d8ac2a2fd8e0;p=modules%2Fgeom.git

NRI : Replace Geometry by GEOM.
---

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 2792459fc..998f271ef 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -4195,7 +4195,7 @@ bool GeometryGUI::OnGUIEvent(int theCommandID,	QAD_Desktop* parent)
 		if (!obj->FindAttribute(anAttr, "AttributeIOR") &&
 		    obj->FindAttribute(anAttr, "AttributePersistentRef")) {
 		  // load
-		  Engines::Component_var comp = GeomGUI->myDesktop->getEngine("FactoryServer","Geometry");
+		  Engines::Component_var comp = GeomGUI->myDesktop->getEngine("FactoryServer","GEOM");
 		  if (!CORBA::is_nil(comp)) {
 		    SALOMEDS::Driver_var   driver = SALOMEDS::Driver::_narrow(comp);
 
diff --git a/src/GEOMGUI/GeometryGUI_ArcDlg.cxx b/src/GEOMGUI/GeometryGUI_ArcDlg.cxx
index e922c32cb..41dd627c8 100644
--- a/src/GEOMGUI/GeometryGUI_ArcDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_ArcDlg.cxx
@@ -38,8 +38,8 @@ using namespace std;
 GeometryGUI_ArcDlg::GeometryGUI_ArcDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_ARC")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_ARC")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_ArcDlg" );
@@ -188,7 +188,7 @@ void GeometryGUI_ArcDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
   mySelection->AddFilter(myVertexFilter) ;
diff --git a/src/GEOMGUI/GeometryGUI_ArchimedeDlg.cxx b/src/GEOMGUI/GeometryGUI_ArchimedeDlg.cxx
index 50f1a4438..5867d6993 100644
--- a/src/GEOMGUI/GeometryGUI_ArchimedeDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_ArchimedeDlg.cxx
@@ -41,8 +41,8 @@ using namespace std;
 GeometryGUI_ArchimedeDlg::GeometryGUI_ArchimedeDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
   : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_ARCHIMEDE")));
-  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_ARCHIMEDE")));
+  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
   
   if ( !name )
     setName( "GeometryGUI_ArchimedeDlg" );
@@ -224,7 +224,7 @@ void GeometryGUI_ArchimedeDlg::Init( SALOME_Selection* Sel )
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_BndBoxDlg.cxx b/src/GEOMGUI/GeometryGUI_BndBoxDlg.cxx
index 7845b2947..aa2f1d04d 100644
--- a/src/GEOMGUI/GeometryGUI_BndBoxDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_BndBoxDlg.cxx
@@ -42,8 +42,8 @@ using namespace std;
 GeometryGUI_BndBoxDlg::GeometryGUI_BndBoxDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BOUNDING_BOX")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BOUNDING_BOX")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_BndBoxDlg" );
@@ -235,7 +235,7 @@ void GeometryGUI_BndBoxDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_BoxDlg.cxx b/src/GEOMGUI/GeometryGUI_BoxDlg.cxx
index 0bb5c93fa..476a54854 100644
--- a/src/GEOMGUI/GeometryGUI_BoxDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_BoxDlg.cxx
@@ -46,9 +46,9 @@ using namespace std;
 GeometryGUI_BoxDlg::GeometryGUI_BoxDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BOX_2P")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BOX_DXYZ")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BOX_2P")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BOX_DXYZ")));
 
     if ( !name )
 	setName( "GeometryGUI_BoxDlg" );
@@ -243,7 +243,7 @@ void GeometryGUI_BoxDlg::Init(SALOME_Selection *Sel)
   // TODO previous selection into argument ?
   
   /*  Vertices Filter for all arguments */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
   mySelection->AddFilter( myVertexFilter ); /* filter for next selection */
diff --git a/src/GEOMGUI/GeometryGUI_CenterMassDlg.cxx b/src/GEOMGUI/GeometryGUI_CenterMassDlg.cxx
index 69dd839f5..40f3261e1 100644
--- a/src/GEOMGUI/GeometryGUI_CenterMassDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_CenterMassDlg.cxx
@@ -36,8 +36,8 @@ using namespace std;
 GeometryGUI_CenterMassDlg::GeometryGUI_CenterMassDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CENTERMASS")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CENTERMASS")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_CenterMassDlg" );
@@ -223,7 +223,7 @@ void GeometryGUI_CenterMassDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_ChamferDlg.cxx b/src/GEOMGUI/GeometryGUI_ChamferDlg.cxx
index 14b8091a0..ea91bac12 100644
--- a/src/GEOMGUI/GeometryGUI_ChamferDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_ChamferDlg.cxx
@@ -56,10 +56,10 @@ GeometryGUI_ChamferDlg::GeometryGUI_ChamferDlg( QWidget* parent,
   : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
     /***************************************************************/
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CHAMFER_ALL")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CHAMFER_EDGE")));
-    QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CHAMFER_FACE")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CHAMFER_ALL")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CHAMFER_EDGE")));
+    QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CHAMFER_FACE")));
 
     if ( !name )
 	setName( "GeometryGUI_ChamferDlg" );
@@ -388,7 +388,7 @@ void GeometryGUI_ChamferDlg::Init( SALOME_Selection* Sel, Handle (AIS_Interactiv
   mySimulationTopoDs.Nullify() ;
   
   /* Filters definition */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_CheckShape.cxx b/src/GEOMGUI/GeometryGUI_CheckShape.cxx
index 94566b249..b9f4cd05b 100644
--- a/src/GEOMGUI/GeometryGUI_CheckShape.cxx
+++ b/src/GEOMGUI/GeometryGUI_CheckShape.cxx
@@ -44,8 +44,8 @@ using namespace std;
 GeometryGUI_CheckShape::GeometryGUI_CheckShape( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CHECKSHAPE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CHECKSHAPE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "DialogBox_CHECKSHAPE" );
@@ -170,7 +170,7 @@ void GeometryGUI_CheckShape::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_CircleDlg.cxx b/src/GEOMGUI/GeometryGUI_CircleDlg.cxx
index c4a698e47..4a9ac3dd9 100644
--- a/src/GEOMGUI/GeometryGUI_CircleDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_CircleDlg.cxx
@@ -41,8 +41,8 @@ using namespace std;
 GeometryGUI_CircleDlg::GeometryGUI_CircleDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CIRCLE_PV")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CIRCLE_PV")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_CircleDlg" );
@@ -190,7 +190,7 @@ void GeometryGUI_CircleDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);  
   myEdgeFilter   = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
diff --git a/src/GEOMGUI/GeometryGUI_CommonDlg.cxx b/src/GEOMGUI/GeometryGUI_CommonDlg.cxx
index c492ba107..259462dd8 100644
--- a/src/GEOMGUI/GeometryGUI_CommonDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_CommonDlg.cxx
@@ -39,8 +39,8 @@ using namespace std;
 GeometryGUI_CommonDlg::GeometryGUI_CommonDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_COMMON")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_COMMON")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_CommonDlg" );
@@ -177,7 +177,7 @@ void GeometryGUI_CommonDlg::Init( SALOME_Selection* Sel )
 
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   
   // TODO previous selection into argument
diff --git a/src/GEOMGUI/GeometryGUI_CompoundDlg.cxx b/src/GEOMGUI/GeometryGUI_CompoundDlg.cxx
index 6414b74a3..af81f9811 100644
--- a/src/GEOMGUI/GeometryGUI_CompoundDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_CompoundDlg.cxx
@@ -37,8 +37,8 @@ using namespace std;
 GeometryGUI_CompoundDlg::GeometryGUI_CompoundDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BUILD_COMPOUND")));
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
     if ( !name )
 	setName( "GeometryGUI_CompoundDlg" );
     resize( 303, 175 ); 
@@ -160,7 +160,7 @@ void GeometryGUI_CompoundDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_ConeDlg.cxx b/src/GEOMGUI/GeometryGUI_ConeDlg.cxx
index 16244f461..47a6758e1 100644
--- a/src/GEOMGUI/GeometryGUI_ConeDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_ConeDlg.cxx
@@ -42,9 +42,9 @@ using namespace std;
 GeometryGUI_ConeDlg::GeometryGUI_ConeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CONE_PV")));
-  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-  QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CONE_DXYZ")));
+  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CONE_PV")));
+  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+  QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CONE_DXYZ")));
 
     if ( !name )
 	setName( "GeometryGUI_ConeDlg" );
@@ -285,7 +285,7 @@ void GeometryGUI_ConeDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);  
   myEdgeFilter   = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
diff --git a/src/GEOMGUI/GeometryGUI_CutDlg.cxx b/src/GEOMGUI/GeometryGUI_CutDlg.cxx
index 377b4c713..e7fdf0ed1 100644
--- a/src/GEOMGUI/GeometryGUI_CutDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_CutDlg.cxx
@@ -40,8 +40,8 @@ using namespace std;
 GeometryGUI_CutDlg::GeometryGUI_CutDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CUT")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CUT")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
       setName( "GeometryGUI_CutDlg" );
@@ -178,7 +178,7 @@ void GeometryGUI_CutDlg::Init( SALOME_Selection* Sel )
 
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   
   // TODO previous selection into argument ?
diff --git a/src/GEOMGUI/GeometryGUI_CylinderDlg.cxx b/src/GEOMGUI/GeometryGUI_CylinderDlg.cxx
index efbd6a96a..259e1610d 100644
--- a/src/GEOMGUI/GeometryGUI_CylinderDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_CylinderDlg.cxx
@@ -40,9 +40,9 @@ using namespace std;
 GeometryGUI_CylinderDlg::GeometryGUI_CylinderDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CYLINDER_PV")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_CYLINDER_DXYZ")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CYLINDER_PV")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_CYLINDER_DXYZ")));
     
     if ( !name )
       setName( "GeometryGUI_CylinderDlg" );
@@ -263,7 +263,7 @@ void GeometryGUI_CylinderDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);  
   myEdgeFilter   = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
diff --git a/src/GEOMGUI/GeometryGUI_DistanceDlg.cxx b/src/GEOMGUI/GeometryGUI_DistanceDlg.cxx
index f51ebd222..49fa6d2aa 100644
--- a/src/GEOMGUI/GeometryGUI_DistanceDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_DistanceDlg.cxx
@@ -52,8 +52,8 @@ using namespace std;
 GeometryGUI_DistanceDlg::GeometryGUI_DistanceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MINDIST")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MINDIST")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_DistanceDlg" );
@@ -202,7 +202,7 @@ void GeometryGUI_DistanceDlg::Init( SALOME_Selection* Sel )
 
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   
   // TODO previous selection into argument ?
diff --git a/src/GEOMGUI/GeometryGUI_EdgeDlg.cxx b/src/GEOMGUI/GeometryGUI_EdgeDlg.cxx
index db05f6682..1d3645c1b 100644
--- a/src/GEOMGUI/GeometryGUI_EdgeDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_EdgeDlg.cxx
@@ -39,8 +39,8 @@ using namespace std;
 GeometryGUI_EdgeDlg::GeometryGUI_EdgeDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BUILD_EDGE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BUILD_EDGE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_EdgeDlg" );
@@ -178,7 +178,7 @@ void GeometryGUI_EdgeDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filters definition */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
   mySelection->AddFilter(myVertexFilter) ; /* first filter used */
diff --git a/src/GEOMGUI/GeometryGUI_FaceDlg.cxx b/src/GEOMGUI/GeometryGUI_FaceDlg.cxx
index d9a75c62b..80a07eb8f 100644
--- a/src/GEOMGUI/GeometryGUI_FaceDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_FaceDlg.cxx
@@ -41,8 +41,8 @@ using namespace std;
 GeometryGUI_FaceDlg::GeometryGUI_FaceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BUILD_FACE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BUILD_FACE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_FaceDlg" );
@@ -171,7 +171,7 @@ void GeometryGUI_FaceDlg::Init( SALOME_Selection* Sel )
   // TODO previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myWireFilter = new GEOM_ShapeTypeFilter( TopAbs_WIRE, myGeom );
   mySelection->AddFilter(myWireFilter) ; /* first filter used */
diff --git a/src/GEOMGUI/GeometryGUI_FilletDlg.cxx b/src/GEOMGUI/GeometryGUI_FilletDlg.cxx
index ae13260df..3e576b111 100644
--- a/src/GEOMGUI/GeometryGUI_FilletDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_FilletDlg.cxx
@@ -55,10 +55,10 @@ GeometryGUI_FilletDlg::GeometryGUI_FilletDlg( QWidget* parent,
   : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
     /***************************************************************/
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FILLET_ALL")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FILLET_EDGE")));
-    QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FILLET_FACE")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FILLET_ALL")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FILLET_EDGE")));
+    QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FILLET_FACE")));
 
     if ( !name )
 	setName( "GeometryGUI_FilletDlg" );
@@ -321,7 +321,7 @@ void GeometryGUI_FilletDlg::Init( SALOME_Selection* Sel, Handle (AIS_Interactive
   mySimulationTopoDs.Nullify() ;
   
   /* Filters definition */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_FillingDlg.cxx b/src/GEOMGUI/GeometryGUI_FillingDlg.cxx
index be165f4cc..11039f97b 100644
--- a/src/GEOMGUI/GeometryGUI_FillingDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_FillingDlg.cxx
@@ -45,8 +45,8 @@ GeometryGUI_FillingDlg::GeometryGUI_FillingDlg( QWidget* parent,
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
 
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FILLING")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FILLING")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_FillingDlg" );
@@ -389,7 +389,7 @@ void GeometryGUI_FillingDlg::Init( SALOME_Selection* Sel )
   // TODO previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myCompoundFilter = new GEOM_ShapeTypeFilter( TopAbs_COMPOUND, myGeom );
   /* first filter used */
diff --git a/src/GEOMGUI/GeometryGUI_FillingHoleDlg.cxx b/src/GEOMGUI/GeometryGUI_FillingHoleDlg.cxx
index 03288c3d0..3f3ae753e 100644
--- a/src/GEOMGUI/GeometryGUI_FillingHoleDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_FillingHoleDlg.cxx
@@ -44,8 +44,8 @@ GeometryGUI_FillingHoleDlg::GeometryGUI_FillingHoleDlg( QWidget* parent,
   : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
   
-  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SEWING")));
-  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SEWING")));
+  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
   
   if ( !name )
     setName( "GeometryGUI_FillingHoleDlg" );
@@ -187,7 +187,7 @@ void GeometryGUI_FillingHoleDlg::Init( SALOME_Selection* Sel, Handle (AIS_Intera
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_FuseDlg.cxx b/src/GEOMGUI/GeometryGUI_FuseDlg.cxx
index 939111ae8..bc6a1c8b6 100644
--- a/src/GEOMGUI/GeometryGUI_FuseDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_FuseDlg.cxx
@@ -40,8 +40,8 @@ using namespace std;
 GeometryGUI_FuseDlg::GeometryGUI_FuseDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-     QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_FUSE")));
-     QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+     QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_FUSE")));
+     QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_FuseDlg" );
@@ -178,7 +178,7 @@ void GeometryGUI_FuseDlg::Init( SALOME_Selection* Sel )
 
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   
   // TODO previous selection into argument ?
diff --git a/src/GEOMGUI/GeometryGUI_InertiaDlg.cxx b/src/GEOMGUI/GeometryGUI_InertiaDlg.cxx
index 42542395a..3f1307ce5 100644
--- a/src/GEOMGUI/GeometryGUI_InertiaDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_InertiaDlg.cxx
@@ -34,8 +34,8 @@ using namespace std;
 GeometryGUI_InertiaDlg::GeometryGUI_InertiaDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_INERTIA")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_INERTIA")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
     
     if ( !name )
 	setName( "GeometryGUI_InertiaDlg" );
@@ -269,7 +269,7 @@ void GeometryGUI_InertiaDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_LineDlg.cxx b/src/GEOMGUI/GeometryGUI_LineDlg.cxx
index 95e24fecb..075278222 100644
--- a/src/GEOMGUI/GeometryGUI_LineDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_LineDlg.cxx
@@ -42,10 +42,10 @@ GeometryGUI_LineDlg::GeometryGUI_LineDlg( QWidget* parent, const char* name, SAL
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
 
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_LINE_2P")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_LINE_PV")));
-    QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_LINE_EDGE")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2P")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_PV")));
+    QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_EDGE")));
 
     if ( !name )
 	setName( "GeometryGUI_LineDlg" );
@@ -184,7 +184,7 @@ void GeometryGUI_LineDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filters definition */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
   myEdgeFilter   = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );
diff --git a/src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx b/src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx
index 9079c764c..b1d06cc81 100644
--- a/src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_MaxToleranceDlg.cxx
@@ -45,8 +45,8 @@ using namespace std;
 GeometryGUI_MaxToleranceDlg::GeometryGUI_MaxToleranceDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_TOLERANCE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_TOLERANCE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_MaxToleranceDlg" );
@@ -244,7 +244,7 @@ void GeometryGUI_MaxToleranceDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_MirrorDlg.cxx b/src/GEOMGUI/GeometryGUI_MirrorDlg.cxx
index dc2f2d51b..dc6f715f3 100644
--- a/src/GEOMGUI/GeometryGUI_MirrorDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_MirrorDlg.cxx
@@ -45,8 +45,8 @@ GeometryGUI_MirrorDlg::GeometryGUI_MirrorDlg( QWidget* parent,  const char* name
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
     
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MIRROR")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MIRROR")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_MirrorDlg" );
@@ -181,7 +181,7 @@ void GeometryGUI_MirrorDlg::Init( SALOME_Selection* Sel )
 
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);  
   /* Filter definition */
   
diff --git a/src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx b/src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx
index 3bd4ac8a6..985fd7b02 100644
--- a/src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_MultiRotationDlg.cxx
@@ -53,9 +53,9 @@ using namespace std;
 GeometryGUI_MultiRotationDlg::GeometryGUI_MultiRotationDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MULTIROTATION_SIMPLE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MULTIROTATION_DOUBLE")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MULTIROTATION_SIMPLE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MULTIROTATION_DOUBLE")));
 
     if ( !name )
 	setName( "GeometryGUI_MultiTranlationDlg" );
@@ -357,7 +357,7 @@ void GeometryGUI_MultiRotationDlg::Init( SALOME_Selection* Sel )
   // TODO : set previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
 
diff --git a/src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx b/src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx
index a13ab6dba..8e15b3af2 100644
--- a/src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_MultiTranslationDlg.cxx
@@ -49,9 +49,9 @@ using namespace std;
 GeometryGUI_MultiTranslationDlg::GeometryGUI_MultiTranslationDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MULTITRANSLATION_SIMPLE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_MULTITRANSLATION_DOUBLE")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MULTITRANSLATION_SIMPLE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_MULTITRANSLATION_DOUBLE")));
 
     if ( !name )
 	setName( "GeometryGUI_MultiTranlationDlg" );
@@ -394,7 +394,7 @@ void GeometryGUI_MultiTranslationDlg::Init( SALOME_Selection* Sel )
   // TODO : set previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
 
diff --git a/src/GEOMGUI/GeometryGUI_OrientationDlg.cxx b/src/GEOMGUI/GeometryGUI_OrientationDlg.cxx
index 6491e64ef..2d268f3a3 100644
--- a/src/GEOMGUI/GeometryGUI_OrientationDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_OrientationDlg.cxx
@@ -46,8 +46,8 @@ using namespace std;
 GeometryGUI_OrientationDlg::GeometryGUI_OrientationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_ORIENTATION")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_ORIENTATION")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
     if ( !name )
 	setName( "GeometryGUI_OrientationDlg" );
     resize( 303, 242 ); 
@@ -195,7 +195,7 @@ void GeometryGUI_OrientationDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_PartitionDlg.cxx b/src/GEOMGUI/GeometryGUI_PartitionDlg.cxx
index a4ff5e285..14d5064a2 100644
--- a/src/GEOMGUI/GeometryGUI_PartitionDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_PartitionDlg.cxx
@@ -36,8 +36,8 @@ using namespace std;
 GeometryGUI_PartitionDlg::GeometryGUI_PartitionDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PARTITION")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PARTITION")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 //    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PARTITION_KEEP_FACES")));
 
     if ( !name )
@@ -225,7 +225,7 @@ void GeometryGUI_PartitionDlg::Init( SALOME_Selection* Sel )
   myLimit = ComboBox1->currentItem();
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_PipeDlg.cxx b/src/GEOMGUI/GeometryGUI_PipeDlg.cxx
index ec26aa5c3..c25bd6b2d 100644
--- a/src/GEOMGUI/GeometryGUI_PipeDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_PipeDlg.cxx
@@ -43,8 +43,8 @@ using namespace std;
 GeometryGUI_PipeDlg::GeometryGUI_PipeDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PIPE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PIPE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_PipeDlg" );
@@ -181,7 +181,7 @@ void GeometryGUI_PipeDlg::Init( SALOME_Selection* Sel )
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
   mySimulationTopoDs.Nullify() ;
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   
   // TODO : previous selection into argument ?
diff --git a/src/GEOMGUI/GeometryGUI_PlaneDlg.cxx b/src/GEOMGUI/GeometryGUI_PlaneDlg.cxx
index eec07cc53..11c17f678 100644
--- a/src/GEOMGUI/GeometryGUI_PlaneDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_PlaneDlg.cxx
@@ -50,10 +50,10 @@ GeometryGUI_PlaneDlg::GeometryGUI_PlaneDlg( QWidget* parent, const char* name, S
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
     /***************************************************************/
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PLANE_PV")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PLANE_DXYZ")));
-    QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PLANE_FACE")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PLANE_PV")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PLANE_DXYZ")));
+    QPixmap image3(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PLANE_FACE")));
 
     if ( !name )
 	setName( "GeometryGUI_PlaneDlg" );
@@ -356,7 +356,7 @@ void GeometryGUI_PlaneDlg::Init( SALOME_Selection* Sel )
   // TODO previous selection into argument ?
   
   /* Filters definition */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
   myEdgeFilter   = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );
diff --git a/src/GEOMGUI/GeometryGUI_PointDlg.cxx b/src/GEOMGUI/GeometryGUI_PointDlg.cxx
index a7167fab3..043cb7cd9 100644
--- a/src/GEOMGUI/GeometryGUI_PointDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_PointDlg.cxx
@@ -58,9 +58,9 @@ GeometryGUI_PointDlg::GeometryGUI_PointDlg( QWidget* parent,
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
 
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_POINT")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_POINT_EDGE")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_POINT")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_POINT_EDGE")));
 
     if ( !name )
 	setName( "GeometryGUI_PointDlg" );
@@ -259,7 +259,7 @@ void GeometryGUI_PointDlg::Init(SALOME_Selection* Sel, const Handle(AIS_Interact
   Constructor1->setChecked( TRUE );
 
   /* filter for the second constructor */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );
   
diff --git a/src/GEOMGUI/GeometryGUI_PrismDlg.cxx b/src/GEOMGUI/GeometryGUI_PrismDlg.cxx
index 51108b041..c6187c7bd 100644
--- a/src/GEOMGUI/GeometryGUI_PrismDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_PrismDlg.cxx
@@ -46,8 +46,8 @@ GeometryGUI_PrismDlg::GeometryGUI_PrismDlg( QWidget* parent, const char* name, S
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
 
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_PRISM")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_PRISM")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_PrismDlg" );
@@ -208,7 +208,7 @@ void GeometryGUI_PrismDlg::Init( SALOME_Selection* Sel )
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
   
   /* Retrieves geom component */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   /* Filters definition */
   myEdgeFilter = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );
diff --git a/src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx b/src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx
index 4881826c0..aabd80c82 100644
--- a/src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_PropertiesDlg.cxx
@@ -40,8 +40,8 @@ using namespace std;
 GeometryGUI_PropertiesDlg::GeometryGUI_PropertiesDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BASICPROPERTIES")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BASICPROPERTIES")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_PropertiesDlg" );
@@ -186,7 +186,7 @@ void GeometryGUI_PropertiesDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_RevolDlg.cxx b/src/GEOMGUI/GeometryGUI_RevolDlg.cxx
index ef153c0c9..5ee825929 100644
--- a/src/GEOMGUI/GeometryGUI_RevolDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_RevolDlg.cxx
@@ -42,8 +42,8 @@ using namespace std;
 GeometryGUI_RevolDlg::GeometryGUI_RevolDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_REVOL")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_REVOL")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_RevolDlg" );
@@ -206,7 +206,7 @@ void GeometryGUI_RevolDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
 
diff --git a/src/GEOMGUI/GeometryGUI_RotationDlg.cxx b/src/GEOMGUI/GeometryGUI_RotationDlg.cxx
index 596bba315..56a5d2aa8 100644
--- a/src/GEOMGUI/GeometryGUI_RotationDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_RotationDlg.cxx
@@ -43,8 +43,8 @@ using namespace std;
 GeometryGUI_RotationDlg::GeometryGUI_RotationDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_ROTATION")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_ROTATION")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_RotationDlg" );
@@ -201,7 +201,7 @@ void GeometryGUI_RotationDlg::Init( SALOME_Selection* Sel )
   // TODO : set previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myEdgeFilter = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
 
diff --git a/src/GEOMGUI/GeometryGUI_ScaleDlg.cxx b/src/GEOMGUI/GeometryGUI_ScaleDlg.cxx
index 1e2fde27b..ec45a8740 100644
--- a/src/GEOMGUI/GeometryGUI_ScaleDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_ScaleDlg.cxx
@@ -41,8 +41,8 @@ using namespace std;
 GeometryGUI_ScaleDlg::GeometryGUI_ScaleDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SCALE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SCALE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_ScaleDlg" );
@@ -188,7 +188,7 @@ void GeometryGUI_ScaleDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filters definition */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
   mySelection->AddFilter(myVertexFilter) ; /* first filter used */
diff --git a/src/GEOMGUI/GeometryGUI_SectionDlg.cxx b/src/GEOMGUI/GeometryGUI_SectionDlg.cxx
index 5a1833610..f44de3f77 100644
--- a/src/GEOMGUI/GeometryGUI_SectionDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_SectionDlg.cxx
@@ -41,8 +41,8 @@ using namespace std;
 GeometryGUI_SectionDlg::GeometryGUI_SectionDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SECTION")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SECTION")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_SectionDlg" );
@@ -177,7 +177,7 @@ void GeometryGUI_SectionDlg::Init( SALOME_Selection* Sel )
 
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   
   // TODO previous selection into argument ?
diff --git a/src/GEOMGUI/GeometryGUI_SewingDlg.cxx b/src/GEOMGUI/GeometryGUI_SewingDlg.cxx
index 7a19eafc5..ed360d71c 100644
--- a/src/GEOMGUI/GeometryGUI_SewingDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_SewingDlg.cxx
@@ -40,8 +40,8 @@ using namespace std;
 GeometryGUI_SewingDlg::GeometryGUI_SewingDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SEWING")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SEWING")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_SewingDlg" );
@@ -176,7 +176,7 @@ void GeometryGUI_SewingDlg::Init( SALOME_Selection* Sel )
   // TODO previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_ShellDlg.cxx b/src/GEOMGUI/GeometryGUI_ShellDlg.cxx
index 431f860f8..55ab26a0a 100644
--- a/src/GEOMGUI/GeometryGUI_ShellDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_ShellDlg.cxx
@@ -38,8 +38,8 @@ using namespace std;
 GeometryGUI_ShellDlg::GeometryGUI_ShellDlg( QWidget* parent, const char* name, SALOME_Selection* Sel = 0, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SHELL")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SHELL")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
     if ( !name )
 	setName( "GeometryGUI_ShellDlg" );
     resize( 303, 190 ); 
@@ -158,7 +158,7 @@ void GeometryGUI_ShellDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_SphereDlg.cxx b/src/GEOMGUI/GeometryGUI_SphereDlg.cxx
index f30de814b..4e1379257 100644
--- a/src/GEOMGUI/GeometryGUI_SphereDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_SphereDlg.cxx
@@ -43,9 +43,9 @@ using namespace std;
 GeometryGUI_SphereDlg::GeometryGUI_SphereDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SPHERE_P")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SPHERE_DXYZ")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SPHERE_P")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SPHERE_DXYZ")));
 
     if ( !name )
       setName( "GeometryGUI_SphereDlg" );
@@ -220,7 +220,7 @@ void GeometryGUI_SphereDlg::Init( SALOME_Selection* Sel )
   myGeomGUI->SetActiveDialogBox( (QDialog*)this ) ;  
   
   /* Filters definition */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
   mySelection->AddFilter(myVertexFilter) ; /* first filter used */
diff --git a/src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx b/src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx
index ed83b6ed6..1a9c6bd84 100644
--- a/src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_SubShapeDlg.cxx
@@ -52,8 +52,8 @@ GeometryGUI_SubShapeDlg::GeometryGUI_SubShapeDlg( QWidget* parent,
   
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SUBSHAPE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SUBSHAPE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_SUBSHAPE" );
@@ -211,7 +211,7 @@ void GeometryGUI_SubShapeDlg::Init( SALOME_Selection* Sel, Handle (AIS_Interacti
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx b/src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx
index 40062160d..caa6d8555 100644
--- a/src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_SuppressFacesDlg.cxx
@@ -43,8 +43,8 @@ GeometryGUI_SuppressFacesDlg::GeometryGUI_SuppressFacesDlg( QWidget* parent,
 							    WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SUPRESS_FACE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SUPRESS_FACE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
     
     if ( !name )
 	setName( "GeometryGUI_SuppressFacesDlg" );
@@ -187,7 +187,7 @@ void GeometryGUI_SuppressFacesDlg::Init( SALOME_Selection* Sel, Handle (AIS_Inte
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_SuppressHoleDlg.cxx b/src/GEOMGUI/GeometryGUI_SuppressHoleDlg.cxx
index 1b3189bf9..0bf985313 100644
--- a/src/GEOMGUI/GeometryGUI_SuppressHoleDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_SuppressHoleDlg.cxx
@@ -50,9 +50,9 @@ GeometryGUI_SuppressHoleDlg::GeometryGUI_SuppressHoleDlg( QWidget* parent,
   : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
   
-  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SUPRESS_HOLE")));
-  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-  QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_SUPRESS_HOLE_FACE_SHELL")));
+  QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SUPRESS_HOLE")));
+  QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+  QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_SUPRESS_HOLE_FACE_SHELL")));
 
   if ( !name )
     setName( "GeometryGUI_SuppressHoleDlg" );
@@ -287,7 +287,7 @@ void GeometryGUI_SuppressHoleDlg::Init( SALOME_Selection* Sel, Handle (AIS_Inter
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_Swig.cxx b/src/GEOMGUI/GeometryGUI_Swig.cxx
index b38d9d15d..36c28fa24 100644
--- a/src/GEOMGUI/GeometryGUI_Swig.cxx
+++ b/src/GEOMGUI/GeometryGUI_Swig.cxx
@@ -39,24 +39,24 @@ using namespace std;
 
 static GEOM_Client ShapeReader;
 
-GeometryGUI_Swig::GeometryGUI_Swig()
+GEOM_Swig::GEOM_Swig()
 {
   // MESSAGE("Constructeur");
 }
 
-GeometryGUI_Swig::~GeometryGUI_Swig()
+GEOM_Swig::~GEOM_Swig()
 {
   // MESSAGE("Destructeur");
 }
 
-void GeometryGUI_Swig::createAndDisplayGO(const char* Entry)
+void GEOM_Swig::createAndDisplayGO(const char* Entry)
 {
   // MESSAGE("createAndDisplayGO");
   QAD_Study* ActiveStudy = QAD_Application::getDesktop()->getActiveStudy();
   SALOMEDS::Study_var aStudy = ActiveStudy->getStudyDocument();
   SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   GEOM::GEOM_Gen_var Geom = GEOM::GEOM_Gen::_narrow(comp);
 
   Standard_CString Fatherior = "";
@@ -133,9 +133,9 @@ void GeometryGUI_Swig::createAndDisplayGO(const char* Entry)
   ActiveStudy->updateObjBrowser( true );
 }
 
-int  GeometryGUI_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
+int  GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
 {
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   GEOM::GEOM_Gen_var  Geom = GEOM::GEOM_Gen::_narrow(comp);
  
   GEOM::GEOM_Shape_var aMainShape = Geom->GetIORFromString(IOR);
@@ -158,9 +158,9 @@ int  GeometryGUI_Swig::getIndexTopology(const char* SubIOR, const char* IOR)
   return -1;
 }
 
-const char* GeometryGUI_Swig::getShapeTypeString(const char* IOR)
+const char* GEOM_Swig::getShapeTypeString(const char* IOR)
 {
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   GEOM::GEOM_Gen_var  Geom = GEOM::GEOM_Gen::_narrow(comp);
  
   GEOM::GEOM_Shape_var aShape = Geom->GetIORFromString(IOR);
@@ -225,9 +225,9 @@ const char* GeometryGUI_Swig::getShapeTypeString(const char* IOR)
 }
 
 
-const char* GeometryGUI_Swig::getShapeTypeIcon(const char* IOR)
+const char* GEOM_Swig::getShapeTypeIcon(const char* IOR)
 {
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   GEOM::GEOM_Gen_var  Geom = GEOM::GEOM_Gen::_narrow(comp);
  
   GEOM::GEOM_Shape_var aShape = Geom->GetIORFromString(IOR);
@@ -258,7 +258,7 @@ const char* GeometryGUI_Swig::getShapeTypeIcon(const char* IOR)
   return "None";
 }
 
-void GeometryGUI_Swig::setDisplayMode(const char* Entry, int mode)
+void GEOM_Swig::setDisplayMode(const char* Entry, int mode)
 {
   QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy();
   Handle(SALOME_InteractiveObject) IO = 
@@ -278,7 +278,7 @@ void GeometryGUI_Swig::setDisplayMode(const char* Entry, int mode)
     }
 }
 
-void GeometryGUI_Swig::setColor(const char* Entry, int red, int green, int blue)
+void GEOM_Swig::setColor(const char* Entry, int red, int green, int blue)
 {
   QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy();
   QColor c = QColor (red, green, blue);
@@ -298,7 +298,7 @@ void GeometryGUI_Swig::setColor(const char* Entry, int red, int green, int blue)
     }
 }
 
-void GeometryGUI_Swig::setTransparency(const char* Entry, float transp)
+void GEOM_Swig::setTransparency(const char* Entry, float transp)
 {
   QAD_Study* myStudy = QAD_Application::getDesktop()->getActiveStudy();
   Handle(SALOME_InteractiveObject) IO = 
diff --git a/src/GEOMGUI/GeometryGUI_Swig.hxx b/src/GEOMGUI/GeometryGUI_Swig.hxx
index 34d0bcae6..cf457489f 100644
--- a/src/GEOMGUI/GeometryGUI_Swig.hxx
+++ b/src/GEOMGUI/GeometryGUI_Swig.hxx
@@ -16,11 +16,11 @@
 
 class GEOM_Client;
 
-class GeometryGUI_Swig
+class GEOM_Swig
 {
 public:
-  GeometryGUI_Swig();
-  ~GeometryGUI_Swig();
+  GEOM_Swig();
+  ~GEOM_Swig();
 
   void createAndDisplayGO(const char* Entry);
   void setDisplayMode(const char* Entry, int mode);
diff --git a/src/GEOMGUI/GeometryGUI_Swig.i b/src/GEOMGUI/GeometryGUI_Swig.i
index 9ebc5b22b..d693ca4c8 100644
--- a/src/GEOMGUI/GeometryGUI_Swig.i
+++ b/src/GEOMGUI/GeometryGUI_Swig.i
@@ -10,11 +10,11 @@
 #include "GeometryGUI_Swig.hxx"
 %}
 
-class GeometryGUI_Swig
+class GEOM_Swig
 {
  public:
-  GeometryGUI_Swig();
-  ~GeometryGUI_Swig();
+  GEOM_Swig();
+  ~GEOM_Swig();
 
   void createAndDisplayGO(const char* Entry);
   int  getIndexTopology(const char *SubEntry, const char *Entry);
diff --git a/src/GEOMGUI/GeometryGUI_TorusDlg.cxx b/src/GEOMGUI/GeometryGUI_TorusDlg.cxx
index 4e7aaca2c..cc53337d0 100644
--- a/src/GEOMGUI/GeometryGUI_TorusDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_TorusDlg.cxx
@@ -44,9 +44,9 @@ GeometryGUI_TorusDlg::GeometryGUI_TorusDlg( QWidget* parent, const char* name, S
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
 
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_TORUS_PV")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_TORUS_DXYZ")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_TORUS_PV")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_TORUS_DXYZ")));
     
     if ( !name )
 	setName( "GeometryGUI_TorusDlg" );
@@ -264,7 +264,7 @@ void GeometryGUI_TorusDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);  
   myEdgeFilter   = new GEOM_EdgeFilter( StdSelect_Line, myGeom );
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
diff --git a/src/GEOMGUI/GeometryGUI_TranslationDlg.cxx b/src/GEOMGUI/GeometryGUI_TranslationDlg.cxx
index eee0f0eb7..ac50ced6b 100644
--- a/src/GEOMGUI/GeometryGUI_TranslationDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_TranslationDlg.cxx
@@ -42,8 +42,8 @@ using namespace std;
 GeometryGUI_TranslationDlg::GeometryGUI_TranslationDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_TRANSLATION")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_TRANSLATION")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_TranslationDlg" );
@@ -218,7 +218,7 @@ void GeometryGUI_TranslationDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   // myEdgeFilter   = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );
 
diff --git a/src/GEOMGUI/GeometryGUI_VectorDlg.cxx b/src/GEOMGUI/GeometryGUI_VectorDlg.cxx
index 751806349..d33144548 100644
--- a/src/GEOMGUI/GeometryGUI_VectorDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_VectorDlg.cxx
@@ -46,9 +46,9 @@ using namespace std;
 GeometryGUI_VectorDlg::GeometryGUI_VectorDlg( QWidget* parent,  const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_VECTOR_2P")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
-    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_VECTOR_DXYZ")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_VECTOR_2P")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
+    QPixmap image2(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_VECTOR_DXYZ")));
 
     if ( !name )
 	setName( "GeometryGUI_VectorDlg" );
@@ -246,7 +246,7 @@ void GeometryGUI_VectorDlg::Init( SALOME_Selection* Sel )
 
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   myVertexFilter = new GEOM_ShapeTypeFilter( TopAbs_VERTEX, myGeom );
   myEdgeFilter   = new GEOM_ShapeTypeFilter( TopAbs_EDGE, myGeom );
diff --git a/src/GEOMGUI/GeometryGUI_WhatisDlg.cxx b/src/GEOMGUI/GeometryGUI_WhatisDlg.cxx
index f5c8d6d9d..a332ce5c9 100644
--- a/src/GEOMGUI/GeometryGUI_WhatisDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_WhatisDlg.cxx
@@ -45,8 +45,8 @@ using namespace std;
 GeometryGUI_WhatisDlg::GeometryGUI_WhatisDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_WHATIS")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_WHATIS")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_WhatisDlg" );
@@ -164,7 +164,7 @@ void GeometryGUI_WhatisDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument ?
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_WireDlg.cxx b/src/GEOMGUI/GeometryGUI_WireDlg.cxx
index cfd91073f..fc174fb3f 100644
--- a/src/GEOMGUI/GeometryGUI_WireDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_WireDlg.cxx
@@ -38,8 +38,8 @@ using namespace std;
 GeometryGUI_WireDlg::GeometryGUI_WireDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_BUILD_WIRE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_BUILD_WIRE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_WireDlg" );
@@ -160,7 +160,7 @@ void GeometryGUI_WireDlg::Init( SALOME_Selection* Sel )
   // TODO : previous selection into argument
 
   /* Filter definitions */
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
 
   /* signals and slots connections */
diff --git a/src/GEOMGUI/GeometryGUI_WorkingPlaneDlg.cxx b/src/GEOMGUI/GeometryGUI_WorkingPlaneDlg.cxx
index ec93a4b1c..f8704e502 100644
--- a/src/GEOMGUI/GeometryGUI_WorkingPlaneDlg.cxx
+++ b/src/GEOMGUI/GeometryGUI_WorkingPlaneDlg.cxx
@@ -42,8 +42,8 @@ using namespace std;
 GeometryGUI_WorkingPlaneDlg::GeometryGUI_WorkingPlaneDlg( QWidget* parent, const char* name, SALOME_Selection* Sel, bool modal, WFlags fl )
     : QDialog( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
 {
-    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_DLG_WPLANE_FACE")));
-    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GeometryGUI",tr("ICON_SELECT")));
+    QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_DLG_WPLANE_FACE")));
+    QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap( "GEOM",tr("ICON_SELECT")));
 
     if ( !name )
 	setName( "GeometryGUI_WorkingPlaneDlg" );
@@ -164,7 +164,7 @@ void GeometryGUI_WorkingPlaneDlg::Init( SALOME_Selection* Sel )
 
   // TODO : previous selection into argument ?
 
-  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "Geometry");
+  Engines::Component_var comp = QAD_Application::getDesktop()->getEngine("FactoryServer", "GEOM");
   myGeom = GEOM::GEOM_Gen::_narrow(comp);
   /* Filter definition */
   myFaceFilter = new GEOM_FaceFilter( StdSelect_Plane, myGeom );