diff --git a/Fltk/contextWindow.cpp b/Fltk/contextWindow.cpp
index 2ea5d1cc41dc68e72c42820ca7b59da1ab1dbbcc..0ad25e834f6996d29a60d73fd1d9ce937edeacca 100644
--- a/Fltk/contextWindow.cpp
+++ b/Fltk/contextWindow.cpp
@@ -97,11 +97,11 @@ static void draw_stl(std::vector<SPoint3> &vertices,
 
 static void elementary_add_parameter_cb(Fl_Widget *w, void *data)
 {
-  add_param(FlGui::instance()->elementaryContext->input[0]->value(),
-            FlGui::instance()->elementaryContext->input[1]->value(),
-            FlGui::instance()->elementaryContext->input[2]->value(),
-            FlGui::instance()->elementaryContext->input[3]->value(),
-            GModel::current()->getFileName());
+  scriptAddParameter(FlGui::instance()->elementaryContext->input[0]->value(),
+                     FlGui::instance()->elementaryContext->input[1]->value(),
+                     FlGui::instance()->elementaryContext->input[2]->value(),
+                     FlGui::instance()->elementaryContext->input[3]->value(),
+                     GModel::current()->getFileName());
   FlGui::instance()->resetVisibility();
   FlGui::instance()->rebuildTree(true);
 }
@@ -122,11 +122,11 @@ static void elementary_draw_point_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_point_cb(Fl_Widget *w, void *data)
 {
-  add_point(GModel::current()->getFileName(),
-            FlGui::instance()->elementaryContext->input[4]->value(),
-            FlGui::instance()->elementaryContext->input[5]->value(),
-            FlGui::instance()->elementaryContext->input[6]->value(),
-            FlGui::instance()->elementaryContext->input[7]->value());
+  scriptAddPoint(GModel::current()->getFileName(),
+                 FlGui::instance()->elementaryContext->input[4]->value(),
+                 FlGui::instance()->elementaryContext->input[5]->value(),
+                 FlGui::instance()->elementaryContext->input[6]->value(),
+                 FlGui::instance()->elementaryContext->input[7]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -173,13 +173,13 @@ static void elementary_draw_circle_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_circle_cb(Fl_Widget *w, void *data)
 {
-  add_circle(GModel::current()->getFileName(),
-             FlGui::instance()->elementaryContext->input[8]->value(),
-             FlGui::instance()->elementaryContext->input[9]->value(),
-             FlGui::instance()->elementaryContext->input[10]->value(),
-             FlGui::instance()->elementaryContext->input[11]->value(),
-             FlGui::instance()->elementaryContext->input[12]->value(),
-             FlGui::instance()->elementaryContext->input[13]->value());
+  scriptAddCircle(GModel::current()->getFileName(),
+                  FlGui::instance()->elementaryContext->input[8]->value(),
+                  FlGui::instance()->elementaryContext->input[9]->value(),
+                  FlGui::instance()->elementaryContext->input[10]->value(),
+                  FlGui::instance()->elementaryContext->input[11]->value(),
+                  FlGui::instance()->elementaryContext->input[12]->value(),
+                  FlGui::instance()->elementaryContext->input[13]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -227,14 +227,14 @@ static void elementary_draw_ellipse_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_ellipse_cb(Fl_Widget *w, void *data)
 {
-  add_ellipse(GModel::current()->getFileName(),
-              FlGui::instance()->elementaryContext->input[14]->value(),
-              FlGui::instance()->elementaryContext->input[15]->value(),
-              FlGui::instance()->elementaryContext->input[16]->value(),
-              FlGui::instance()->elementaryContext->input[17]->value(),
-              FlGui::instance()->elementaryContext->input[18]->value(),
-              FlGui::instance()->elementaryContext->input[19]->value(),
-              FlGui::instance()->elementaryContext->input[20]->value());
+  scriptAddEllipse(GModel::current()->getFileName(),
+                   FlGui::instance()->elementaryContext->input[14]->value(),
+                   FlGui::instance()->elementaryContext->input[15]->value(),
+                   FlGui::instance()->elementaryContext->input[16]->value(),
+                   FlGui::instance()->elementaryContext->input[17]->value(),
+                   FlGui::instance()->elementaryContext->input[18]->value(),
+                   FlGui::instance()->elementaryContext->input[19]->value(),
+                   FlGui::instance()->elementaryContext->input[20]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -273,12 +273,12 @@ static void elementary_draw_disk_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_disk_cb(Fl_Widget *w, void *data)
 {
-  add_disk(GModel::current()->getFileName(),
-           FlGui::instance()->elementaryContext->input[21]->value(),
-           FlGui::instance()->elementaryContext->input[22]->value(),
-           FlGui::instance()->elementaryContext->input[23]->value(),
-           FlGui::instance()->elementaryContext->input[24]->value(),
-           FlGui::instance()->elementaryContext->input[25]->value());
+  scriptAddDisk(GModel::current()->getFileName(),
+                FlGui::instance()->elementaryContext->input[21]->value(),
+                FlGui::instance()->elementaryContext->input[22]->value(),
+                FlGui::instance()->elementaryContext->input[23]->value(),
+                FlGui::instance()->elementaryContext->input[24]->value(),
+                FlGui::instance()->elementaryContext->input[25]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -319,13 +319,13 @@ static void elementary_draw_rectangle_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_rectangle_cb(Fl_Widget *w, void *data)
 {
-  add_rectangle(GModel::current()->getFileName(),
-                FlGui::instance()->elementaryContext->input[26]->value(),
-                FlGui::instance()->elementaryContext->input[27]->value(),
-                FlGui::instance()->elementaryContext->input[28]->value(),
-                FlGui::instance()->elementaryContext->input[29]->value(),
-                FlGui::instance()->elementaryContext->input[30]->value(),
-                FlGui::instance()->elementaryContext->input[31]->value());
+  scriptAddRectangle(GModel::current()->getFileName(),
+                     FlGui::instance()->elementaryContext->input[26]->value(),
+                     FlGui::instance()->elementaryContext->input[27]->value(),
+                     FlGui::instance()->elementaryContext->input[28]->value(),
+                     FlGui::instance()->elementaryContext->input[29]->value(),
+                     FlGui::instance()->elementaryContext->input[30]->value(),
+                     FlGui::instance()->elementaryContext->input[31]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -368,14 +368,14 @@ static void elementary_draw_sphere_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_sphere_cb(Fl_Widget *w, void *data)
 {
-  add_sphere(GModel::current()->getFileName(),
-             FlGui::instance()->elementaryContext->input[32]->value(),
-             FlGui::instance()->elementaryContext->input[33]->value(),
-             FlGui::instance()->elementaryContext->input[34]->value(),
-             FlGui::instance()->elementaryContext->input[35]->value(),
-             FlGui::instance()->elementaryContext->input[36]->value(),
-             FlGui::instance()->elementaryContext->input[37]->value(),
-             FlGui::instance()->elementaryContext->input[38]->value());
+  scriptAddSphere(GModel::current()->getFileName(),
+                  FlGui::instance()->elementaryContext->input[32]->value(),
+                  FlGui::instance()->elementaryContext->input[33]->value(),
+                  FlGui::instance()->elementaryContext->input[34]->value(),
+                  FlGui::instance()->elementaryContext->input[35]->value(),
+                  FlGui::instance()->elementaryContext->input[36]->value(),
+                  FlGui::instance()->elementaryContext->input[37]->value(),
+                  FlGui::instance()->elementaryContext->input[38]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   drawContext::setDrawGeomTransientFunction(0);
@@ -421,15 +421,15 @@ static void elementary_draw_cylinder_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_cylinder_cb(Fl_Widget *w, void *data)
 {
-  add_cylinder(GModel::current()->getFileName(),
-               FlGui::instance()->elementaryContext->input[39]->value(),
-               FlGui::instance()->elementaryContext->input[40]->value(),
-               FlGui::instance()->elementaryContext->input[41]->value(),
-               FlGui::instance()->elementaryContext->input[42]->value(),
-               FlGui::instance()->elementaryContext->input[43]->value(),
-               FlGui::instance()->elementaryContext->input[44]->value(),
-               FlGui::instance()->elementaryContext->input[45]->value(),
-               FlGui::instance()->elementaryContext->input[46]->value());
+  scriptAddCylinder(GModel::current()->getFileName(),
+                    FlGui::instance()->elementaryContext->input[39]->value(),
+                    FlGui::instance()->elementaryContext->input[40]->value(),
+                    FlGui::instance()->elementaryContext->input[41]->value(),
+                    FlGui::instance()->elementaryContext->input[42]->value(),
+                    FlGui::instance()->elementaryContext->input[43]->value(),
+                    FlGui::instance()->elementaryContext->input[44]->value(),
+                    FlGui::instance()->elementaryContext->input[45]->value(),
+                    FlGui::instance()->elementaryContext->input[46]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -470,13 +470,13 @@ static void elementary_draw_box_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_box_cb(Fl_Widget *w, void *data)
 {
-  add_box(GModel::current()->getFileName(),
-          FlGui::instance()->elementaryContext->input[47]->value(),
-          FlGui::instance()->elementaryContext->input[48]->value(),
-          FlGui::instance()->elementaryContext->input[49]->value(),
-          FlGui::instance()->elementaryContext->input[50]->value(),
-          FlGui::instance()->elementaryContext->input[51]->value(),
-          FlGui::instance()->elementaryContext->input[52]->value());
+  scriptAddBox(GModel::current()->getFileName(),
+               FlGui::instance()->elementaryContext->input[47]->value(),
+               FlGui::instance()->elementaryContext->input[48]->value(),
+               FlGui::instance()->elementaryContext->input[49]->value(),
+               FlGui::instance()->elementaryContext->input[50]->value(),
+               FlGui::instance()->elementaryContext->input[51]->value(),
+               FlGui::instance()->elementaryContext->input[52]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -517,13 +517,13 @@ static void elementary_draw_torus_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_torus_cb(Fl_Widget *w, void *data)
 {
-  add_torus(GModel::current()->getFileName(),
-            FlGui::instance()->elementaryContext->input[53]->value(),
-            FlGui::instance()->elementaryContext->input[54]->value(),
-            FlGui::instance()->elementaryContext->input[55]->value(),
-            FlGui::instance()->elementaryContext->input[56]->value(),
-            FlGui::instance()->elementaryContext->input[57]->value(),
-            FlGui::instance()->elementaryContext->input[58]->value());
+  scriptAddTorus(GModel::current()->getFileName(),
+                 FlGui::instance()->elementaryContext->input[53]->value(),
+                 FlGui::instance()->elementaryContext->input[54]->value(),
+                 FlGui::instance()->elementaryContext->input[55]->value(),
+                 FlGui::instance()->elementaryContext->input[56]->value(),
+                 FlGui::instance()->elementaryContext->input[57]->value(),
+                 FlGui::instance()->elementaryContext->input[58]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -570,16 +570,16 @@ static void elementary_draw_cone_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_cone_cb(Fl_Widget *w, void *data)
 {
-  add_cone(GModel::current()->getFileName(),
-           FlGui::instance()->elementaryContext->input[59]->value(),
-           FlGui::instance()->elementaryContext->input[60]->value(),
-           FlGui::instance()->elementaryContext->input[61]->value(),
-           FlGui::instance()->elementaryContext->input[62]->value(),
-           FlGui::instance()->elementaryContext->input[63]->value(),
-           FlGui::instance()->elementaryContext->input[64]->value(),
-           FlGui::instance()->elementaryContext->input[65]->value(),
-           FlGui::instance()->elementaryContext->input[66]->value(),
-           FlGui::instance()->elementaryContext->input[67]->value());
+  scriptAddCone(GModel::current()->getFileName(),
+                FlGui::instance()->elementaryContext->input[59]->value(),
+                FlGui::instance()->elementaryContext->input[60]->value(),
+                FlGui::instance()->elementaryContext->input[61]->value(),
+                FlGui::instance()->elementaryContext->input[62]->value(),
+                FlGui::instance()->elementaryContext->input[63]->value(),
+                FlGui::instance()->elementaryContext->input[64]->value(),
+                FlGui::instance()->elementaryContext->input[65]->value(),
+                FlGui::instance()->elementaryContext->input[66]->value(),
+                FlGui::instance()->elementaryContext->input[67]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -622,14 +622,14 @@ static void elementary_draw_wedge_cb(Fl_Widget *w, void *data)
 
 static void elementary_add_wedge_cb(Fl_Widget *w, void *data)
 {
-  add_wedge(GModel::current()->getFileName(),
-            FlGui::instance()->elementaryContext->input[68]->value(),
-            FlGui::instance()->elementaryContext->input[69]->value(),
-            FlGui::instance()->elementaryContext->input[70]->value(),
-            FlGui::instance()->elementaryContext->input[71]->value(),
-            FlGui::instance()->elementaryContext->input[72]->value(),
-            FlGui::instance()->elementaryContext->input[73]->value(),
-            FlGui::instance()->elementaryContext->input[74]->value());
+  scriptAddWedge(GModel::current()->getFileName(),
+                 FlGui::instance()->elementaryContext->input[68]->value(),
+                 FlGui::instance()->elementaryContext->input[69]->value(),
+                 FlGui::instance()->elementaryContext->input[70]->value(),
+                 FlGui::instance()->elementaryContext->input[71]->value(),
+                 FlGui::instance()->elementaryContext->input[72]->value(),
+                 FlGui::instance()->elementaryContext->input[73]->value(),
+                 FlGui::instance()->elementaryContext->input[74]->value());
   FlGui::instance()->resetVisibility();
   GModel::current()->setSelection(0);
   SetBoundingBox();
@@ -683,9 +683,7 @@ elementaryContextWindow::elementaryContextWindow(int deltaFontSize)
       input[2]->value("");
       input[3] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Path");
       input[3]->value("Parameters");
-      for(int i = 0; i < 4; i++) {
-        input[i]->align(FL_ALIGN_RIGHT);
-      }
+      for(int i = 0; i < 4; i++) { input[i]->align(FL_ALIGN_RIGHT); }
       {
         Fl_Button *o = new Fl_Button(width - BB - 2 * WB,
                                      height - 3 * WB - 2 * BH, BB, BH, "Add");
@@ -1156,9 +1154,7 @@ transformContextWindow::transformContextWindow(int deltaFontSize)
       input[1]->value("0");
       input[2] = new Fl_Input(2 * WB, 2 * WB + 3 * BH, IW, BH, "DZ");
       input[2]->value("1");
-      for(int i = 0; i < 3; i++) {
-        input[i]->align(FL_ALIGN_RIGHT);
-      }
+      for(int i = 0; i < 3; i++) { input[i]->align(FL_ALIGN_RIGHT); }
       butt[0] = new Fl_Check_Button(2 * WB, 2 * WB + 4 * BH, width - 4 * WB, BH,
                                     "Apply translation on copy");
       butt[0]->value(0);
@@ -1194,9 +1190,7 @@ transformContextWindow::transformContextWindow(int deltaFontSize)
       input[8]->value("0");
       input[9] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Angle");
       input[9]->value("Pi/4");
-      for(int i = 3; i < 10; i++) {
-        input[i]->align(FL_ALIGN_RIGHT);
-      }
+      for(int i = 3; i < 10; i++) { input[i]->align(FL_ALIGN_RIGHT); }
       butt[1] = new Fl_Check_Button(2 * WB, 2 * WB + 5 * BH, width - 4 * WB, BH,
                                     "Apply rotation on copy");
       butt[1]->value(0);
@@ -1227,9 +1221,7 @@ transformContextWindow::transformContextWindow(int deltaFontSize)
       input[14]->value("0.5");
       input[15] = new Fl_Input(2 * WB, 2 * WB + 6 * BH, IW, BH, "Scale Z");
       input[15]->value("0.5");
-      for(int i = 10; i < 16; i++) {
-        input[i]->align(FL_ALIGN_RIGHT);
-      }
+      for(int i = 10; i < 16; i++) { input[i]->align(FL_ALIGN_RIGHT); }
       butt[2] = new Fl_Check_Button(2 * WB, 2 * WB + 7 * BH, width - 4 * WB, BH,
                                     "Apply scaling on copy");
       butt[2]->value(0);
@@ -1247,9 +1239,7 @@ transformContextWindow::transformContextWindow(int deltaFontSize)
       input[18]->value("0");
       input[19] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Plane D");
       input[19]->value("1");
-      for(int i = 16; i < 20; i++) {
-        input[i]->align(FL_ALIGN_RIGHT);
-      }
+      for(int i = 16; i < 20; i++) { input[i]->align(FL_ALIGN_RIGHT); }
       butt[3] = new Fl_Check_Button(2 * WB, 2 * WB + 5 * BH, width - 4 * WB, BH,
                                     "Apply symmetry on copy");
       butt[3]->value(0);
@@ -1328,9 +1318,7 @@ void transformContextWindow::show(int pane, bool extrude, bool selection)
     choice->activate();
   else
     choice->deactivate();
-  if(pane < 0 || pane > 6) {
-    group[0]->show();
-  }
+  if(pane < 0 || pane > 6) { group[0]->show(); }
   else {
     group[pane]->show();
     group[pane]->activate();
@@ -1371,9 +1359,7 @@ meshContextWindow::meshContextWindow(int deltaFontSize)
       input[1]->value("10");
       input[2] = new Fl_Input(2 * WB, 2 * WB + 3 * BH, IW, BH, "Parameter");
       input[2]->value("1");
-      for(int i = 1; i < 3; i++) {
-        input[i]->align(FL_ALIGN_RIGHT);
-      }
+      for(int i = 1; i < 3; i++) { input[i]->align(FL_ALIGN_RIGHT); }
       static Fl_Menu_Item menu_trsf_mesh[] = {
         {"Progression", 0, 0, 0}, {"Bump", 0, 0, 0}, {0}};
       choice[0] = new Fl_Choice(2 * WB, 2 * WB + 2 * BH, IW, BH, "Type");
diff --git a/Fltk/fieldWindow.cpp b/Fltk/fieldWindow.cpp
index 0f8d713c6a4803d5af8b036ce8a1c388ec60371c..00aef80c9d363e19a07a81166b23c0cf7bb9129e 100644
--- a/Fltk/fieldWindow.cpp
+++ b/Fltk/fieldWindow.cpp
@@ -39,7 +39,7 @@ void field_cb(Fl_Widget *w, void *data)
 static void field_delete_cb(Fl_Widget *w, void *data)
 {
   Field *f = (Field *)FlGui::instance()->fields->editor_group->user_data();
-  delete_field(f->id, GModel::current()->getFileName());
+  scriptDeleteField(f->id, GModel::current()->getFileName());
   FlGui::instance()->fields->editField(NULL);
 }
 
@@ -48,7 +48,7 @@ static void field_new_cb(Fl_Widget *w, void *data)
   Fl_Menu_Button *mb = ((Fl_Menu_Button *)w);
   FieldManager *fields = GModel::current()->getFields();
   int id = fields->newId();
-  add_field(id, mb->text(), GModel::current()->getFileName());
+  scriptAddField(id, mb->text(), GModel::current()->getFileName());
   if((*fields)[id]) FlGui::instance()->fields->editField((*fields)[id]);
 }
 
@@ -60,9 +60,7 @@ static void field_apply_cb(Fl_Widget *w, void *data)
 static void field_browser_cb(Fl_Widget *w, void *data)
 {
   int selected = FlGui::instance()->fields->browser->value();
-  if(!selected) {
-    FlGui::instance()->fields->editField(NULL);
-  }
+  if(!selected) { FlGui::instance()->fields->editField(NULL); }
   Field *f = (Field *)FlGui::instance()->fields->browser->data(selected);
   FlGui::instance()->fields->editField(f);
 }
@@ -289,8 +287,8 @@ void fieldWindow::saveFieldOptions()
     } break;
     }
     if((*input)->changed()) {
-      add_field_option(f->id, it->first, sstream.str(),
-                       GModel::current()->getFileName());
+      scriptAddFieldOption(f->id, it->first, sstream.str(),
+                           GModel::current()->getFileName());
       (*input)->clear_changed();
     }
     input++;
@@ -298,11 +296,11 @@ void fieldWindow::saveFieldOptions()
   int is_bg_field = background_btn->value();
   FieldManager &fields = *GModel::current()->getFields();
   if(is_bg_field && fields.getBackgroundField() != f->id) {
-    set_background_field(f->id, GModel::current()->getFileName());
+    scriptSetBackgroundField(f->id, GModel::current()->getFileName());
     loadFieldList();
   }
   if(!is_bg_field && fields.getBackgroundField() == f->id) {
-    set_background_field(-1, GModel::current()->getFileName());
+    scriptSetBackgroundField(-1, GModel::current()->getFileName());
     loadFieldList();
   }
 }
@@ -352,18 +350,20 @@ void fieldWindow::loadFieldOptions()
     (*input)->clear_changed();
     input++;
   }
-  if(dynamic_cast<BoundaryLayerField*>(f)){
+  if(dynamic_cast<BoundaryLayerField *>(f)) {
     background_btn->value(0);
     background_btn->deactivate();
-    background_btn->tooltip("Boundary layer fields cannot be assigned in the "
-                            "graphical user interface: edit the file directly.");
+    background_btn->tooltip(
+      "Boundary layer fields cannot be assigned in the "
+      "graphical user interface: edit the file directly.");
   }
-  else{
-    background_btn->value(GModel::current()->getFields()->getBackgroundField() ==
-                          f->id);
+  else {
+    background_btn->value(
+      GModel::current()->getFields()->getBackgroundField() == f->id);
     background_btn->activate();
-    background_btn->tooltip("Only a single field can be set as background field.\n"
-                            "To combine multiple fields use the Min or Max fields.");
+    background_btn->tooltip(
+      "Only a single field can be set as background field.\n"
+      "To combine multiple fields use the Min or Max fields.");
   }
 }
 
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 0bd89e85b7562f6f03264e15287cf8eaee1df2f6..2e2fe31dc074f64eea45373c1ef6268d8691970f 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -723,108 +723,108 @@ static void add_new_point_based_entity(const std::string &what, int pane)
     if(ib == 'e'){
       switch(pane){
       case 1:
-        add_point(GModel::current()->getFileName(),
-                  FlGui::instance()->elementaryContext->input[4]->value(),
-                  FlGui::instance()->elementaryContext->input[5]->value(),
-                  FlGui::instance()->elementaryContext->input[6]->value(),
-                  FlGui::instance()->elementaryContext->input[7]->value());
+        scriptAddPoint(GModel::current()->getFileName(),
+                       FlGui::instance()->elementaryContext->input[4]->value(),
+                       FlGui::instance()->elementaryContext->input[5]->value(),
+                       FlGui::instance()->elementaryContext->input[6]->value(),
+                       FlGui::instance()->elementaryContext->input[7]->value());
         break;
       case 2:
-        add_circle(GModel::current()->getFileName(),
-                   FlGui::instance()->elementaryContext->input[8]->value(),
-                   FlGui::instance()->elementaryContext->input[9]->value(),
-                   FlGui::instance()->elementaryContext->input[10]->value(),
-                   FlGui::instance()->elementaryContext->input[11]->value(),
-                   FlGui::instance()->elementaryContext->input[12]->value(),
-                   FlGui::instance()->elementaryContext->input[13]->value());
+        scriptAddCircle(GModel::current()->getFileName(),
+                        FlGui::instance()->elementaryContext->input[8]->value(),
+                        FlGui::instance()->elementaryContext->input[9]->value(),
+                        FlGui::instance()->elementaryContext->input[10]->value(),
+                        FlGui::instance()->elementaryContext->input[11]->value(),
+                        FlGui::instance()->elementaryContext->input[12]->value(),
+                        FlGui::instance()->elementaryContext->input[13]->value());
         break;
       case 3:
-        add_ellipse(GModel::current()->getFileName(),
-                    FlGui::instance()->elementaryContext->input[14]->value(),
-                    FlGui::instance()->elementaryContext->input[15]->value(),
-                    FlGui::instance()->elementaryContext->input[16]->value(),
-                    FlGui::instance()->elementaryContext->input[17]->value(),
-                    FlGui::instance()->elementaryContext->input[18]->value(),
-                    FlGui::instance()->elementaryContext->input[19]->value(),
-                    FlGui::instance()->elementaryContext->input[20]->value());
+        scriptAddEllipse(GModel::current()->getFileName(),
+                         FlGui::instance()->elementaryContext->input[14]->value(),
+                         FlGui::instance()->elementaryContext->input[15]->value(),
+                         FlGui::instance()->elementaryContext->input[16]->value(),
+                         FlGui::instance()->elementaryContext->input[17]->value(),
+                         FlGui::instance()->elementaryContext->input[18]->value(),
+                         FlGui::instance()->elementaryContext->input[19]->value(),
+                         FlGui::instance()->elementaryContext->input[20]->value());
         break;
       case 4:
-        add_disk(GModel::current()->getFileName(),
-                 FlGui::instance()->elementaryContext->input[21]->value(),
-                 FlGui::instance()->elementaryContext->input[22]->value(),
-                 FlGui::instance()->elementaryContext->input[23]->value(),
-                 FlGui::instance()->elementaryContext->input[24]->value(),
-                 FlGui::instance()->elementaryContext->input[25]->value());
+        scriptAddDisk(GModel::current()->getFileName(),
+                      FlGui::instance()->elementaryContext->input[21]->value(),
+                      FlGui::instance()->elementaryContext->input[22]->value(),
+                      FlGui::instance()->elementaryContext->input[23]->value(),
+                      FlGui::instance()->elementaryContext->input[24]->value(),
+                      FlGui::instance()->elementaryContext->input[25]->value());
         break;
       case 5:
-        add_rectangle(GModel::current()->getFileName(),
-                      FlGui::instance()->elementaryContext->input[26]->value(),
-                      FlGui::instance()->elementaryContext->input[27]->value(),
-                      FlGui::instance()->elementaryContext->input[28]->value(),
-                      FlGui::instance()->elementaryContext->input[29]->value(),
-                      FlGui::instance()->elementaryContext->input[30]->value(),
-                      FlGui::instance()->elementaryContext->input[31]->value());
+        scriptAddRectangle(GModel::current()->getFileName(),
+                           FlGui::instance()->elementaryContext->input[26]->value(),
+                           FlGui::instance()->elementaryContext->input[27]->value(),
+                           FlGui::instance()->elementaryContext->input[28]->value(),
+                           FlGui::instance()->elementaryContext->input[29]->value(),
+                           FlGui::instance()->elementaryContext->input[30]->value(),
+                           FlGui::instance()->elementaryContext->input[31]->value());
         break;
       case 6:
-        add_sphere(GModel::current()->getFileName(),
-                   FlGui::instance()->elementaryContext->input[32]->value(),
-                   FlGui::instance()->elementaryContext->input[33]->value(),
-                   FlGui::instance()->elementaryContext->input[34]->value(),
-                   FlGui::instance()->elementaryContext->input[35]->value(),
-                   FlGui::instance()->elementaryContext->input[36]->value(),
-                   FlGui::instance()->elementaryContext->input[37]->value(),
-                   FlGui::instance()->elementaryContext->input[38]->value());
+        scriptAddSphere(GModel::current()->getFileName(),
+                        FlGui::instance()->elementaryContext->input[32]->value(),
+                        FlGui::instance()->elementaryContext->input[33]->value(),
+                        FlGui::instance()->elementaryContext->input[34]->value(),
+                        FlGui::instance()->elementaryContext->input[35]->value(),
+                        FlGui::instance()->elementaryContext->input[36]->value(),
+                        FlGui::instance()->elementaryContext->input[37]->value(),
+                        FlGui::instance()->elementaryContext->input[38]->value());
         break;
       case 7:
-        add_cylinder(GModel::current()->getFileName(),
-                     FlGui::instance()->elementaryContext->input[39]->value(),
-                     FlGui::instance()->elementaryContext->input[40]->value(),
-                     FlGui::instance()->elementaryContext->input[41]->value(),
-                     FlGui::instance()->elementaryContext->input[42]->value(),
-                     FlGui::instance()->elementaryContext->input[43]->value(),
-                     FlGui::instance()->elementaryContext->input[44]->value(),
-                     FlGui::instance()->elementaryContext->input[45]->value(),
-                     FlGui::instance()->elementaryContext->input[46]->value());
+        scriptAddCylinder(GModel::current()->getFileName(),
+                          FlGui::instance()->elementaryContext->input[39]->value(),
+                          FlGui::instance()->elementaryContext->input[40]->value(),
+                          FlGui::instance()->elementaryContext->input[41]->value(),
+                          FlGui::instance()->elementaryContext->input[42]->value(),
+                          FlGui::instance()->elementaryContext->input[43]->value(),
+                          FlGui::instance()->elementaryContext->input[44]->value(),
+                          FlGui::instance()->elementaryContext->input[45]->value(),
+                          FlGui::instance()->elementaryContext->input[46]->value());
         break;
       case 8:
-        add_box(GModel::current()->getFileName(),
-                FlGui::instance()->elementaryContext->input[47]->value(),
-                FlGui::instance()->elementaryContext->input[48]->value(),
-                FlGui::instance()->elementaryContext->input[49]->value(),
-                FlGui::instance()->elementaryContext->input[50]->value(),
-                FlGui::instance()->elementaryContext->input[51]->value(),
-                FlGui::instance()->elementaryContext->input[52]->value());
+        scriptAddBox(GModel::current()->getFileName(),
+                     FlGui::instance()->elementaryContext->input[47]->value(),
+                     FlGui::instance()->elementaryContext->input[48]->value(),
+                     FlGui::instance()->elementaryContext->input[49]->value(),
+                     FlGui::instance()->elementaryContext->input[50]->value(),
+                     FlGui::instance()->elementaryContext->input[51]->value(),
+                     FlGui::instance()->elementaryContext->input[52]->value());
         break;
       case 9:
-        add_torus(GModel::current()->getFileName(),
-                  FlGui::instance()->elementaryContext->input[53]->value(),
-                  FlGui::instance()->elementaryContext->input[54]->value(),
-                  FlGui::instance()->elementaryContext->input[55]->value(),
-                  FlGui::instance()->elementaryContext->input[56]->value(),
-                  FlGui::instance()->elementaryContext->input[57]->value(),
-                  FlGui::instance()->elementaryContext->input[58]->value());
+        scriptAddTorus(GModel::current()->getFileName(),
+                       FlGui::instance()->elementaryContext->input[53]->value(),
+                       FlGui::instance()->elementaryContext->input[54]->value(),
+                       FlGui::instance()->elementaryContext->input[55]->value(),
+                       FlGui::instance()->elementaryContext->input[56]->value(),
+                       FlGui::instance()->elementaryContext->input[57]->value(),
+                       FlGui::instance()->elementaryContext->input[58]->value());
         break;
       case 10:
-        add_cone(GModel::current()->getFileName(),
-                 FlGui::instance()->elementaryContext->input[59]->value(),
-                 FlGui::instance()->elementaryContext->input[60]->value(),
-                 FlGui::instance()->elementaryContext->input[61]->value(),
-                 FlGui::instance()->elementaryContext->input[62]->value(),
-                 FlGui::instance()->elementaryContext->input[63]->value(),
-                 FlGui::instance()->elementaryContext->input[64]->value(),
-                 FlGui::instance()->elementaryContext->input[65]->value(),
-                 FlGui::instance()->elementaryContext->input[66]->value(),
-                 FlGui::instance()->elementaryContext->input[67]->value());
+        scriptAddCone(GModel::current()->getFileName(),
+                      FlGui::instance()->elementaryContext->input[59]->value(),
+                      FlGui::instance()->elementaryContext->input[60]->value(),
+                      FlGui::instance()->elementaryContext->input[61]->value(),
+                      FlGui::instance()->elementaryContext->input[62]->value(),
+                      FlGui::instance()->elementaryContext->input[63]->value(),
+                      FlGui::instance()->elementaryContext->input[64]->value(),
+                      FlGui::instance()->elementaryContext->input[65]->value(),
+                      FlGui::instance()->elementaryContext->input[66]->value(),
+                      FlGui::instance()->elementaryContext->input[67]->value());
         break;
       case 11:
-        add_wedge(GModel::current()->getFileName(),
-                  FlGui::instance()->elementaryContext->input[68]->value(),
-                  FlGui::instance()->elementaryContext->input[69]->value(),
-                  FlGui::instance()->elementaryContext->input[70]->value(),
-                  FlGui::instance()->elementaryContext->input[71]->value(),
-                  FlGui::instance()->elementaryContext->input[72]->value(),
-                  FlGui::instance()->elementaryContext->input[73]->value(),
-                  FlGui::instance()->elementaryContext->input[74]->value());
+        scriptAddWedge(GModel::current()->getFileName(),
+                       FlGui::instance()->elementaryContext->input[68]->value(),
+                       FlGui::instance()->elementaryContext->input[69]->value(),
+                       FlGui::instance()->elementaryContext->input[70]->value(),
+                       FlGui::instance()->elementaryContext->input[71]->value(),
+                       FlGui::instance()->elementaryContext->input[72]->value(),
+                       FlGui::instance()->elementaryContext->input[73]->value(),
+                       FlGui::instance()->elementaryContext->input[74]->value());
         break;
       }
       FlGui::instance()->resetVisibility();
@@ -874,7 +874,7 @@ static void add_new_multiline(const std::string &type)
     }
     if(ib == 'e') {
       if(p.size() >= 2)
-        add_multline(type, p, GModel::current()->getFileName());
+        scriptAddCurve(type, p, GModel::current()->getFileName());
       FlGui::instance()->resetVisibility();
       GModel::current()->setSelection(0);
       drawContext::global()->draw();
@@ -935,7 +935,7 @@ static void add_new_line()
       break;
     }
     if(p.size() == 2) {
-      add_multline("Line", p, GModel::current()->getFileName());
+      scriptAddCurve("Line", p, GModel::current()->getFileName());
       FlGui::instance()->resetVisibility();
       GModel::current()->setSelection(0);
       drawContext::global()->draw();
@@ -986,7 +986,8 @@ static void add_new_circle_arc()
       break;
     }
     if(p.size() == 3) {
-      add_circle_arc(p[0], p[1], p[2], GModel::current()->getFileName()); // begin, center, end
+      // begin, center, end
+      scriptAddCircleArc(p[0], p[1], p[2], GModel::current()->getFileName());
       FlGui::instance()->resetVisibility();
       GModel::current()->setSelection(0);
       drawContext::global()->draw();
@@ -1040,7 +1041,7 @@ static void add_new_ellipse_arc()
       break;
     }
     if(p.size() == 4) {
-      add_ellipse_arc(p[0], p[1], p[2], p[3], GModel::current()->getFileName());
+      scriptAddEllipseArc(p[0], p[1], p[2], p[3], GModel::current()->getFileName());
       FlGui::instance()->resetVisibility();
       GModel::current()->setSelection(0);
       drawContext::global()->draw();
@@ -1151,9 +1152,9 @@ static void add_new_surface_volume(int mode)
           FlGui::instance()->selectedFaces[0]->tag();
         if(selectContour(type, num, List1)) {
           if(type == ENT_CURVE)
-            add_lineloop(List1, GModel::current()->getFileName(), &num);
+            scriptAddCurveLoop(List1, GModel::current()->getFileName(), &num);
           else
-            add_surfloop(List1, GModel::current()->getFileName(), &num);
+            scriptAddSurfaceLoop(List1, GModel::current()->getFileName(), &num);
           List_Reset(List1);
           List_Add(List2, &num);
           while(1) {
@@ -1202,9 +1203,9 @@ static void add_new_surface_volume(int mode)
                   FlGui::instance()->selectedFaces[i]->tag();
                 if(selectContour(type, num, List1)) {
                   if(type == ENT_CURVE)
-                    add_lineloop(List1, GModel::current()->getFileName(), &num);
+                    scriptAddCurveLoop(List1, GModel::current()->getFileName(), &num);
                   else
-                    add_surfloop(List1, GModel::current()->getFileName(), &num);
+                    scriptAddSurfaceLoop(List1, GModel::current()->getFileName(), &num);
                   List_Reset(List1);
                   List_Add(List2, &num);
                 }
@@ -1218,11 +1219,11 @@ static void add_new_surface_volume(int mode)
           List_Unique(List2,fcmp_absint);
           if(List_Nbr(List2)) {
             switch (mode) {
-            case 0: add_surf("Plane Surface", List2,
-                             GModel::current()->getFileName()); break;
-            case 1: add_surf("Surface", List2,
-                             GModel::current()->getFileName()); break;
-            case 2: add_vol(List2, GModel::current()->getFileName()); break;
+            case 0: scriptAddSurface("Plane Surface", List2,
+                                     GModel::current()->getFileName()); break;
+            case 1: scriptAddSurface("Surface", List2,
+                                     GModel::current()->getFileName()); break;
+            case 2: scriptAddVolume(List2, GModel::current()->getFileName()); break;
             }
             FlGui::instance()->resetVisibility();
             GModel::current()->setSelection(0);
@@ -1245,7 +1246,7 @@ static void geometry_elementary_set_factory_cb(Fl_Widget *w, void *data)
 {
   if(!data) return;
   std::string str((const char*)data);
-  set_factory(str, GModel::current()->getFileName());
+  scriptSetFactory(str, GModel::current()->getFileName());
   if(FlGui::available())
     Msg::StatusBar(false, "Setting %s factory", str.c_str());
 }
@@ -1437,66 +1438,66 @@ static void action_point_line_surface_volume(int action, const std::string &onwh
       if(dimTags.size()){
         switch (action) {
         case 0:
-          translate(GModel::current()->getFileName(), dimTags,
-                    FlGui::instance()->transformContext->input[0]->value(),
-                    FlGui::instance()->transformContext->input[1]->value(),
-                    FlGui::instance()->transformContext->input[2]->value(),
-                    FlGui::instance()->transformContext->butt[0]->value());
+          scriptTranslate(GModel::current()->getFileName(), dimTags,
+                          FlGui::instance()->transformContext->input[0]->value(),
+                          FlGui::instance()->transformContext->input[1]->value(),
+                          FlGui::instance()->transformContext->input[2]->value(),
+                          FlGui::instance()->transformContext->butt[0]->value());
           break;
         case 1:
-          rotate(GModel::current()->getFileName(), dimTags,
-                 FlGui::instance()->transformContext->input[6]->value(),
-                 FlGui::instance()->transformContext->input[7]->value(),
-                 FlGui::instance()->transformContext->input[8]->value(),
-                 FlGui::instance()->transformContext->input[3]->value(),
-                 FlGui::instance()->transformContext->input[4]->value(),
-                 FlGui::instance()->transformContext->input[5]->value(),
-                 FlGui::instance()->transformContext->input[9]->value(),
-                 FlGui::instance()->transformContext->butt[1]->value());
+          scriptRotate(GModel::current()->getFileName(), dimTags,
+                       FlGui::instance()->transformContext->input[6]->value(),
+                       FlGui::instance()->transformContext->input[7]->value(),
+                       FlGui::instance()->transformContext->input[8]->value(),
+                       FlGui::instance()->transformContext->input[3]->value(),
+                       FlGui::instance()->transformContext->input[4]->value(),
+                       FlGui::instance()->transformContext->input[5]->value(),
+                       FlGui::instance()->transformContext->input[9]->value(),
+                       FlGui::instance()->transformContext->butt[1]->value());
           break;
         case 2:
-          dilate(GModel::current()->getFileName(), dimTags,
-                 FlGui::instance()->transformContext->input[10]->value(),
-                 FlGui::instance()->transformContext->input[11]->value(),
-                 FlGui::instance()->transformContext->input[12]->value(),
-                 FlGui::instance()->transformContext->input[13]->value(),
-                 FlGui::instance()->transformContext->input[14]->value(),
-                 FlGui::instance()->transformContext->input[15]->value(),
-                 FlGui::instance()->transformContext->butt[2]->value());
+          scriptDilate(GModel::current()->getFileName(), dimTags,
+                       FlGui::instance()->transformContext->input[10]->value(),
+                       FlGui::instance()->transformContext->input[11]->value(),
+                       FlGui::instance()->transformContext->input[12]->value(),
+                       FlGui::instance()->transformContext->input[13]->value(),
+                       FlGui::instance()->transformContext->input[14]->value(),
+                       FlGui::instance()->transformContext->input[15]->value(),
+                       FlGui::instance()->transformContext->butt[2]->value());
           break;
         case 3:
-          symmetry(GModel::current()->getFileName(), dimTags,
-                   FlGui::instance()->transformContext->input[16]->value(),
-                   FlGui::instance()->transformContext->input[17]->value(),
-                   FlGui::instance()->transformContext->input[18]->value(),
-                   FlGui::instance()->transformContext->input[19]->value(),
-                   FlGui::instance()->transformContext->butt[3]->value());
+          scriptMirror(GModel::current()->getFileName(), dimTags,
+                       FlGui::instance()->transformContext->input[16]->value(),
+                       FlGui::instance()->transformContext->input[17]->value(),
+                       FlGui::instance()->transformContext->input[18]->value(),
+                       FlGui::instance()->transformContext->input[19]->value(),
+                       FlGui::instance()->transformContext->butt[3]->value());
           break;
         case 4:
-          extrude(GModel::current()->getFileName(), dimTags,
-                  FlGui::instance()->transformContext->input[0]->value(),
-                  FlGui::instance()->transformContext->input[1]->value(),
-                  FlGui::instance()->transformContext->input[2]->value(),
-                  FlGui::instance()->transformContext->butt[7]->value(),
-                  FlGui::instance()->transformContext->input[21]->value(),
-                  FlGui::instance()->transformContext->butt[8]->value());
+          scriptExtrude(GModel::current()->getFileName(), dimTags,
+                        FlGui::instance()->transformContext->input[0]->value(),
+                        FlGui::instance()->transformContext->input[1]->value(),
+                        FlGui::instance()->transformContext->input[2]->value(),
+                        FlGui::instance()->transformContext->butt[7]->value(),
+                        FlGui::instance()->transformContext->input[21]->value(),
+                        FlGui::instance()->transformContext->butt[8]->value());
           break;
         case 5:
-          protude(GModel::current()->getFileName(), dimTags,
-                  FlGui::instance()->transformContext->input[6]->value(),
-                  FlGui::instance()->transformContext->input[7]->value(),
-                  FlGui::instance()->transformContext->input[8]->value(),
-                  FlGui::instance()->transformContext->input[3]->value(),
-                  FlGui::instance()->transformContext->input[4]->value(),
-                  FlGui::instance()->transformContext->input[5]->value(),
-                  FlGui::instance()->transformContext->input[9]->value(),
-                  FlGui::instance()->transformContext->butt[9]->value(),
-                  FlGui::instance()->transformContext->input[22]->value(),
-                  FlGui::instance()->transformContext->butt[10]->value());
+          scriptProtude(GModel::current()->getFileName(), dimTags,
+                        FlGui::instance()->transformContext->input[6]->value(),
+                        FlGui::instance()->transformContext->input[7]->value(),
+                        FlGui::instance()->transformContext->input[8]->value(),
+                        FlGui::instance()->transformContext->input[3]->value(),
+                        FlGui::instance()->transformContext->input[4]->value(),
+                        FlGui::instance()->transformContext->input[5]->value(),
+                        FlGui::instance()->transformContext->input[9]->value(),
+                        FlGui::instance()->transformContext->butt[9]->value(),
+                        FlGui::instance()->transformContext->input[22]->value(),
+                        FlGui::instance()->transformContext->butt[10]->value());
           break;
         case 6:
-          delete_entities(GModel::current()->getFileName(), dimTags,
-                          FlGui::instance()->transformContext->butt[6]->value());
+          scriptDeleteEntities(GModel::current()->getFileName(), dimTags,
+                               FlGui::instance()->transformContext->butt[6]->value());
           break;
         case 7:
         case 11:
@@ -1509,12 +1510,12 @@ static void action_point_line_surface_volume(int action, const std::string &onwh
                  (dimTags[i].first == 3 && what == "Volume"))
                 tags.push_back(dimTags[i].second);
             }
-            add_remove_physical(GModel::current()->getFileName(), what, tags,
-                                FlGui::instance()->physicalGroup->input[0]->value(),
-                                FlGui::instance()->physicalGroup->butt[0]->value() ? 0 :
-                                FlGui::instance()->physicalGroup->value[0]->value(),
-                                FlGui::instance()->physicalGroup->append,
-                                FlGui::instance()->physicalGroup->mode);
+            scriptRemovePhysicalGroup(GModel::current()->getFileName(), what, tags,
+                                      FlGui::instance()->physicalGroup->input[0]->value(),
+                                      FlGui::instance()->physicalGroup->butt[0]->value() ? 0 :
+                                      FlGui::instance()->physicalGroup->value[0]->value(),
+                                      FlGui::instance()->physicalGroup->append,
+                                      FlGui::instance()->physicalGroup->mode);
           }
           FlGui::instance()->physicalGroup->show(action == 7 ? false : true);
           // ask clients to update the tree using the new physical definition
@@ -1528,8 +1529,8 @@ static void action_point_line_surface_volume(int action, const std::string &onwh
                 tags.push_back(dimTags[i].second);
             }
             if(tags.size())
-              add_charlength(GModel::current()->getFileName(), tags,
-                             FlGui::instance()->meshContext->input[0]->value());
+              scriptSetCharacteristicLength(GModel::current()->getFileName(), tags,
+                                            FlGui::instance()->meshContext->input[0]->value());
           }
           break;
         case 9:
@@ -1539,7 +1540,7 @@ static void action_point_line_surface_volume(int action, const std::string &onwh
               if(dimTags[i].first == 2 && what == "Surface")
                 tags.push_back(dimTags[i].second);
             }
-            add_recosurf(GModel::current()->getFileName(), tags);
+            scriptRecombineSurface(GModel::current()->getFileName(), tags);
           }
           break;
         case 10:
@@ -1551,7 +1552,7 @@ static void action_point_line_surface_volume(int action, const std::string &onwh
                  (dimTags[i].first == 3 && what == "Volume"))
                 tags.push_back(dimTags[i].second);
             }
-            add_compound(GModel::current()->getFileName(), what, tags);
+            scriptSetCompound(GModel::current()->getFileName(), what, tags);
           }
           break;
         case 12:
@@ -1566,7 +1567,7 @@ static void action_point_line_surface_volume(int action, const std::string &onwh
             for(std::size_t i = 0; i < dimTags.size(); i++){
               if(dimTags[i].first == 1) l.push_back(dimTags[i].second);
             }
-            add_pipe(GModel::current()->getFileName(), dimTagsSaved, l);
+            scriptAddPipe(GModel::current()->getFileName(), dimTagsSaved, l);
             dimTagsSaved.clear();
           }
           break;
@@ -1741,7 +1742,7 @@ static void geometry_elementary_boolean_cb(Fl_Widget *w, void *data)
         Msg::Error("At least one tool must be selected");
       }
       else{
-        apply_boolean(GModel::current()->getFileName(), mode, object, tool,
+        scriptBoolean(GModel::current()->getFileName(), mode, object, tool,
                       FlGui::instance()->transformContext->butt[4]->value(),
                       tool.size() ?
                       FlGui::instance()->transformContext->butt[5]->value() : 0);
@@ -1829,7 +1830,7 @@ static void geometry_elementary_fillet_cb(Fl_Widget *w, void *data)
         Msg::Error("At least one curve must be selected");
       }
       else{
-        apply_fillet(GModel::current()->getFileName(), regions, edges,
+        scriptFillet(GModel::current()->getFileName(), regions, edges,
                      FlGui::instance()->transformContext->input[20]->value());
         GModel::current()->setSelection(0);
         selectRegions = true;
@@ -1878,7 +1879,7 @@ static void geometry_elementary_split_cb(Fl_Widget *w, void *data)
     if(ib == 'q')
       break;
     if(ib == 'e' && edge_to_split){
-      split_edge(edge_to_split->tag(), List1, GModel::current()->getFileName());
+      scriptSplitCurve(edge_to_split->tag(), List1, GModel::current()->getFileName());
       break;
     }
     for(std::size_t i = 0; i < FlGui::instance()->selectedVertices.size(); i++){
@@ -1896,7 +1897,7 @@ static void geometry_elementary_split_cb(Fl_Widget *w, void *data)
 
 static void geometry_elementary_coherence_cb(Fl_Widget *w, void *data)
 {
-  coherence(GModel::current()->getFileName());
+  scriptCoherence(GModel::current()->getFileName());
 }
 
 static void geometry_physical_add_cb(Fl_Widget *w, void *data)
@@ -2279,10 +2280,10 @@ static void mesh_define_transfinite(int dim)
     if(ib == 'e') {
       if(dim == 1) {
         if(p.size())
-          add_trsfline(p, GModel::current()->getFileName(),
-                       FlGui::instance()->meshContext->choice[0]->text(),
-                       FlGui::instance()->meshContext->input[2]->value(),
-                       FlGui::instance()->meshContext->input[1]->value());
+          scriptSetTransfiniteLine(p, GModel::current()->getFileName(),
+                                   FlGui::instance()->meshContext->choice[0]->text(),
+                                   FlGui::instance()->meshContext->input[2]->value(),
+                                   FlGui::instance()->meshContext->input[1]->value());
       }
       GModel::current()->setSelection(0);
       drawContext::global()->draw();
@@ -2361,14 +2362,14 @@ static void mesh_define_transfinite(int dim)
             switch (dim) {
             case 2:
               if((p.size() == 0 + 1 || p.size() == 3 + 1 || p.size() == 4 + 1))
-                add_trsfsurf(p, GModel::current()->getFileName(),
-                             FlGui::instance()->meshContext->choice[1]->text());
+                scriptSetTransfiniteSurface(p, GModel::current()->getFileName(),
+                                            FlGui::instance()->meshContext->choice[1]->text());
               else
                 Msg::Error("Wrong number of points for mesh constraint");
               break;
             case 3:
               if(p.size() == 6 + 1 || p.size() == 8 + 1)
-                add_trsfvol(p, GModel::current()->getFileName());
+                scriptSetTransfiniteVolume(p, GModel::current()->getFileName());
               else
                 Msg::Error("Wrong number of points for transfinite volume");
               break;
@@ -2492,7 +2493,7 @@ static void mesh_define_embedded_cb(Fl_Widget *w, void *data)
         drawContext::global()->draw();
         int tag = (dim == 2) ? FlGui::instance()->selectedFaces[0]->tag() :
           FlGui::instance()->selectedRegions[0]->tag();
-        add_embedded(GModel::current()->getFileName(), what, entities, dim, tag);
+        scriptEmbed(GModel::current()->getFileName(), what, entities, dim, tag);
         GModel::current()->setSelection(0);
         selectEntities = true;
         entities.clear();
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index cf8b2b4abcfd793650ea23907e6b85267e7bdfec..013eeaac4fa6a240c809f2adca6b98ce990ef27c 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -70,12 +70,12 @@ public:
   {
     if(pattern.empty()) return true;
     std::string line(getBrowserLine(false));
-    try{
+    try {
       // icase for case-insensitive search
-      if(std::regex_search(line, std::regex(pattern, std::regex_constants::icase)))
+      if(std::regex_search(line,
+                           std::regex(pattern, std::regex_constants::icase)))
         return true;
-    }
-    catch(...) {
+    } catch(...) {
       return false;
     }
     return false;
@@ -271,8 +271,10 @@ public:
         std::string name = GModel::list[i]->getName();
         if(GModel::list[i] == GModel::current()) name += " (Current Model)";
         Vis *v = new VisModel(GModel::list[i], i, name);
-        if(v->match(search)) _entities.push_back(v);
-        else delete v;
+        if(v->match(search))
+          _entities.push_back(v);
+        else
+          delete v;
       }
     }
     else if(type == ElementaryEntities) {
@@ -283,8 +285,10 @@ public:
         std::string name = m->getElementaryName(ge->dim(), ge->tag());
         if(name.empty()) name = oldLabels[ge->tag()];
         Vis *v = new VisElementary(ge, name);
-        if(v->match(search)) _entities.push_back(v);
-        else delete v;
+        if(v->match(search))
+          _entities.push_back(v);
+        else
+          delete v;
       }
     }
     else if(type == PhysicalEntities) {
@@ -297,16 +301,20 @@ public:
           std::string name = m->getPhysicalName(i, it->first);
           if(name.empty()) name = oldLabels[it->first];
           Vis *v = new VisPhysical(it->first, i, it->second, name);
-          if(v->match(search)) _entities.push_back(v);
-          else delete v;
+          if(v->match(search))
+            _entities.push_back(v);
+          else
+            delete v;
         }
       }
     }
     else if(type == MeshPartitions) {
-      for(std::size_t part = 0; part < m->getNumPartitions(); part++){
+      for(std::size_t part = 0; part < m->getNumPartitions(); part++) {
         Vis *v = new VisPartition(part + 1);
-        if(v->match(search)) _entities.push_back(v);
-        else delete v;
+        if(v->match(search))
+          _entities.push_back(v);
+        else
+          delete v;
       }
     }
     std::sort(_entities.begin(), _entities.end(), VisLessThan());
@@ -374,8 +382,8 @@ static void _rebuild_list_browser()
   VisibilityList::instance()->update(type, search);
 
   for(int i = 0; i < VisibilityList::instance()->getNumEntities(); i++) {
-    FlGui::instance()->visibility->browser->add
-      (VisibilityList::instance()->getBrowserLine(i).c_str());
+    FlGui::instance()->visibility->browser->add(
+      VisibilityList::instance()->getBrowserLine(i).c_str());
     if(VisibilityList::instance()->getVisibility(i))
       FlGui::instance()->visibility->browser->select(i + 1);
   }
@@ -798,8 +806,7 @@ void visibility_cb(Fl_Widget *w, void *data)
 
   _rebuild_list_browser();
 
-  if(tmp.find("list_only") == std::string::npos)
-    _rebuild_tree_browser(false);
+  if(tmp.find("list_only") == std::string::npos) _rebuild_tree_browser(false);
 
   FlGui::instance()->visibility->updatePerWindow(true);
 }
@@ -830,12 +837,12 @@ static void visibility_save_cb(Fl_Widget *w, void *data)
     off += state[i][0].size();
   }
   if(on > off) {
-    add_visibility_all(1, GModel::current()->getFileName());
+    scriptSetVisibilityAll(1, GModel::current()->getFileName());
     if(!off) return;
     mode = 0;
   }
   else {
-    add_visibility_all(0, GModel::current()->getFileName());
+    scriptSetVisibilityAll(0, GModel::current()->getFileName());
     if(!on) return;
     mode = 1;
   }
@@ -846,7 +853,7 @@ static void visibility_save_cb(Fl_Widget *w, void *data)
       }
     }
   }
-  add_visibility(mode, entities, GModel::current()->getFileName());
+  scriptSetVisibility(mode, entities, GModel::current()->getFileName());
   Msg::StatusBar(true, "Done appending visibility info");
 }
 
@@ -1128,9 +1135,7 @@ static void visibility_interactive_cb(Fl_Widget *w, void *data)
     if(ib == 'u' && !mode) { // undo only in hide mode
       _apply_visibility(2, physical, vertices, edges, faces, regions, elements);
     }
-    if(ib == 'q') {
-      break;
-    }
+    if(ib == 'q') { break; }
   }
 
   CTX::instance()->mesh.changed = ENT_ALL;
@@ -1145,8 +1150,7 @@ static void visibility_per_window_cb(Fl_Widget *w, void *data)
   if(what == "item") {
     drawContext *ctx =
       FlGui::instance()->getCurrentOpenglWindow()->getDrawContext();
-    for(int i = 0; i < FlGui::instance()->visibility->per_window->size();
-        i++) {
+    for(int i = 0; i < FlGui::instance()->visibility->per_window->size(); i++) {
       if(i < (int)GModel::list.size()) {
         GModel *m = GModel::list[i];
         if(FlGui::instance()->visibility->per_window->selected(i + 1))
@@ -1198,8 +1202,8 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
                                height - 3 * WB - 2 * BH, "List");
 
     {
-      Fl_Group *gg = new Fl_Group(
-        2 * WB, WB + BH, cols[0] + cols[1] + cols[2] + cols[3], BH);
+      Fl_Group *gg = new Fl_Group(2 * WB, WB + BH,
+                                  cols[0] + cols[1] + cols[2] + cols[3], BH);
 
       Fl_Button *o0 = new Fl_Button(2 * WB, 2 * WB + BH, cols[0], BH / 2, "*");
       o0->box(FL_THIN_DOWN_BOX);
@@ -1260,7 +1264,8 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
 
     static Fl_Menu_Item browser_type_table[] = {
       {"Models", 0, (Fl_Callback *)visibility_cb, (void *)"list_only"},
-      {"Elementary entities", 0, (Fl_Callback *)visibility_cb, (void *)"list_only"},
+      {"Elementary entities", 0, (Fl_Callback *)visibility_cb,
+       (void *)"list_only"},
       {"Physical groups", 0, (Fl_Callback *)visibility_cb, (void *)"list_only"},
       {"Mesh partitions", 0, (Fl_Callback *)visibility_cb, (void *)"list_only"},
       {0}};
@@ -1268,12 +1273,11 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
     double w1 = 1.7 * CC;
     double w3 = CC;
     double w2 = (width - 6 * WB - w1 - w3);
-    browser_type =
-      new Fl_Choice(2 * WB, height - 2 * BH - 3 * WB, w1, BH);
+    browser_type = new Fl_Choice(2 * WB, height - 2 * BH - 3 * WB, w1, BH);
     browser_type->menu(browser_type_table);
 
-    Fl_Group *o = new Fl_Group(2 * WB + w1 + WB, height - 2 * BH - 3 * WB,
-                               w2, BH);
+    Fl_Group *o =
+      new Fl_Group(2 * WB + w1 + WB, height - 2 * BH - 3 * WB, w2, BH);
     o->tooltip("Filter list using regular expression");
     o->box(FL_DOWN_BOX);
     o->color(FL_BACKGROUND2_COLOR);
@@ -1286,7 +1290,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
     o->end();
 
     Fl_Return_Button *b1 = new Fl_Return_Button(
-    width - 2 * WB - w3, height - 2 * BH - 3 * WB, w3, BH, "Apply");
+      width - 2 * WB - w3, height - 2 * BH - 3 * WB, w3, BH, "Apply");
     b1->callback(visibility_browser_apply_cb);
 
     g->end();
@@ -1492,8 +1496,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
   {
     int aw = (int)(3.5 * FL_NORMAL_SIZE);
 
-    Fl_Group *g =
-      new Fl_Group(WB, height - BH - WB, width - 2 * WB - CC, BH);
+    Fl_Group *g = new Fl_Group(WB, height - BH - WB, width - 2 * WB - CC, BH);
     g->resizable(NULL);
 
     Fl_Box *b = new Fl_Box(WB, height - BH - WB, aw, BH, "Apply");
@@ -1504,15 +1507,15 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
     butt[0]->type(FL_TOGGLE_BUTTON);
     butt[0]->value(1);
 
-    butt[1] = new Fl_Check_Button(WB + 3 * aw + 2 * WB, height - BH - WB, 3 * aw,
-                                  BH, "to all models");
+    butt[1] = new Fl_Check_Button(WB + 3 * aw + 2 * WB, height - BH - WB,
+                                  3 * aw, BH, "to all models");
     butt[1]->type(FL_TOGGLE_BUTTON);
     butt[1]->value(1);
 
     g->end();
 
-    Fl_Button *o1 = new Fl_Button(width - CC - WB, height - BH - WB, CC,
-                                  BH, "Save");
+    Fl_Button *o1 =
+      new Fl_Button(width - CC - WB, height - BH - WB, CC, BH, "Save");
     o1->callback(visibility_save_cb);
   }
 
@@ -1528,8 +1531,8 @@ void visibilityWindow::show(bool redrawOnly)
   static bool first = true;
   if(win->shown() && redrawOnly)
     win->redraw();
-  else{
-    if(first){
+  else {
+    if(first) {
       browser_type->value(GModel::current()->noPhysicalGroups() ? 1 : 2);
       first = false;
     }
@@ -1562,7 +1565,8 @@ void visibilityWindow::updatePerWindow(bool force)
     PView *v = PView::list[i];
     std::ostringstream sstream;
     sstream << "View [" << i << "]";
-    if(v->getData()->getName().size()) sstream << " - " << v->getData()->getName();
+    if(v->getData()->getName().size())
+      sstream << " - " << v->getData()->getName();
     per_window->add(sstream.str().c_str());
     if(ctx->isVisible(v)) per_window->select(line, 1);
     line++;
diff --git a/Geo/scriptStringInterface.cpp b/Geo/scriptStringInterface.cpp
index c6cb6aaf94ffa2e42a299aa653d64d3abd0d2ec9..fb595d7ef9c1ec6c8053c827c758a7f9cd532bbd 100644
--- a/Geo/scriptStringInterface.cpp
+++ b/Geo/scriptStringInterface.cpp
@@ -23,7 +23,8 @@
 #include "onelab.h"
 #endif
 
-static void add_infile(const std::string &text, const std::string &fileNameOrEmpty)
+static void addInFile(const std::string &text,
+                      const std::string &fileNameOrEmpty)
 {
   const std::string &fileName = fileNameOrEmpty;
   if(fileName.empty()) {
@@ -95,9 +96,7 @@ static void add_infile(const std::string &text, const std::string &fileNameOrEmp
   fprintf(tmp_file, "%s\n", text.c_str());
   fclose(tmp_file);
   gmsh_yyin = Fopen(tmpFileName.c_str(), "r");
-  while(!feof(gmsh_yyin)) {
-    gmsh_yyparse();
-  }
+  while(!feof(gmsh_yyin)) { gmsh_yyparse(); }
   fclose(gmsh_yyin);
   gmsh_yyin = gmsh_yyin_old;
 
@@ -170,7 +169,7 @@ static std::string dimTags2String(const std::vector<std::pair<int, int> > &l)
   return sstream.str();
 }
 
-static void check_occ(std::ostringstream &sstream)
+static void checkOCC(std::ostringstream &sstream)
 {
 #if defined(HAVE_PARSER)
   if(gmsh_yyfactory != "OpenCASCADE")
@@ -178,32 +177,35 @@ static void check_occ(std::ostringstream &sstream)
 #endif
 }
 
-void set_factory(const std::string &factory, const std::string &fileName)
+void scriptSetFactory(const std::string &factory, const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "SetFactory(\"" << factory << "\");";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_charlength(const std::string &fileName, const std::vector<int> &l,
-                    const std::string &lc)
+void scriptSetCharacteristicLength(const std::string &fileName,
+                                   const std::vector<int> &l,
+                                   const std::string &lc)
 {
   std::ostringstream sstream;
   sstream << "Characteristic Length {" << vector2String(l) << "} = " << lc
           << ";";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_recosurf(const std::string &fileName, const std::vector<int> &l)
+void scriptRecombineSurface(const std::string &fileName,
+                            const std::vector<int> &l)
 {
   std::ostringstream sstream;
   sstream << "Recombine Surface {" << vector2String(l) << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_trsfline(std::vector<int> &l, const std::string &fileName,
-                  const std::string &type, const std::string &typearg,
-                  const std::string &pts)
+void scriptSetTransfiniteLine(std::vector<int> &l, const std::string &fileName,
+                              const std::string &type,
+                              const std::string &typearg,
+                              const std::string &pts)
 {
   std::ostringstream sstream;
   sstream << "Transfinite Curve {";
@@ -214,11 +216,12 @@ void add_trsfline(std::vector<int> &l, const std::string &fileName,
   sstream << "} = " << pts;
   if(typearg.size()) sstream << " Using " << type << " " << typearg;
   sstream << ";";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_trsfsurf(std::vector<int> &l, const std::string &fileName,
-                  const std::string &dir)
+void scriptSetTransfiniteSurface(std::vector<int> &l,
+                                 const std::string &fileName,
+                                 const std::string &dir)
 {
   std::ostringstream sstream;
   sstream << "Transfinite Surface {" << l[0] << "}";
@@ -232,10 +235,11 @@ void add_trsfsurf(std::vector<int> &l, const std::string &fileName,
   }
   if(dir != "Left") sstream << " " << dir;
   sstream << ";";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_trsfvol(std::vector<int> &l, const std::string &fileName)
+void scriptSetTransfiniteVolume(std::vector<int> &l,
+                                const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Transfinite Volume{" << l[0] << "} = {";
@@ -244,11 +248,11 @@ void add_trsfvol(std::vector<int> &l, const std::string &fileName)
     sstream << l[i];
   }
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_embedded(const std::string &fileName, const std::string &what,
-                  std::vector<int> &l, int dim, int tag)
+void scriptEmbed(const std::string &fileName, const std::string &what,
+                 std::vector<int> &l, int dim, int tag)
 {
   std::ostringstream sstream;
   sstream << what << "{" << vector2String(l) << "} In ";
@@ -257,12 +261,12 @@ void add_embedded(const std::string &fileName, const std::string &what,
   else
     sstream << "Volume{";
   sstream << tag << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_param(const std::string &par, const std::string &value,
-               const std::string &label, const std::string &path,
-               const std::string &fileName)
+void scriptAddParameter(const std::string &par, const std::string &value,
+                        const std::string &label, const std::string &path,
+                        const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << par << " = DefineNumber[ " << value;
@@ -276,55 +280,55 @@ void add_param(const std::string &par, const std::string &value,
   else
     sstream << par;
   sstream << "\" ];";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_point(const std::string &fileName, const std::string &x,
-               const std::string &y, const std::string &z,
-               const std::string &lc)
+void scriptAddPoint(const std::string &fileName, const std::string &x,
+                    const std::string &y, const std::string &z,
+                    const std::string &lc)
 {
   std::ostringstream sstream;
   sstream << "Point(" << GModel::current()->getMaxElementaryNumber(0) + 1
           << ") = {" << x << ", " << y << ", " << z;
   if(lc.size()) sstream << ", " << lc;
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_field_option(int field_id, const std::string &option_name,
-                      const std::string &option_value,
-                      const std::string &fileName)
+void scriptAddFieldOption(int field_id, const std::string &option_name,
+                          const std::string &option_value,
+                          const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Field[" << field_id << "]." << option_name << " = "
           << option_value << ";";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_field(int field_id, const std::string &type_name,
-               const std::string &fileName)
+void scriptAddField(int field_id, const std::string &type_name,
+                    const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Field[" << field_id << "] = " << type_name << ";";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void delete_field(int field_id, const std::string &fileName)
+void scriptDeleteField(int field_id, const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Delete Field [" << field_id << "];";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void set_background_field(int field_id, const std::string &fileName)
+void scriptSetBackgroundField(int field_id, const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Background Field = " << field_id << ";";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_multline(const std::string &type, std::vector<int> &p,
-                  const std::string &fileName)
+void scriptAddCurve(const std::string &type, std::vector<int> &p,
+                    const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << type << "(" << GModel::current()->getMaxElementaryNumber(1) + 1
@@ -334,27 +338,27 @@ void add_multline(const std::string &type, std::vector<int> &p,
     sstream << p[i];
   }
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_circle_arc(int p1, int p2, int p3, const std::string &fileName)
+void scriptAddCircleArc(int p1, int p2, int p3, const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Circle(" << GModel::current()->getMaxElementaryNumber(1) + 1
           << ") = {" << p1 << ", " << p2 << ", " << p3 << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_ellipse_arc(int p1, int p2, int p3, int p4,
-                     const std::string &fileName)
+void scriptAddEllipseArc(int p1, int p2, int p3, int p4,
+                         const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Ellipse(" << GModel::current()->getMaxElementaryNumber(1) + 1
           << ") = {" << p1 << ", " << p2 << ", " << p3 << ", " << p4 << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_lineloop(List_T *list, const std::string &fileName, int *numloop)
+void scriptAddCurveLoop(List_T *list, const std::string &fileName, int *numloop)
 {
   if(RecognizeLineLoop(list, numloop)) return;
   *numloop = GModel::current()->getGEOInternals()->getMaxTag(-1) + 1;
@@ -363,19 +367,20 @@ void add_lineloop(List_T *list, const std::string &fileName, int *numloop)
       *numloop, GModel::current()->getOCCInternals()->getMaxTag(-1) + 1);
   std::ostringstream sstream;
   sstream << "Curve Loop(" << *numloop << ") = {" << list2String(list) << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_surf(const std::string &type, List_T *list,
-              const std::string &fileName)
+void scriptAddSurface(const std::string &type, List_T *list,
+                      const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << type << "(" << GModel::current()->getMaxElementaryNumber(2) + 1
           << ") = {" << list2String(list) << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_surfloop(List_T *list, const std::string &fileName, int *numloop)
+void scriptAddSurfaceLoop(List_T *list, const std::string &fileName,
+                          int *numloop)
 {
   if(RecognizeSurfaceLoop(list, numloop)) return;
   *numloop = GModel::current()->getGEOInternals()->getMaxTag(-2) + 1;
@@ -385,20 +390,22 @@ void add_surfloop(List_T *list, const std::string &fileName, int *numloop)
   std::ostringstream sstream;
   sstream << "Surface Loop(" << *numloop << ") = {" << list2String(list)
           << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_vol(List_T *list, const std::string &fileName)
+void scriptAddVolume(List_T *list, const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Volume(" << GModel::current()->getMaxElementaryNumber(3) + 1
           << ") = {" << list2String(list) << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_remove_physical(const std::string &fileName, const std::string &what,
-                         const std::vector<int> &l, const std::string &name,
-                         int forceTag, bool append, const std::string &mode)
+void scriptRemovePhysicalGroup(const std::string &fileName,
+                               const std::string &what,
+                               const std::vector<int> &l,
+                               const std::string &name, int forceTag,
+                               bool append, const std::string &mode)
 {
   std::ostringstream sstream;
   sstream << "Physical " << what << "(";
@@ -418,164 +425,165 @@ void add_remove_physical(const std::string &fileName, const std::string &what,
   else if(append)
     sstream << "+";
   sstream << "= {" << vector2String(l) << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_compound(const std::string &fileName, const std::string &type,
-                  const std::vector<int> &l)
+void scriptSetCompound(const std::string &fileName, const std::string &type,
+                       const std::vector<int> &l)
 {
   std::ostringstream sstream;
   sstream << "Compound " << type << " {" << vector2String(l) << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_circle(const std::string &fileName, const std::string &x,
-                const std::string &y, const std::string &z,
-                const std::string &r, const std::string &alpha1,
-                const std::string &alpha2)
+void scriptAddCircle(const std::string &fileName, const std::string &x,
+                     const std::string &y, const std::string &z,
+                     const std::string &r, const std::string &alpha1,
+                     const std::string &alpha2)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Circle(" << GModel::current()->getMaxElementaryNumber(1) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << r;
   if(alpha1.size()) sstream << ", " << alpha1;
   if(alpha1.size() && alpha2.size()) sstream << ", " << alpha2;
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_ellipse(const std::string &fileName, const std::string &x,
-                 const std::string &y, const std::string &z,
-                 const std::string &rx, const std::string &ry,
-                 const std::string &alpha1, const std::string &alpha2)
+void scriptAddEllipse(const std::string &fileName, const std::string &x,
+                      const std::string &y, const std::string &z,
+                      const std::string &rx, const std::string &ry,
+                      const std::string &alpha1, const std::string &alpha2)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Ellipse(" << GModel::current()->getMaxElementaryNumber(1) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << rx << ", " << ry;
   if(alpha1.size()) sstream << ", " << alpha1;
   if(alpha1.size() && alpha2.size()) sstream << ", " << alpha2;
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_disk(const std::string &fileName, const std::string &x,
-              const std::string &y, const std::string &z, const std::string &rx,
-              const std::string &ry)
+void scriptAddDisk(const std::string &fileName, const std::string &x,
+                   const std::string &y, const std::string &z,
+                   const std::string &rx, const std::string &ry)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Disk(" << GModel::current()->getMaxElementaryNumber(2) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << rx << ", " << ry
           << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_rectangle(const std::string &fileName, const std::string &x,
-                   const std::string &y, const std::string &z,
-                   const std::string &dx, const std::string &dy,
-                   const std::string &roundedRadius)
+void scriptAddRectangle(const std::string &fileName, const std::string &x,
+                        const std::string &y, const std::string &z,
+                        const std::string &dx, const std::string &dy,
+                        const std::string &roundedRadius)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Rectangle(" << GModel::current()->getMaxElementaryNumber(2) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << dx << ", " << dy;
   if(roundedRadius.size()) sstream << ", " << roundedRadius;
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_sphere(const std::string &fileName, const std::string &x,
-                const std::string &y, const std::string &z,
-                const std::string &r, const std::string &alpha1,
-                const std::string &alpha2, const std::string &alpha3)
+void scriptAddSphere(const std::string &fileName, const std::string &x,
+                     const std::string &y, const std::string &z,
+                     const std::string &r, const std::string &alpha1,
+                     const std::string &alpha2, const std::string &alpha3)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Sphere(" << GModel::current()->getMaxElementaryNumber(3) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << r;
   if(alpha1.size()) sstream << ", " << alpha1;
   if(alpha1.size() && alpha2.size()) sstream << ", " << alpha2;
   if(alpha1.size() && alpha2.size() && alpha3.size()) sstream << ", " << alpha3;
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_cylinder(const std::string &fileName, const std::string &x,
-                  const std::string &y, const std::string &z,
-                  const std::string &dx, const std::string &dy,
-                  const std::string &dz, const std::string &r,
-                  const std::string &alpha)
+void scriptAddCylinder(const std::string &fileName, const std::string &x,
+                       const std::string &y, const std::string &z,
+                       const std::string &dx, const std::string &dy,
+                       const std::string &dz, const std::string &r,
+                       const std::string &alpha)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Cylinder(" << GModel::current()->getMaxElementaryNumber(3) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << dx << ", " << dy
           << ", " << dz << ", " << r;
   if(alpha.size()) sstream << ", " << alpha;
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_box(const std::string &fileName, const std::string &x,
-             const std::string &y, const std::string &z, const std::string &dx,
-             const std::string &dy, const std::string &dz)
+void scriptAddBox(const std::string &fileName, const std::string &x,
+                  const std::string &y, const std::string &z,
+                  const std::string &dx, const std::string &dy,
+                  const std::string &dz)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Box(" << GModel::current()->getMaxElementaryNumber(3) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << dx << ", " << dy
           << ", " << dz << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_torus(const std::string &fileName, const std::string &x,
-               const std::string &y, const std::string &z,
-               const std::string &r1, const std::string &r2,
-               const std::string &alpha)
+void scriptAddTorus(const std::string &fileName, const std::string &x,
+                    const std::string &y, const std::string &z,
+                    const std::string &r1, const std::string &r2,
+                    const std::string &alpha)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Torus(" << GModel::current()->getMaxElementaryNumber(3) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << r1 << ", " << r2;
   if(alpha.size()) sstream << ", " << alpha;
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_cone(const std::string &fileName, const std::string &x,
-              const std::string &y, const std::string &z, const std::string &dx,
-              const std::string &dy, const std::string &dz,
-              const std::string &r1, const std::string &r2,
-              const std::string &alpha)
+void scriptAddCone(const std::string &fileName, const std::string &x,
+                   const std::string &y, const std::string &z,
+                   const std::string &dx, const std::string &dy,
+                   const std::string &dz, const std::string &r1,
+                   const std::string &r2, const std::string &alpha)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Cone(" << GModel::current()->getMaxElementaryNumber(3) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << dx << ", " << dy
           << ", " << dz << ", " << r1 << ", " << r2;
   if(alpha.size()) sstream << ", " << alpha;
   sstream << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_wedge(const std::string &fileName, const std::string &x,
-               const std::string &y, const std::string &z,
-               const std::string &dx, const std::string &dy,
-               const std::string &dz, const std::string &ltx)
+void scriptAddWedge(const std::string &fileName, const std::string &x,
+                    const std::string &y, const std::string &z,
+                    const std::string &dx, const std::string &dy,
+                    const std::string &dz, const std::string &ltx)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Wedge(" << GModel::current()->getMaxElementaryNumber(3) + 1
           << ") = {" << x << ", " << y << ", " << z << ", " << dx << ", " << dy
           << ", " << dz << ", " << ltx << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void translate(const std::string &fileName,
-               const std::vector<std::pair<int, int> > &l,
-               const std::string &tx, const std::string &ty,
-               const std::string &tz, bool duplicata)
+void scriptTranslate(const std::string &fileName,
+                     const std::vector<std::pair<int, int> > &l,
+                     const std::string &tx, const std::string &ty,
+                     const std::string &tz, bool duplicata)
 {
   std::ostringstream sstream;
   sstream << "Translate {" << tx << ", " << ty << ", " << tz << "} {\n  ";
@@ -583,14 +591,15 @@ void translate(const std::string &fileName,
   sstream << dimTags2String(l);
   if(duplicata) sstream << "}";
   sstream << "\n}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void rotate(const std::string &fileName,
-            const std::vector<std::pair<int, int> > &l, const std::string &ax,
-            const std::string &ay, const std::string &az, const std::string &px,
-            const std::string &py, const std::string &pz,
-            const std::string &angle, bool duplicata)
+void scriptRotate(const std::string &fileName,
+                  const std::vector<std::pair<int, int> > &l,
+                  const std::string &ax, const std::string &ay,
+                  const std::string &az, const std::string &px,
+                  const std::string &py, const std::string &pz,
+                  const std::string &angle, bool duplicata)
 {
   std::ostringstream sstream;
   sstream << "Rotate {{" << ax << ", " << ay << ", " << az << "}, {" << px
@@ -599,13 +608,14 @@ void rotate(const std::string &fileName,
   sstream << dimTags2String(l);
   if(duplicata) sstream << "}";
   sstream << "\n}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void dilate(const std::string &fileName,
-            const std::vector<std::pair<int, int> > &l, const std::string &cx,
-            const std::string &cy, const std::string &cz, const std::string &sx,
-            const std::string &sy, const std::string &sz, bool duplicata)
+void scriptDilate(const std::string &fileName,
+                  const std::vector<std::pair<int, int> > &l,
+                  const std::string &cx, const std::string &cy,
+                  const std::string &cz, const std::string &sx,
+                  const std::string &sy, const std::string &sz, bool duplicata)
 {
   std::ostringstream sstream;
   sstream << "Dilate {{" << cx << ", " << cy << ", " << cz << "}, {" << sx
@@ -614,13 +624,13 @@ void dilate(const std::string &fileName,
   sstream << dimTags2String(l);
   if(duplicata) sstream << "}";
   sstream << "\n}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void symmetry(const std::string &fileName,
-              const std::vector<std::pair<int, int> > &l, const std::string &sa,
-              const std::string &sb, const std::string &sc,
-              const std::string &sd, bool duplicata)
+void scriptMirror(const std::string &fileName,
+                  const std::vector<std::pair<int, int> > &l,
+                  const std::string &sa, const std::string &sb,
+                  const std::string &sc, const std::string &sd, bool duplicata)
 {
   std::ostringstream sstream;
   sstream << "Symmetry {" << sa << ", " << sb << ", " << sc << ", " << sd
@@ -629,13 +639,14 @@ void symmetry(const std::string &fileName,
   sstream << dimTags2String(l);
   if(duplicata) sstream << "}";
   sstream << "\n}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void extrude(const std::string &fileName,
-             const std::vector<std::pair<int, int> > &l, const std::string &tx,
-             const std::string &ty, const std::string &tz, bool extrudeMesh,
-             const std::string &layers, bool recombineMesh)
+void scriptExtrude(const std::string &fileName,
+                   const std::vector<std::pair<int, int> > &l,
+                   const std::string &tx, const std::string &ty,
+                   const std::string &tz, bool extrudeMesh,
+                   const std::string &layers, bool recombineMesh)
 {
   std::ostringstream sstream;
   sstream << "Extrude {" << tx << ", " << ty << ", " << tz << "} {\n  "
@@ -645,15 +656,16 @@ void extrude(const std::string &fileName,
     if(recombineMesh) sstream << "Recombine;";
   }
   sstream << "\n}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void protude(const std::string &fileName,
-             const std::vector<std::pair<int, int> > &l, const std::string &ax,
-             const std::string &ay, const std::string &az,
-             const std::string &px, const std::string &py,
-             const std::string &pz, const std::string &angle, bool extrudeMesh,
-             const std::string &layers, bool recombineMesh)
+void scriptProtude(const std::string &fileName,
+                   const std::vector<std::pair<int, int> > &l,
+                   const std::string &ax, const std::string &ay,
+                   const std::string &az, const std::string &px,
+                   const std::string &py, const std::string &pz,
+                   const std::string &angle, bool extrudeMesh,
+                   const std::string &layers, bool recombineMesh)
 {
   std::ostringstream sstream;
   sstream << "Extrude {{" << ax << ", " << ay << ", " << az << "}, {" << px
@@ -664,15 +676,15 @@ void protude(const std::string &fileName,
     if(recombineMesh) sstream << "Recombine;";
   }
   sstream << "\n}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_pipe(const std::string &fileName,
-              const std::vector<std::pair<int, int> > &l,
-              const std::vector<int> &l2)
+void scriptAddPipe(const std::string &fileName,
+                   const std::vector<std::pair<int, int> > &l,
+                   const std::vector<int> &l2)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   int wire = GModel::current()->getGEOInternals()->getMaxTag(-1) + 1;
   if(GModel::current()->getOCCInternals())
     wire =
@@ -680,71 +692,73 @@ void add_pipe(const std::string &fileName,
   sstream << "Wire(" << wire << ") = {" << vector2String(l2) << "};\n";
   sstream << "Extrude { " << dimTags2String(l) << "} Using Wire {" << wire
           << "}\n";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void split_edge(int edge_id, List_T *vertices, const std::string &fileName)
+void scriptSplitCurve(int edge_id, List_T *vertices,
+                      const std::string &fileName)
 {
   std::ostringstream sstream;
   sstream << "Split Curve(" << edge_id << ") {" << list2String(vertices)
           << "};";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void apply_boolean(const std::string &fileName, const std::string &op,
+void scriptBoolean(const std::string &fileName, const std::string &op,
                    const std::vector<std::pair<int, int> > &object,
                    const std::vector<std::pair<int, int> > &tool,
                    int deleteObject, int deleteTool)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << op << "{ " << dimTags2String(object);
   if(deleteObject) sstream << "Delete; ";
   sstream << "}{ " << dimTags2String(tool);
   if(deleteTool) sstream << "Delete; ";
   sstream << "}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void apply_fillet(const std::string &fileName, const std::vector<int> &regions,
+void scriptFillet(const std::string &fileName, const std::vector<int> &regions,
                   const std::vector<int> &edges, const std::string &radius)
 {
   std::ostringstream sstream;
-  check_occ(sstream);
+  checkOCC(sstream);
   sstream << "Fillet{" << vector2String(regions) << "}{" << vector2String(edges)
           << "}{" << radius << "}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void coherence(const std::string &fileName)
+void scriptCoherence(const std::string &fileName)
 {
-  add_infile("Coherence;", fileName);
+  addInFile("Coherence;", fileName);
 }
 
-void delete_entities(const std::string &fileName,
-                     const std::vector<std::pair<int, int> > &l, bool recursive)
+void scriptDeleteEntities(const std::string &fileName,
+                          const std::vector<std::pair<int, int> > &l,
+                          bool recursive)
 {
   std::ostringstream sstream;
   if(recursive) sstream << "Recursive ";
   sstream << "Delete {\n  " << dimTags2String(l) << "\n}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
 
-void add_visibility_all(int mode, const std::string &fileName)
+void scriptSetVisibilityAll(int mode, const std::string &fileName)
 {
   if(mode)
-    add_infile("Show \"*\";", fileName);
+    addInFile("Show \"*\";", fileName);
   else
-    add_infile("Hide \"*\";", fileName);
+    addInFile("Hide \"*\";", fileName);
 }
 
-void add_visibility(int mode, const std::vector<std::pair<int, int> > &l,
-                    const std::string &fileName)
+void scriptSetVisibility(int mode, const std::vector<std::pair<int, int> > &l,
+                         const std::string &fileName)
 {
   std::ostringstream sstream;
   if(mode)
     sstream << "Show {\n  " << dimTags2String(l) << "\n}";
   else
     sstream << "Hide {\n  " << dimTags2String(l) << "\n}";
-  add_infile(sstream.str(), fileName);
+  addInFile(sstream.str(), fileName);
 }
diff --git a/Geo/scriptStringInterface.h b/Geo/scriptStringInterface.h
index afd56d8d1d9ccccd10885366a9f66aafef6b7dcd..2260e6d3f3c2133fc6ed0d73d2418f58f034ee1c 100644
--- a/Geo/scriptStringInterface.h
+++ b/Geo/scriptStringInterface.h
@@ -10,129 +10,144 @@
 #include <vector>
 #include "ListUtils.h"
 
-void set_factory(const std::string &factory, const std::string &fileName);
-void add_charlength(const std::string &fileName, const std::vector<int> &l,
+void scriptSetFactory(const std::string &factory, const std::string &fileName);
+void scriptSetCharacteristicLength(const std::string &fileName,
+                                   const std::vector<int> &l,
+                                   const std::string &lc);
+void scriptRecombineSurface(const std::string &fileName,
+                            const std::vector<int> &l);
+void scriptSetTransfiniteLine(std::vector<int> &l, const std::string &fileName,
+                              const std::string &type,
+                              const std::string &typearg,
+                              const std::string &pts);
+void scriptSetTransfiniteSurface(std::vector<int> &l,
+                                 const std::string &fileName,
+                                 const std::string &dir);
+void scriptSetTransfiniteVolume(std::vector<int> &l,
+                                const std::string &fileName);
+void scriptEmbed(const std::string &fileName, const std::string &what,
+                 std::vector<int> &l, int dim, int tag);
+void scriptAddParameter(const std::string &par, const std::string &value,
+                        const std::string &label, const std::string &path,
+                        const std::string &fileName);
+void scriptAddPoint(const std::string &fileName, const std::string &x,
+                    const std::string &y, const std::string &z,
                     const std::string &lc);
-void add_recosurf(const std::string &fileName, const std::vector<int> &l);
-void add_trsfline(std::vector<int> &l, const std::string &fileName,
-                  const std::string &type, const std::string &typearg,
-                  const std::string &pts);
-void add_trsfsurf(std::vector<int> &l, const std::string &fileName,
-                  const std::string &dir);
-void add_trsfvol(std::vector<int> &l, const std::string &fileName);
-void add_embedded(const std::string &fileName, const std::string &what,
-                  std::vector<int> &l, int dim, int tag);
-void add_param(const std::string &par, const std::string &value,
-               const std::string &label, const std::string &path,
-               const std::string &fileName);
-void add_point(const std::string &fileName, const std::string &x,
-               const std::string &y, const std::string &z,
-               const std::string &lc);
-void add_multline(const std::string &type, std::vector<int> &p,
-                  const std::string &fileName);
-void add_circle_arc(int p1, int p2, int p3, const std::string &fileName);
-void add_ellipse_arc(int p1, int p2, int p3, int p4,
-                     const std::string &fileName);
-void add_field_option(int field_id, const std::string &option_name,
-                      const std::string &option_value,
+void scriptAddCurve(const std::string &type, std::vector<int> &p,
+                    const std::string &fileName);
+void scriptAddCircleArc(int p1, int p2, int p3, const std::string &fileName);
+void scriptAddEllipseArc(int p1, int p2, int p3, int p4,
+                         const std::string &fileName);
+void scriptAddFieldOption(int field_id, const std::string &option_name,
+                          const std::string &option_value,
+                          const std::string &fileName);
+void scriptAddField(int field_id, const std::string &type_name,
+                    const std::string &fileName);
+void scriptDeleteField(int field_id, const std::string &fileName);
+void scriptSetBackgroundField(int field_id, const std::string &fileName);
+void scriptAddCurveLoop(List_T *list, const std::string &fileName,
+                        int *numloop);
+void scriptAddSurface(const std::string &type, List_T *list,
                       const std::string &fileName);
-void add_field(int field_id, const std::string &type_name,
-               const std::string &fileName);
-void delete_field(int field_id, const std::string &fileName);
-void set_background_field(int field_id, const std::string &fileName);
-void add_lineloop(List_T *list, const std::string &fileName, int *numloop);
-void add_surf(const std::string &type, List_T *list,
-              const std::string &fileName);
-void add_surfloop(List_T *list, const std::string &fileName, int *numvol);
-void add_vol(List_T *list, const std::string &fileName);
-void add_remove_physical(const std::string &fileName, const std::string &what,
-                         const std::vector<int> &l, const std::string &name,
-                         int forceTag, bool append, const std::string &mode);
-void add_compound(const std::string &fileName, const std::string &type,
-                  const std::vector<int> &l);
-void add_circle(const std::string &fileName, const std::string &x,
-                const std::string &y, const std::string &z,
-                const std::string &r, const std::string &alpha1,
-                const std::string &alpha2);
-void add_ellipse(const std::string &fileName, const std::string &x,
-                 const std::string &y, const std::string &z,
-                 const std::string &rx, const std::string &ry,
-                 const std::string &alpha1, const std::string &alpha2);
-void add_disk(const std::string &fileName, const std::string &x,
-              const std::string &y, const std::string &z, const std::string &rx,
-              const std::string &ry);
-void add_rectangle(const std::string &fileName, const std::string &x,
+void scriptAddSurfaceLoop(List_T *list, const std::string &fileName,
+                          int *numvol);
+void scriptAddVolume(List_T *list, const std::string &fileName);
+void scriptRemovePhysicalGroup(const std::string &fileName,
+                               const std::string &what,
+                               const std::vector<int> &l,
+                               const std::string &name, int forceTag,
+                               bool append, const std::string &mode);
+void scriptSetCompound(const std::string &fileName, const std::string &type,
+                       const std::vector<int> &l);
+void scriptAddCircle(const std::string &fileName, const std::string &x,
+                     const std::string &y, const std::string &z,
+                     const std::string &r, const std::string &alpha1,
+                     const std::string &alpha2);
+void scriptAddEllipse(const std::string &fileName, const std::string &x,
+                      const std::string &y, const std::string &z,
+                      const std::string &rx, const std::string &ry,
+                      const std::string &alpha1, const std::string &alpha2);
+void scriptAddDisk(const std::string &fileName, const std::string &x,
                    const std::string &y, const std::string &z,
-                   const std::string &dx, const std::string &dy,
-                   const std::string &roundedRadius);
-void add_sphere(const std::string &fileName, const std::string &x,
-                const std::string &y, const std::string &z,
-                const std::string &r, const std::string &alpha1,
-                const std::string &alpha2, const std::string &alpha3);
-void add_cylinder(const std::string &fileName, const std::string &x,
+                   const std::string &rx, const std::string &ry);
+void scriptAddRectangle(const std::string &fileName, const std::string &x,
+                        const std::string &y, const std::string &z,
+                        const std::string &dx, const std::string &dy,
+                        const std::string &roundedRadius);
+void scriptAddSphere(const std::string &fileName, const std::string &x,
+                     const std::string &y, const std::string &z,
+                     const std::string &r, const std::string &alpha1,
+                     const std::string &alpha2, const std::string &alpha3);
+void scriptAddCylinder(const std::string &fileName, const std::string &x,
+                       const std::string &y, const std::string &z,
+                       const std::string &dx, const std::string &dy,
+                       const std::string &dz, const std::string &r,
+                       const std::string &alpha);
+void scriptAddBox(const std::string &fileName, const std::string &x,
                   const std::string &y, const std::string &z,
                   const std::string &dx, const std::string &dy,
-                  const std::string &dz, const std::string &r,
-                  const std::string &alpha);
-void add_box(const std::string &fileName, const std::string &x,
-             const std::string &y, const std::string &z, const std::string &dx,
-             const std::string &dy, const std::string &dz);
-void add_torus(const std::string &fileName, const std::string &x,
-               const std::string &y, const std::string &z,
-               const std::string &r1, const std::string &r2,
-               const std::string &alpha);
-void add_cone(const std::string &fileName, const std::string &x,
-              const std::string &y, const std::string &z, const std::string &dx,
-              const std::string &dy, const std::string &dz,
-              const std::string &r1, const std::string &r2,
-              const std::string &alpha);
-void add_wedge(const std::string &fileName, const std::string &x,
-               const std::string &y, const std::string &z,
-               const std::string &dx, const std::string &dy,
-               const std::string &dz, const std::string &ltx);
-void translate(const std::string &fileName,
-               const std::vector<std::pair<int, int> > &l,
-               const std::string &tx, const std::string &ty,
-               const std::string &tz, bool duplicata);
-void rotate(const std::string &fileName,
-            const std::vector<std::pair<int, int> > &l, const std::string &ax,
-            const std::string &ay, const std::string &az, const std::string &px,
-            const std::string &py, const std::string &pz,
-            const std::string &angle, bool duplicata);
-void dilate(const std::string &fileName,
-            const std::vector<std::pair<int, int> > &l, const std::string &cx,
-            const std::string &cy, const std::string &cz, const std::string &sx,
-            const std::string &sy, const std::string &sz, bool duplicata);
-void symmetry(const std::string &fileName,
-              const std::vector<std::pair<int, int> > &l, const std::string &sa,
-              const std::string &sb, const std::string &sc,
-              const std::string &sd, bool duplicata);
-void extrude(const std::string &fileName,
-             const std::vector<std::pair<int, int> > &l, const std::string &tx,
-             const std::string &ty, const std::string &tz, bool extrudeMesh,
-             const std::string &layers, bool recombineMesh);
-void protude(const std::string &fileName,
-             const std::vector<std::pair<int, int> > &l, const std::string &ax,
-             const std::string &ay, const std::string &az,
-             const std::string &px, const std::string &py,
-             const std::string &pz, const std::string &angle, bool extrudeMesh,
-             const std::string &layers, bool recombineMesh);
-void add_pipe(const std::string &fileName,
-              const std::vector<std::pair<int, int> > &l,
-              const std::vector<int> &l2);
-void split_edge(int edge_id, List_T *vertices, const std::string &fileName);
-void apply_boolean(const std::string &fileName, const std::string &op,
+                  const std::string &dz);
+void scriptAddTorus(const std::string &fileName, const std::string &x,
+                    const std::string &y, const std::string &z,
+                    const std::string &r1, const std::string &r2,
+                    const std::string &alpha);
+void scriptAddCone(const std::string &fileName, const std::string &x,
+                   const std::string &y, const std::string &z,
+                   const std::string &dx, const std::string &dy,
+                   const std::string &dz, const std::string &r1,
+                   const std::string &r2, const std::string &alpha);
+void scriptAddWedge(const std::string &fileName, const std::string &x,
+                    const std::string &y, const std::string &z,
+                    const std::string &dx, const std::string &dy,
+                    const std::string &dz, const std::string &ltx);
+void scriptTranslate(const std::string &fileName,
+                     const std::vector<std::pair<int, int> > &l,
+                     const std::string &tx, const std::string &ty,
+                     const std::string &tz, bool duplicata);
+void scriptRotate(const std::string &fileName,
+                  const std::vector<std::pair<int, int> > &l,
+                  const std::string &ax, const std::string &ay,
+                  const std::string &az, const std::string &px,
+                  const std::string &py, const std::string &pz,
+                  const std::string &angle, bool duplicata);
+void scriptDilate(const std::string &fileName,
+                  const std::vector<std::pair<int, int> > &l,
+                  const std::string &cx, const std::string &cy,
+                  const std::string &cz, const std::string &sx,
+                  const std::string &sy, const std::string &sz, bool duplicata);
+void scriptMirror(const std::string &fileName,
+                  const std::vector<std::pair<int, int> > &l,
+                  const std::string &sa, const std::string &sb,
+                  const std::string &sc, const std::string &sd, bool duplicata);
+void scriptExtrude(const std::string &fileName,
+                   const std::vector<std::pair<int, int> > &l,
+                   const std::string &tx, const std::string &ty,
+                   const std::string &tz, bool extrudeMesh,
+                   const std::string &layers, bool recombineMesh);
+void scriptProtude(const std::string &fileName,
+                   const std::vector<std::pair<int, int> > &l,
+                   const std::string &ax, const std::string &ay,
+                   const std::string &az, const std::string &px,
+                   const std::string &py, const std::string &pz,
+                   const std::string &angle, bool extrudeMesh,
+                   const std::string &layers, bool recombineMesh);
+void scriptAddPipe(const std::string &fileName,
+                   const std::vector<std::pair<int, int> > &l,
+                   const std::vector<int> &l2);
+void scriptSplitCurve(int edge_id, List_T *vertices,
+                      const std::string &fileName);
+void scriptBoolean(const std::string &fileName, const std::string &op,
                    const std::vector<std::pair<int, int> > &object,
                    const std::vector<std::pair<int, int> > &tool,
                    int deleteObject, int deleteTool);
-void apply_fillet(const std::string &fileName, const std::vector<int> &regions,
+void scriptFillet(const std::string &fileName, const std::vector<int> &regions,
                   const std::vector<int> &edges, const std::string &radius);
-void coherence(const std::string &fileName);
-void delete_entities(const std::string &fileName,
-                     const std::vector<std::pair<int, int> > &l,
-                     bool recursive);
-void add_visibility_all(int mode, const std::string &fileName);
-void add_visibility(int mode, const std::vector<std::pair<int, int> > &l,
-                    const std::string &fileName);
+void scriptCoherence(const std::string &fileName);
+void scriptDeleteEntities(const std::string &fileName,
+                          const std::vector<std::pair<int, int> > &l,
+                          bool recursive);
+void scriptSetVisibilityAll(int mode, const std::string &fileName);
+void scriptSetVisibility(int mode, const std::vector<std::pair<int, int> > &l,
+                         const std::string &fileName);
 
 #endif