diff --git a/Common/Colors.h b/Common/Colors.h
index 5400fa938e9c3496d5b4f5c7e6da86ac23c1ca3a..69289ba3f8baa47ccace3024c27af91b5f3e53ce 100644
--- a/Common/Colors.h
+++ b/Common/Colors.h
@@ -669,7 +669,7 @@ StringX4Int ColorString[] = {
   { 0                          ,  0  ,   0,   0, 255 }
 } ;
 
-int Get_ColorForString(StringX4Int SX4I[], int alpha, const char *string,
-                       int *FlagError);
+int GetColorForString(StringX4Int SX4I[], int alpha, const char *string,
+                      int *FlagError);
 
 #endif
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index a14bc5ae40ba35f4546b1e81b8c9f8ae9840f5fc..2ae45b59da40d0d0701ccdc13132a22f25418d4b 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -40,19 +40,19 @@
 #error
 #endif
 
-int Get_GmshMajorVersion(){ return GMSH_MAJOR_VERSION; }
-int Get_GmshMinorVersion(){ return GMSH_MINOR_VERSION; }
-int Get_GmshPatchVersion(){ return GMSH_PATCH_VERSION; }
-const char *Get_GmshExtraVersion(){ return GMSH_EXTRA_VERSION; }
-const char *Get_GmshVersion(){ return GMSH_VERSION; }
-const char *Get_GmshBuildDate(){ return GMSH_DATE; }
-const char *Get_GmshBuildHost(){ return GMSH_HOST; }
-const char *Get_GmshPackager(){ return GMSH_PACKAGER; }
-const char *Get_GmshBuildOS(){ return GMSH_OS; }
-const char *Get_GmshShortLicense(){ return GMSH_SHORT_LICENSE; }
-const char *Get_GmshBuildOptions(){ return GMSH_CONFIG_OPTIONS; }
+int GetGmshMajorVersion(){ return GMSH_MAJOR_VERSION; }
+int GetGmshMinorVersion(){ return GMSH_MINOR_VERSION; }
+int GetGmshPatchVersion(){ return GMSH_PATCH_VERSION; }
+const char *GetGmshExtraVersion(){ return GMSH_EXTRA_VERSION; }
+const char *GetGmshVersion(){ return GMSH_VERSION; }
+const char *GetGmshBuildDate(){ return GMSH_DATE; }
+const char *GetGmshBuildHost(){ return GMSH_HOST; }
+const char *GetGmshPackager(){ return GMSH_PACKAGER; }
+const char *GetGmshBuildOS(){ return GMSH_OS; }
+const char *GetGmshShortLicense(){ return GMSH_SHORT_LICENSE; }
+const char *GetGmshBuildOptions(){ return GMSH_CONFIG_OPTIONS; }
 
-void Print_Usage(const char *name)
+void PrintUsage(const char *name)
 {
   // If you make changes in this routine, please also change the
   // texinfo documentation (doc/texinfo/command_line.texi) and the man
@@ -114,7 +114,7 @@ void Print_Usage(const char *name)
   Msg::Direct("  -help                 Show this message");
 }
 
-void Get_Options(int argc, char *argv[])
+void GetOptions(int argc, char *argv[])
 {
   // print messages on terminal
   int terminal = CTX::instance()->terminal;
@@ -519,7 +519,7 @@ void Get_Options(int argc, char *argv[])
       else if(!strcmp(argv[i] + 1, "help") || !strcmp(argv[i] + 1, "-help")) {
         fprintf(stderr, "Gmsh, a 3D mesh generator with pre- and post-processing facilities\n");
         fprintf(stderr, "Copyright (C) 1997-2009 Christophe Geuzaine and Jean-Francois Remacle\n");
-        Print_Usage(argv[0]);
+        PrintUsage(argv[0]);
 	Msg::Exit(0);
       }
       else if(!strcmp(argv[i] + 1, "v")) {
@@ -604,7 +604,7 @@ void Get_Options(int argc, char *argv[])
 #endif
       else {
 	Msg::Error("Unknown option '%s'", argv[i]);
-        Print_Usage(argv[0]);
+        PrintUsage(argv[0]);
 	Msg::Exit(1);
       }
 
diff --git a/Common/CommandLine.h b/Common/CommandLine.h
index 25e7dc210d1961585d115d039e6d92e37b9dc242..89a66118c33e2482293bd29ebcbd6089094fc58d 100644
--- a/Common/CommandLine.h
+++ b/Common/CommandLine.h
@@ -6,19 +6,19 @@
 #ifndef _COMMAND_LINE_H_
 #define _COMMAND_LINE_H_
 
-int Get_GmshMajorVersion();
-int Get_GmshMinorVersion();
-int Get_GmshPatchVersion();
-const char *Get_GmshExtraVersion();
-const char *Get_GmshVersion();
-const char *Get_GmshBuildDate();
-const char *Get_GmshBuildHost();
-const char *Get_GmshPackager();
-const char *Get_GmshBuildOS();
-const char *Get_GmshShortLicense();
-const char *Get_GmshBuildOptions();
+int GetGmshMajorVersion();
+int GetGmshMinorVersion();
+int GetGmshPatchVersion();
+const char *GetGmshExtraVersion();
+const char *GetGmshVersion();
+const char *GetGmshBuildDate();
+const char *GetGmshBuildHost();
+const char *GetGmshPackager();
+const char *GetGmshBuildOS();
+const char *GetGmshShortLicense();
+const char *GetGmshBuildOptions();
 
-void Print_Usage(const char *name);
-void Get_Options(int argc, char *argv[]);
+void PrintUsage(const char *name);
+void GetOptions(int argc, char *argv[]);
 
 #endif
diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 249f60ab685919f77f0c935cdc736671d85787d2..293cab2a6348696f6542fa92bd311cbd852ce79a 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -134,7 +134,7 @@ void CreateOutputFile(std::string fileName, int format)
     break;
     
   case FORMAT_OPT:
-    Print_Options(0, GMSH_FULLRC, 1, 1, fileName.c_str());
+    PrintOptions(0, GMSH_FULLRC, 1, 1, fileName.c_str());
     break;
 
   case FORMAT_MSH:
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index 9d3ab7bdf04e3948fc4775b91707cfa866ee32bf..2a45410d01699cc15bae70382d210c7b000ba0c4 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -35,10 +35,10 @@ int GmshInitialize(int argc, char **argv)
   Msg::Init(argc, argv);
 
   // Load default options
-  Init_Options(0);
+  InitOptions(0);
 
   // Read configuration files and command line options
-  Get_Options(argc, argv);
+  GetOptions(argc, argv);
 
   // Make sure we have enough resources (stack)
   CheckResources();
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index 526e88e1a7565c22dc23e63da9666640530ad08c..3902a4cef30cada1fa8ce0597e993640e8379537 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -93,11 +93,11 @@ void Msg::Exit(int level)
   // the persistent info to disk
   if(GUI::available() && !_commRank) {
     if(CTX::instance()->sessionSave)
-      Print_Options(0, GMSH_SESSIONRC, 0, 0, 
-                    (CTX::instance()->homeDir + CTX::instance()->sessionFileName).c_str());
+      PrintOptions(0, GMSH_SESSIONRC, 0, 0, 
+                   (CTX::instance()->homeDir + CTX::instance()->sessionFileName).c_str());
     if(CTX::instance()->optionsSave)
-      Print_Options(0, GMSH_OPTIONSRC, 1, 0, 
-                    (CTX::instance()->homeDir + CTX::instance()->optionsFileName).c_str());
+      PrintOptions(0, GMSH_OPTIONSRC, 1, 0, 
+                   (CTX::instance()->homeDir + CTX::instance()->optionsFileName).c_str());
   }
 #endif
 
diff --git a/Common/Main.cpp b/Common/Main.cpp
index 9ecfdacd88f77bf1014b107aefaf0d71d1f4f69b..0c2ee20df3be48f1d286fbf741cfd51d5f5d5d4a 100644
--- a/Common/Main.cpp
+++ b/Common/Main.cpp
@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
 {
   if(argc < 2){
     CTX::instance()->terminal = 1; 
-    Print_Usage(argv[0]);
+    PrintUsage(argv[0]);
     exit(0);
   }
 
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 9767388922349452d94977ffd53ad526fbba8dd8..3b96d68f4f827735b4039147151bcecaa47b243b 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -81,7 +81,7 @@ bool StringOption(int action, const char *category, int num,
   return true;
 }
 
-static void Set_DefaultStringOptions(int num, StringXString s[])
+static void SetDefaultStringOptions(int num, StringXString s[])
 {
   int i = 0;
   while(s[i].str) {
@@ -90,7 +90,7 @@ static void Set_DefaultStringOptions(int num, StringXString s[])
   }
 }
 
-static void Set_StringOptions_GUI(int num, StringXString s[])
+static void SetStringOptionsGUI(int num, StringXString s[])
 {
   int i = 0;
   while(s[i].str) {
@@ -99,8 +99,8 @@ static void Set_StringOptions_GUI(int num, StringXString s[])
   }
 }
 
-static void Print_StringOptions(int num, int level, int diff, int help, 
-				StringXString s[], const char *prefix, FILE *file)
+static void PrintStringOptions(int num, int level, int diff, int help, 
+                               StringXString s[], const char *prefix, FILE *file)
 {
   int i = 0;
   while(s[i].str) {
@@ -126,7 +126,7 @@ static void Print_StringOptions(int num, int level, int diff, int help,
   }
 }
 
-static const char *Get_OptionSaveLevel(int level)
+static const char *GetOptionSaveLevel(int level)
 {
   if(level & GMSH_SESSIONRC){
     return "General.SessionFileName";
@@ -139,7 +139,7 @@ static const char *Get_OptionSaveLevel(int level)
   }
 }
 
-static void Print_StringOptionsDoc(StringXString s[], const char *prefix, FILE *file)
+static void PrintStringOptionsDoc(StringXString s[], const char *prefix, FILE *file)
 {
   int i = 0, j;
   char tmp[1024];
@@ -155,7 +155,7 @@ static void Print_StringOptionsDoc(StringXString s[], const char *prefix, FILE *
         val[j - 1] = '.';
     }
     fprintf(file, "Default value: @code{\"%s\"}@*\n", val.c_str());
-    fprintf(file, "Saved in: @code{%s}\n\n", Get_OptionSaveLevel(s[i].level));
+    fprintf(file, "Saved in: @code{%s}\n\n", GetOptionSaveLevel(s[i].level));
     i++;
   }
 }
@@ -195,7 +195,7 @@ bool NumberOption(int action, const char *category, int num,
   return true;
 }
 
-static void Set_DefaultNumberOptions(int num, StringXNumber s[])
+static void SetDefaultNumberOptions(int num, StringXNumber s[])
 {
   int i = 0;
   while(s[i].str) {
@@ -204,7 +204,7 @@ static void Set_DefaultNumberOptions(int num, StringXNumber s[])
   }
 }
 
-static void Set_NumberOptions_GUI(int num, StringXNumber s[])
+static void SetNumberOptionsGUI(int num, StringXNumber s[])
 {
   int i = 0;
   while(s[i].str) {
@@ -213,8 +213,8 @@ static void Set_NumberOptions_GUI(int num, StringXNumber s[])
   }
 }
 
-static void Print_NumberOptions(int num, int level, int diff, int help,
-				StringXNumber s[], const char *prefix, FILE * file)
+static void PrintNumberOptions(int num, int level, int diff, int help,
+                               StringXNumber s[], const char *prefix, FILE * file)
 {
   int i = 0;
   char tmp[1024];
@@ -234,14 +234,14 @@ static void Print_NumberOptions(int num, int level, int diff, int help,
   }
 }
 
-static void Print_NumberOptionsDoc(StringXNumber s[], const char *prefix, FILE * file)
+static void PrintNumberOptionsDoc(StringXNumber s[], const char *prefix, FILE * file)
 {
   int i = 0;
   while(s[i].str) {
     fprintf(file, "@item %s%s\n", prefix, s[i].str);
     fprintf(file, "%s@*\n", s[i].help);
     fprintf(file, "Default value: @code{%g}@*\n", s[i].function(0, GMSH_GET, 0));
-    fprintf(file, "Saved in: @code{%s}\n\n", Get_OptionSaveLevel(s[i].level));
+    fprintf(file, "Saved in: @code{%s}\n\n", GetOptionSaveLevel(s[i].level));
     i++;
   }
 }
@@ -281,8 +281,8 @@ bool ColorOption(int action, const char *category, int num,
   return true;
 }
 
-int Get_ColorForString(StringX4Int SX4I[], int alpha,
-                       const char *str, int *FlagError)
+int GetColorForString(StringX4Int SX4I[], int alpha,
+                      const char *str, int *FlagError)
 {
   int i = 0;
   while(SX4I[i].str && strcmp(SX4I[i].str, str))
@@ -296,7 +296,7 @@ int Get_ColorForString(StringX4Int SX4I[], int alpha,
       (SX4I[i].int1, SX4I[i].int2, SX4I[i].int3, SX4I[i].int4);
 }
 
-static void Set_DefaultColorOptions(int num, StringXColor s[])
+static void SetDefaultColorOptions(int num, StringXColor s[])
 {
   int i = 0;
   // Warning: this assumes that CTX::instance()->color_scheme is set...
@@ -325,7 +325,7 @@ static void Set_DefaultColorOptions(int num, StringXColor s[])
   }
 }
 
-static void Set_ColorOptions_GUI(int num, StringXColor s[])
+static void SetColorOptionsGUI(int num, StringXColor s[])
 {
   int i = 0;
   while(s[i].str) {
@@ -334,8 +334,8 @@ static void Set_ColorOptions_GUI(int num, StringXColor s[])
   }
 }
 
-static void Print_ColorOptions(int num, int level, int diff, int help,
-			       StringXColor s[], const char *prefix, FILE * file)
+static void PrintColorOptions(int num, int level, int diff, int help,
+                              StringXColor s[], const char *prefix, FILE * file)
 {
   int i = 0;
   char tmp[1024];
@@ -373,7 +373,7 @@ static void Print_ColorOptions(int num, int level, int diff, int help,
   }
 }
 
-static void Print_ColorOptionsDoc(StringXColor s[], const char *prefix, FILE * file)
+static void PrintColorOptionsDoc(StringXColor s[], const char *prefix, FILE * file)
 {
   int i = 0;
   while(s[i].str) {
@@ -383,81 +383,81 @@ static void Print_ColorOptionsDoc(StringXColor s[], const char *prefix, FILE * f
             CTX::instance()->unpackRed(s[i].function(0, GMSH_GET, 0)),
             CTX::instance()->unpackGreen(s[i].function(0, GMSH_GET, 0)),
             CTX::instance()->unpackBlue(s[i].function(0, GMSH_GET, 0)));
-    fprintf(file, "Saved in: @code{%s}\n\n", Get_OptionSaveLevel(s[i].level));
+    fprintf(file, "Saved in: @code{%s}\n\n", GetOptionSaveLevel(s[i].level));
     i++;
   }
 }
 
 // General routines
 
-void Init_Options(int num)
+void InitOptions(int num)
 {
   // Default string options
-  Set_DefaultStringOptions(num, GeneralOptions_String);
-  Set_DefaultStringOptions(num, GeometryOptions_String);
-  Set_DefaultStringOptions(num, MeshOptions_String);
-  Set_DefaultStringOptions(num, SolverOptions_String);
-  Set_DefaultStringOptions(num, PostProcessingOptions_String);
-  Set_DefaultStringOptions(num, ViewOptions_String);
-  Set_DefaultStringOptions(num, PrintOptions_String);
+  SetDefaultStringOptions(num, GeneralOptions_String);
+  SetDefaultStringOptions(num, GeometryOptions_String);
+  SetDefaultStringOptions(num, MeshOptions_String);
+  SetDefaultStringOptions(num, SolverOptions_String);
+  SetDefaultStringOptions(num, PostProcessingOptions_String);
+  SetDefaultStringOptions(num, ViewOptions_String);
+  SetDefaultStringOptions(num, PrintOptions_String);
 
   // Default number options
-  Set_DefaultNumberOptions(num, GeneralOptions_Number);
-  Set_DefaultNumberOptions(num, GeometryOptions_Number);
-  Set_DefaultNumberOptions(num, MeshOptions_Number);
-  Set_DefaultNumberOptions(num, SolverOptions_Number);
-  Set_DefaultNumberOptions(num, PostProcessingOptions_Number);
-  Set_DefaultNumberOptions(num, ViewOptions_Number);
-  Set_DefaultNumberOptions(num, PrintOptions_Number);
+  SetDefaultNumberOptions(num, GeneralOptions_Number);
+  SetDefaultNumberOptions(num, GeometryOptions_Number);
+  SetDefaultNumberOptions(num, MeshOptions_Number);
+  SetDefaultNumberOptions(num, SolverOptions_Number);
+  SetDefaultNumberOptions(num, PostProcessingOptions_Number);
+  SetDefaultNumberOptions(num, ViewOptions_Number);
+  SetDefaultNumberOptions(num, PrintOptions_Number);
 
   // Default color options
-  Set_DefaultColorOptions(num, GeneralOptions_Color);
-  Set_DefaultColorOptions(num, GeometryOptions_Color);
-  Set_DefaultColorOptions(num, MeshOptions_Color);
-  Set_DefaultColorOptions(num, SolverOptions_Color);
-  Set_DefaultColorOptions(num, PostProcessingOptions_Color);
-  Set_DefaultColorOptions(num, ViewOptions_Color);
-  Set_DefaultColorOptions(num, PrintOptions_Color);
+  SetDefaultColorOptions(num, GeneralOptions_Color);
+  SetDefaultColorOptions(num, GeometryOptions_Color);
+  SetDefaultColorOptions(num, MeshOptions_Color);
+  SetDefaultColorOptions(num, SolverOptions_Color);
+  SetDefaultColorOptions(num, PostProcessingOptions_Color);
+  SetDefaultColorOptions(num, ViewOptions_Color);
+  SetDefaultColorOptions(num, PrintOptions_Color);
 }
 
-void ReInit_Options(int num)
+void ReInitOptions(int num)
 {
   // horrible trick so that opt_view_XXX will act on the reference view
 #if !defined(HAVE_NO_POST)
   std::vector<PView*> tmp = PView::list;
   PView::list.clear(); 
-  Init_Options(num);
+  InitOptions(num);
   PView::list = tmp; 
   for(unsigned int i = 0; i < PView::list.size(); i++)
     PView::list[i]->setOptions();
 #endif
 }
 
-void Init_Options_GUI(int num)
+void InitOptionsGUI(int num)
 {
-  Set_StringOptions_GUI(num, GeneralOptions_String);
-  Set_StringOptions_GUI(num, GeometryOptions_String);
-  Set_StringOptions_GUI(num, MeshOptions_String);
-  Set_StringOptions_GUI(num, SolverOptions_String);
-  Set_StringOptions_GUI(num, PostProcessingOptions_String);
-  Set_StringOptions_GUI(num, PrintOptions_String);
+  SetStringOptionsGUI(num, GeneralOptions_String);
+  SetStringOptionsGUI(num, GeometryOptions_String);
+  SetStringOptionsGUI(num, MeshOptions_String);
+  SetStringOptionsGUI(num, SolverOptions_String);
+  SetStringOptionsGUI(num, PostProcessingOptions_String);
+  SetStringOptionsGUI(num, PrintOptions_String);
 
-  Set_NumberOptions_GUI(num, GeneralOptions_Number);
-  Set_NumberOptions_GUI(num, GeometryOptions_Number);
-  Set_NumberOptions_GUI(num, MeshOptions_Number);
-  Set_NumberOptions_GUI(num, SolverOptions_Number);
-  Set_NumberOptions_GUI(num, PostProcessingOptions_Number);
-  Set_NumberOptions_GUI(num, PrintOptions_Number);
+  SetNumberOptionsGUI(num, GeneralOptions_Number);
+  SetNumberOptionsGUI(num, GeometryOptions_Number);
+  SetNumberOptionsGUI(num, MeshOptions_Number);
+  SetNumberOptionsGUI(num, SolverOptions_Number);
+  SetNumberOptionsGUI(num, PostProcessingOptions_Number);
+  SetNumberOptionsGUI(num, PrintOptions_Number);
 
-  Set_ColorOptions_GUI(num, GeneralOptions_Color);
-  Set_ColorOptions_GUI(num, GeometryOptions_Color);
-  Set_ColorOptions_GUI(num, MeshOptions_Color);
-  Set_ColorOptions_GUI(num, SolverOptions_Color);
-  Set_ColorOptions_GUI(num, PostProcessingOptions_Color);
-  Set_ColorOptions_GUI(num, PrintOptions_Color);
+  SetColorOptionsGUI(num, GeneralOptions_Color);
+  SetColorOptionsGUI(num, GeometryOptions_Color);
+  SetColorOptionsGUI(num, MeshOptions_Color);
+  SetColorOptionsGUI(num, SolverOptions_Color);
+  SetColorOptionsGUI(num, PostProcessingOptions_Color);
+  SetColorOptionsGUI(num, PrintOptions_Color);
 }
 
-static void Print_OptionCategory(int level, int diff, int help, const char *cat,
+static void PrintOptionCategory(int level, int diff, int help, const char *cat,
                                  FILE *file)
 {
   if(diff || !help || !(level & GMSH_FULLRC))
@@ -474,7 +474,7 @@ static void Print_OptionCategory(int level, int diff, int help, const char *cat,
   }
 }
 
-GmshColorTable *Get_ColorTable(int num)
+GmshColorTable *GetColorTable(int num)
 {
 #if !defined(HAVE_NO_POST)
   PViewOptions *opt;
@@ -491,7 +491,7 @@ GmshColorTable *Get_ColorTable(int num)
 #endif
 }
 
-static void Print_ColorTable(int num, int diff, const char *prefix, FILE *file)
+static void PrintColorTable(int num, int diff, const char *prefix, FILE *file)
 {
 #if !defined(HAVE_NO_POST)
   PViewOptions *opt;
@@ -542,7 +542,7 @@ static void Sanitize_String_Texi(std::string &s)
     s.insert(i++, "@");
 }
 
-void Print_Options(int num, int level, int diff, int help, const char *filename)
+void PrintOptions(int num, int level, int diff, int help, const char *filename)
 {
 #if defined(HAVE_FLTK)
   if(GUI::available())
@@ -584,42 +584,42 @@ void Print_Options(int num, int level, int diff, int help, const char *filename)
     fprintf(file, "//\n");
   }
 
-  Print_OptionCategory(level, diff, help, "General options (strings)", file);
-  Print_StringOptions(num, level, diff, help, GeneralOptions_String, "General.", file);
-  Print_OptionCategory(level, diff, help, "General options (numbers)", file);
-  Print_NumberOptions(num, level, diff, help, GeneralOptions_Number, "General.", file);
-  Print_OptionCategory(level, diff, help, "General options (colors)", file);
-  Print_ColorOptions(num, level, diff, help, GeneralOptions_Color, "General.", file);
-
-  Print_OptionCategory(level, diff, help, "Geometry options (strings)", file);
-  Print_StringOptions(num, level, diff, help, GeometryOptions_String, "Geometry.", file);
-  Print_OptionCategory(level, diff, help, "Geometry options (numbers)", file);
-  Print_NumberOptions(num, level, diff, help, GeometryOptions_Number, "Geometry.", file);
-  Print_OptionCategory(level, diff, help, "Geometry options (colors)", file);
-  Print_ColorOptions(num, level, diff, help, GeometryOptions_Color, "Geometry.", file);
-
-  Print_OptionCategory(level, diff, help, "Mesh options (strings)", file);
-  Print_StringOptions(num, level, diff, help, MeshOptions_String, "Mesh.", file);
-  Print_OptionCategory(level, diff, help, "Mesh options (numbers)", file);
-  Print_NumberOptions(num, level, diff, help, MeshOptions_Number, "Mesh.", file);
-  Print_OptionCategory(level, diff, help, "Mesh options (colors)", file);
-  Print_ColorOptions(num, level, diff, help, MeshOptions_Color, "Mesh.", file);
-
-  Print_OptionCategory(level, diff, help, "Solver options (strings)", file);
-  Print_StringOptions(num, level, diff, help, SolverOptions_String, "Solver.", file);
-  Print_OptionCategory(level, diff, help, "Solver options (numbers)", file);
-  Print_NumberOptions(num, level, diff, help, SolverOptions_Number, "Solver.", file);
-  Print_OptionCategory(level, diff, help, "Solver options (colors)", file);
-  Print_ColorOptions(num, level, diff, help, SolverOptions_Color, "Solver.", file);
-
-  Print_OptionCategory(level, diff, help, "Post-processing options (strings)", file);
-  Print_StringOptions(num, level, diff, help, PostProcessingOptions_String,
+  PrintOptionCategory(level, diff, help, "General options (strings)", file);
+  PrintStringOptions(num, level, diff, help, GeneralOptions_String, "General.", file);
+  PrintOptionCategory(level, diff, help, "General options (numbers)", file);
+  PrintNumberOptions(num, level, diff, help, GeneralOptions_Number, "General.", file);
+  PrintOptionCategory(level, diff, help, "General options (colors)", file);
+  PrintColorOptions(num, level, diff, help, GeneralOptions_Color, "General.", file);
+
+  PrintOptionCategory(level, diff, help, "Geometry options (strings)", file);
+  PrintStringOptions(num, level, diff, help, GeometryOptions_String, "Geometry.", file);
+  PrintOptionCategory(level, diff, help, "Geometry options (numbers)", file);
+  PrintNumberOptions(num, level, diff, help, GeometryOptions_Number, "Geometry.", file);
+  PrintOptionCategory(level, diff, help, "Geometry options (colors)", file);
+  PrintColorOptions(num, level, diff, help, GeometryOptions_Color, "Geometry.", file);
+
+  PrintOptionCategory(level, diff, help, "Mesh options (strings)", file);
+  PrintStringOptions(num, level, diff, help, MeshOptions_String, "Mesh.", file);
+  PrintOptionCategory(level, diff, help, "Mesh options (numbers)", file);
+  PrintNumberOptions(num, level, diff, help, MeshOptions_Number, "Mesh.", file);
+  PrintOptionCategory(level, diff, help, "Mesh options (colors)", file);
+  PrintColorOptions(num, level, diff, help, MeshOptions_Color, "Mesh.", file);
+
+  PrintOptionCategory(level, diff, help, "Solver options (strings)", file);
+  PrintStringOptions(num, level, diff, help, SolverOptions_String, "Solver.", file);
+  PrintOptionCategory(level, diff, help, "Solver options (numbers)", file);
+  PrintNumberOptions(num, level, diff, help, SolverOptions_Number, "Solver.", file);
+  PrintOptionCategory(level, diff, help, "Solver options (colors)", file);
+  PrintColorOptions(num, level, diff, help, SolverOptions_Color, "Solver.", file);
+
+  PrintOptionCategory(level, diff, help, "Post-processing options (strings)", file);
+  PrintStringOptions(num, level, diff, help, PostProcessingOptions_String,
                       "PostProcessing.", file);
-  Print_OptionCategory(level, diff, help, "Post-processing options (numbers)", file);
-  Print_NumberOptions(num, level, diff, help, PostProcessingOptions_Number,
+  PrintOptionCategory(level, diff, help, "Post-processing options (numbers)", file);
+  PrintNumberOptions(num, level, diff, help, PostProcessingOptions_Number,
                       "PostProcessing.", file);
-  Print_OptionCategory(level, diff, help, "Post-processing options (colors)", file);
-  Print_ColorOptions(num, level, diff, help, PostProcessingOptions_Color,
+  PrintOptionCategory(level, diff, help, "Post-processing options (colors)", file);
+  PrintColorOptions(num, level, diff, help, PostProcessingOptions_Color,
                      "PostProcessing.", file);
 
   if(level & GMSH_FULLRC) {
@@ -627,38 +627,38 @@ void Print_Options(int num, int level, int diff, int help, const char *filename)
     for(unsigned int i = 0; i < PView::list.size(); i++) {
       char tmp[256];
       sprintf(tmp, "View[%d].", i);
-      Print_OptionCategory(level, diff, help, "View options (strings)", file);
-      Print_StringOptions(i, level, diff, help, ViewOptions_String, tmp, file);
-      Print_OptionCategory(level, diff, help, "View options (numbers)", file);
-      Print_NumberOptions(i, level, diff, help, ViewOptions_Number, tmp, file);
-      Print_OptionCategory(level, diff, help, "View options (colors)", file);
-      Print_ColorOptions(i, level, diff, help, ViewOptions_Color, tmp, file);
+      PrintOptionCategory(level, diff, help, "View options (strings)", file);
+      PrintStringOptions(i, level, diff, help, ViewOptions_String, tmp, file);
+      PrintOptionCategory(level, diff, help, "View options (numbers)", file);
+      PrintNumberOptions(i, level, diff, help, ViewOptions_Number, tmp, file);
+      PrintOptionCategory(level, diff, help, "View options (colors)", file);
+      PrintColorOptions(i, level, diff, help, ViewOptions_Color, tmp, file);
       strcat(tmp, "ColorTable");
-      Print_ColorTable(i, diff, tmp, file);
+      PrintColorTable(i, diff, tmp, file);
     }
 #endif
   }
   else if(level & GMSH_OPTIONSRC) {
-    Print_OptionCategory(level, diff, help, "View options (strings)", file);
-    Print_StringOptions(num, level, diff, help, ViewOptions_String, "View.", file);
-    Print_OptionCategory(level, diff, help, "View options (numbers)", file);
-    Print_NumberOptions(num, level, diff, help, ViewOptions_Number, "View.", file);
-    Print_OptionCategory(level, diff, help, "View options (colors)", file);
-    Print_ColorOptions(num, level, diff, help, ViewOptions_Color, "View.", file);
-    Print_ColorTable(num, diff, "View.ColorTable", file);
-  }
-
-  Print_OptionCategory(level, diff, help, "Print options (strings)", file);
-  Print_StringOptions(num, level, diff, help, PrintOptions_String, "Print.", file);
-  Print_OptionCategory(level, diff, help, "Print options (numbers)", file);
-  Print_NumberOptions(num, level, diff, help, PrintOptions_Number, "Print.", file);
-  Print_OptionCategory(level, diff, help, "Print options (colors)", file);
-  Print_ColorOptions(num, level, diff, help, PrintOptions_Color, "Print.", file);
+    PrintOptionCategory(level, diff, help, "View options (strings)", file);
+    PrintStringOptions(num, level, diff, help, ViewOptions_String, "View.", file);
+    PrintOptionCategory(level, diff, help, "View options (numbers)", file);
+    PrintNumberOptions(num, level, diff, help, ViewOptions_Number, "View.", file);
+    PrintOptionCategory(level, diff, help, "View options (colors)", file);
+    PrintColorOptions(num, level, diff, help, ViewOptions_Color, "View.", file);
+    PrintColorTable(num, diff, "View.ColorTable", file);
+  }
+
+  PrintOptionCategory(level, diff, help, "Print options (strings)", file);
+  PrintStringOptions(num, level, diff, help, PrintOptions_String, "Print.", file);
+  PrintOptionCategory(level, diff, help, "Print options (numbers)", file);
+  PrintNumberOptions(num, level, diff, help, PrintOptions_Number, "Print.", file);
+  PrintOptionCategory(level, diff, help, "Print options (colors)", file);
+  PrintColorOptions(num, level, diff, help, PrintOptions_Color, "Print.", file);
 
   if(filename) fclose(file);
 }
 
-void Print_OptionsDoc()
+void PrintOptionsDoc()
 {
   const char *warn =
     "@c\n"
@@ -672,9 +672,9 @@ void Print_OptionsDoc()
     return;
   }
   fprintf(file, "%s@ftable @code\n", warn);
-  Print_StringOptionsDoc(GeneralOptions_String, "General.", file);
-  Print_NumberOptionsDoc(GeneralOptions_Number, "General.", file);
-  Print_ColorOptionsDoc(GeneralOptions_Color, "General.", file);
+  PrintStringOptionsDoc(GeneralOptions_String, "General.", file);
+  PrintNumberOptionsDoc(GeneralOptions_Number, "General.", file);
+  PrintColorOptionsDoc(GeneralOptions_Color, "General.", file);
   fprintf(file, "@end ftable\n");
   fclose(file);
 
@@ -684,9 +684,9 @@ void Print_OptionsDoc()
     return;
   }
   fprintf(file, "%s@ftable @code\n", warn);
-  Print_StringOptionsDoc(PrintOptions_String, "Print.", file);
-  Print_NumberOptionsDoc(PrintOptions_Number, "Print.", file);
-  Print_ColorOptionsDoc(PrintOptions_Color, "Print.", file);
+  PrintStringOptionsDoc(PrintOptions_String, "Print.", file);
+  PrintNumberOptionsDoc(PrintOptions_Number, "Print.", file);
+  PrintColorOptionsDoc(PrintOptions_Color, "Print.", file);
   fprintf(file, "@end ftable\n");
   fclose(file);
 
@@ -696,9 +696,9 @@ void Print_OptionsDoc()
     return;
   }
   fprintf(file, "%s@ftable @code\n", warn);
-  Print_StringOptionsDoc(GeometryOptions_String, "Geometry.", file);
-  Print_NumberOptionsDoc(GeometryOptions_Number, "Geometry.", file);
-  Print_ColorOptionsDoc(GeometryOptions_Color, "Geometry.", file);
+  PrintStringOptionsDoc(GeometryOptions_String, "Geometry.", file);
+  PrintNumberOptionsDoc(GeometryOptions_Number, "Geometry.", file);
+  PrintColorOptionsDoc(GeometryOptions_Color, "Geometry.", file);
   fprintf(file, "@end ftable\n");
   fclose(file);
 
@@ -708,9 +708,9 @@ void Print_OptionsDoc()
     return;
   }
   fprintf(file, "%s@ftable @code\n", warn);
-  Print_StringOptionsDoc(MeshOptions_String, "Mesh.", file);
-  Print_NumberOptionsDoc(MeshOptions_Number, "Mesh.", file);
-  Print_ColorOptionsDoc(MeshOptions_Color, "Mesh.", file);
+  PrintStringOptionsDoc(MeshOptions_String, "Mesh.", file);
+  PrintNumberOptionsDoc(MeshOptions_Number, "Mesh.", file);
+  PrintColorOptionsDoc(MeshOptions_Color, "Mesh.", file);
   fprintf(file, "@end ftable\n");
   fclose(file);
 
@@ -720,9 +720,9 @@ void Print_OptionsDoc()
     return;
   }
   fprintf(file, "%s@ftable @code\n", warn);
-  Print_StringOptionsDoc(SolverOptions_String, "Solver.", file);
-  Print_NumberOptionsDoc(SolverOptions_Number, "Solver.", file);
-  Print_ColorOptionsDoc(SolverOptions_Color, "Solver.", file);
+  PrintStringOptionsDoc(SolverOptions_String, "Solver.", file);
+  PrintNumberOptionsDoc(SolverOptions_Number, "Solver.", file);
+  PrintColorOptionsDoc(SolverOptions_Color, "Solver.", file);
   fprintf(file, "@end ftable\n");
   fclose(file);
 
@@ -732,9 +732,9 @@ void Print_OptionsDoc()
     return;
   }
   fprintf(file, "%s@ftable @code\n", warn);
-  Print_StringOptionsDoc(PostProcessingOptions_String, "PostProcessing.", file);
-  Print_NumberOptionsDoc(PostProcessingOptions_Number, "PostProcessing.", file);
-  Print_ColorOptionsDoc(PostProcessingOptions_Color, "PostProcessing.", file);
+  PrintStringOptionsDoc(PostProcessingOptions_String, "PostProcessing.", file);
+  PrintNumberOptionsDoc(PostProcessingOptions_Number, "PostProcessing.", file);
+  PrintColorOptionsDoc(PostProcessingOptions_Color, "PostProcessing.", file);
   fprintf(file, "@end ftable\n");
   fclose(file);
 
@@ -745,13 +745,13 @@ void Print_OptionsDoc()
     return;
   }
   fprintf(file, "%s@ftable @code\n", warn);
-  Print_StringOptionsDoc(ViewOptions_String, "View.", file);
-  Print_NumberOptionsDoc(ViewOptions_Number, "View.", file);
-  Print_ColorOptionsDoc(ViewOptions_Color, "View.", file);
+  PrintStringOptionsDoc(ViewOptions_String, "View.", file);
+  PrintNumberOptionsDoc(ViewOptions_Number, "View.", file);
+  PrintColorOptionsDoc(ViewOptions_Color, "View.", file);
   fprintf(file, "@item View.ColorTable\n");
   fprintf(file, "Color table used to draw the view@*\n");
   fprintf(file, "Saved in: @code{%s}\n\n",
-          Get_OptionSaveLevel(GMSH_FULLRC|GMSH_OPTIONSRC));
+          GetOptionSaveLevel(GMSH_FULLRC|GMSH_OPTIONSRC));
   fprintf(file, "@end ftable\n");
   fclose(file);
 
@@ -3477,33 +3477,33 @@ double opt_general_color_scheme(OPT_ARGS_NUM)
     CTX::instance()->colorScheme = (int)val;
     if(CTX::instance()->colorScheme > 2)
       CTX::instance()->colorScheme = 0;
-    Set_DefaultColorOptions(0, GeneralOptions_Color);
-    Set_DefaultColorOptions(0, GeometryOptions_Color);
-    Set_DefaultColorOptions(0, MeshOptions_Color);
-    Set_DefaultColorOptions(0, SolverOptions_Color);
-    Set_DefaultColorOptions(0, PostProcessingOptions_Color);
+    SetDefaultColorOptions(0, GeneralOptions_Color);
+    SetDefaultColorOptions(0, GeometryOptions_Color);
+    SetDefaultColorOptions(0, MeshOptions_Color);
+    SetDefaultColorOptions(0, SolverOptions_Color);
+    SetDefaultColorOptions(0, PostProcessingOptions_Color);
 #if !defined(HAVE_NO_POST)
     for(unsigned int i = 0; i < PView::list.size(); i++)
-      Set_DefaultColorOptions(i, ViewOptions_Color);
+      SetDefaultColorOptions(i, ViewOptions_Color);
 #endif
-    Set_DefaultColorOptions(0, PrintOptions_Color);
+    SetDefaultColorOptions(0, PrintOptions_Color);
 
-    Set_ColorOptions_GUI(0, GeneralOptions_Color);
-    Set_ColorOptions_GUI(0, GeometryOptions_Color);
-    Set_ColorOptions_GUI(0, MeshOptions_Color);
-    Set_ColorOptions_GUI(0, SolverOptions_Color);
-    Set_ColorOptions_GUI(0, PostProcessingOptions_Color);
+    SetColorOptionsGUI(0, GeneralOptions_Color);
+    SetColorOptionsGUI(0, GeometryOptions_Color);
+    SetColorOptionsGUI(0, MeshOptions_Color);
+    SetColorOptionsGUI(0, SolverOptions_Color);
+    SetColorOptionsGUI(0, PostProcessingOptions_Color);
 #if !defined(HAVE_NO_POST)
     for(unsigned int i = 0; i < PView::list.size(); i++)
-      Set_ColorOptions_GUI(i, ViewOptions_Color);
+      SetColorOptionsGUI(i, ViewOptions_Color);
 #endif
-    Set_ColorOptions_GUI(0, PrintOptions_Color);
+    SetColorOptionsGUI(0, PrintOptions_Color);
 
 #if !defined(HAVE_NO_POST)
     // horrible trick so that opt_view_XXX will act on the reference view
     std::vector<PView*> tmp = PView::list;
     PView::list.clear();
-    Set_DefaultColorOptions(0, ViewOptions_Color);
+    SetDefaultColorOptions(0, ViewOptions_Color);
     PView::list = tmp;
 #endif
   }
diff --git a/Common/Options.h b/Common/Options.h
index 0866394d24e5efb48701f8c89faba07ecd842989..bbe99a21e1cffb0e004872d5ef3ade965dcf7020 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -795,11 +795,11 @@ typedef struct {
   const char *help;
 } StringXColor;
 
-void Init_Options(int num);
-void Init_Options_GUI(int num);
-void ReInit_Options(int num);
-void Print_Options(int num, int level, int diff, int help, const char *filename);
-void Print_OptionsDoc();
+void InitOptions(int num);
+void InitOptionsGUI(int num);
+void ReInitOptions(int num);
+void PrintOptions(int num, int level, int diff, int help, const char *filename);
+void PrintOptionsDoc();
 
 bool StringOption(int action, const char *category, int num, 
 		  const char *name, std::string &val);
@@ -808,6 +808,6 @@ bool NumberOption(int action, const char *category, int num,
 bool ColorOption(int action, const char *category, int num, 
 		 const char *name, unsigned int &val);
 
-GmshColorTable *Get_ColorTable(int num);
+GmshColorTable *GetColorTable(int num);
 
 #endif
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index fa8be00b2a36d36648f69ae58238f2e18824dbff..a3bc0027ce7f5c839a02e891e830b5ed2614f0e0 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -29,9 +29,9 @@ int main(int argc, char *argv[])
   // Hack to generate automatic documentation (before getting
   // user-defined options)
   if(argc == 2 && std::string(argv[1]) == "-doc"){
-    Init_Options(0);
+    InitOptions(0);
     PluginManager::instance()->registerDefaultPlugins();
-    Print_OptionsDoc();
+    PrintOptionsDoc();
     exit(0);
   }
 
@@ -50,20 +50,20 @@ int main(int argc, char *argv[])
   GUI::instance(argc, argv);
 
   // Set all previously defined options in the GUI
-  Init_Options_GUI(0);
+  InitOptionsGUI(0);
 
   // Say welcome!
   Msg::StatusBar(1, false, "Geometry");
-  Msg::StatusBar(2, false, "Gmsh %s", Get_GmshVersion());
+  Msg::StatusBar(2, false, "Gmsh %s", GetGmshVersion());
 
   // Log the following for bug reports
   Msg::Info("-------------------------------------------------------");
-  Msg::Info("Gmsh version   : %s", Get_GmshVersion());
-  Msg::Info("Build OS       : %s", Get_GmshBuildOS());
-  Msg::Info("Build options  :%s", Get_GmshBuildOptions());
-  Msg::Info("Build date     : %s", Get_GmshBuildDate());
-  Msg::Info("Build host     : %s", Get_GmshBuildHost());
-  Msg::Info("Packager       : %s", Get_GmshPackager());
+  Msg::Info("Gmsh version   : %s", GetGmshVersion());
+  Msg::Info("Build OS       : %s", GetGmshBuildOS());
+  Msg::Info("Build options  :%s", GetGmshBuildOptions());
+  Msg::Info("Build date     : %s", GetGmshBuildDate());
+  Msg::Info("Build host     : %s", GetGmshBuildHost());
+  Msg::Info("Packager       : %s", GetGmshPackager());
   Msg::Info("Home directory : %s", CTX::instance()->homeDir.c_str());
   Msg::Info("Launch date    : %s", Msg::GetLaunchDate().c_str());
   Msg::Info("Command line   : %s", Msg::GetCommandLine().c_str());
diff --git a/Fltk/aboutWindow.cpp b/Fltk/aboutWindow.cpp
index 94abcdb16cc120dfb8c0d68095824088cc2579b7..f2b4fb718f61cd3ce327355be0f3be964313e0be 100644
--- a/Fltk/aboutWindow.cpp
+++ b/Fltk/aboutWindow.cpp
@@ -60,20 +60,20 @@ aboutWindow::aboutWindow()
     o->add("@c@.Please send all questions and bug reports to");
     o->add("@c@b@.gmsh@geuz.org");
     o->add(" ");
-    sprintf(buffer, "@c@.Version: %s", Get_GmshVersion());
+    sprintf(buffer, "@c@.Version: %s", GetGmshVersion());
     o->add(buffer);
-    sprintf(buffer, "@c@.License: %s", Get_GmshShortLicense());
+    sprintf(buffer, "@c@.License: %s", GetGmshShortLicense());
     o->add(buffer);
     sprintf(buffer, "@c@.Graphical user interface toolkit: FLTK %d.%d.%d", 
             FL_MAJOR_VERSION, FL_MINOR_VERSION, FL_PATCH_VERSION);
     o->add(buffer);
-    sprintf(buffer, "@c@.Build OS: %s", Get_GmshBuildOS());
+    sprintf(buffer, "@c@.Build OS: %s", GetGmshBuildOS());
     o->add(buffer);
-    sprintf(buffer, "@c@.Build date: %s", Get_GmshBuildDate());
+    sprintf(buffer, "@c@.Build date: %s", GetGmshBuildDate());
     o->add(buffer);
-    sprintf(buffer, "@c@.Build host: %s", Get_GmshBuildHost());
+    sprintf(buffer, "@c@.Build host: %s", GetGmshBuildHost());
     o->add(buffer);
-    std::vector<std::string> lines = SplitWhiteSpace(Get_GmshBuildOptions(), 30);
+    std::vector<std::string> lines = SplitWhiteSpace(GetGmshBuildOptions(), 30);
     for(unsigned int i = 0; i < lines.size(); i++){
       if(!i)
         sprintf(buffer, "@c@.Build options:%s", lines[i].c_str());
@@ -81,7 +81,7 @@ aboutWindow::aboutWindow()
         sprintf(buffer, "@c@.%s", lines[i].c_str());
         o->add(buffer);
       }
-    sprintf(buffer, "@c@.Packaged by: %s", Get_GmshPackager());
+    sprintf(buffer, "@c@.Packaged by: %s", GetGmshPackager());
     o->add(buffer);
     o->add(" ");
     o->add("@c@.Visit http://www.geuz.org/gmsh/ for more information");
diff --git a/Fltk/fileDialogs.cpp b/Fltk/fileDialogs.cpp
index 64c2f4c191ea7e03e49f2ad2021a984f2626b568..1ecbb9f25bb0fcecb56da12fa74a87a7ce36f0e3 100644
--- a/Fltk/fileDialogs.cpp
+++ b/Fltk/fileDialogs.cpp
@@ -528,7 +528,7 @@ int options_dialog(const char *name)
       if (!o) break;
       if (o == dialog->ok) {
         Msg::StatusBar(2, true, "Writing '%s'", name);
-        Print_Options(0, GMSH_FULLRC, dialog->b[0]->value(), dialog->b[1]->value(), name);
+        PrintOptions(0, GMSH_FULLRC, dialog->b[0]->value(), dialog->b[1]->value(), name);
         Msg::StatusBar(2, true, "Wrote '%s'", name);
         dialog->window->hide();
         return 1;
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 0b12975e0dc2596f44b116ff9a5127b5f8fb2435..77f00e9501706fe1639bf97f8416034a47e0a1c0 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -167,7 +167,7 @@ void status_options_cb(Fl_Widget *w, void *data)
     model_chooser();
   }
   else if(!strcmp(str, "?")){ // display options
-    Print_Options(0, GMSH_FULLRC, 0, 1, NULL);
+    PrintOptions(0, GMSH_FULLRC, 0, 1, NULL);
     GUI::instance()->messages->show();
   }
   else if(!strcmp(str, "p")){ // toggle projection mode
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index 3fad8f5dcf08b3d9dbbe4dc5d5258116ec0cb8b2..9f744901e60f43a67a55c9e98ac0d37f2d7ff90b 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -320,7 +320,7 @@ static void file_options_save_cb(Fl_Widget *w, void *data)
 {
   std::string fileName = GModel::current()->getFileName() + ".opt";
   Msg::StatusBar(2, true, "Writing '%s'", fileName.c_str());
-  Print_Options(0, GMSH_FULLRC, 1, 0, fileName.c_str());
+  PrintOptions(0, GMSH_FULLRC, 1, 0, fileName.c_str());
   Msg::StatusBar(2, true, "Wrote '%s'", fileName.c_str());
 }
 
@@ -475,7 +475,7 @@ static void help_mouse_cb(Fl_Widget *w, void *data)
 static void help_command_line_cb(Fl_Widget *w, void *data)
 {
   Msg::Direct(" ");
-  Print_Usage("gmsh");
+  PrintUsage("gmsh");
   GUI::instance()->messages->show();
 }
 
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 1112109a142dcf2e7813d108de8f9f5ae771015c..837770850ac4c24d885b7e4535aad8bb8289ab6a 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -146,7 +146,7 @@ void options_save_cb(Fl_Widget *w, void *data)
 {
   std::string fileName = CTX::instance()->homeDir + CTX::instance()->optionsFileName;
   Msg::StatusBar(2, true, "Writing '%s'", fileName.c_str());
-  Print_Options(0, GMSH_OPTIONSRC, 1, 1, fileName.c_str());
+  PrintOptions(0, GMSH_OPTIONSRC, 1, 1, fileName.c_str());
   Msg::StatusBar(2, true, "Wrote '%s'", fileName.c_str());
 }
 
@@ -155,8 +155,8 @@ static void options_restore_defaults_cb(Fl_Widget *w, void *data)
   // not sure if we have to remove the file...
   UnlinkFile(CTX::instance()->homeDir + CTX::instance()->sessionFileName);
   UnlinkFile(CTX::instance()->homeDir + CTX::instance()->optionsFileName);
-  ReInit_Options(0);
-  Init_Options_GUI(0);
+  ReInitOptions(0);
+  InitOptionsGUI(0);
   if(GUI::instance()->menu->module->value() == 3) // hack to refresh the buttons
     GUI::instance()->menu->setContext(menu_post, 0);
   Draw();
@@ -250,8 +250,8 @@ static void general_options_ok_cb(Fl_Widget *w, void *data)
   double sessionrc = opt_general_session_save(0, GMSH_GET, 0);
   opt_general_session_save(0, GMSH_SET, o->general.butt[8]->value());
   if(sessionrc && !opt_general_session_save(0, GMSH_GET, 0))
-    Print_Options(0, GMSH_SESSIONRC, 1, 1, 
-                  (CTX::instance()->homeDir + CTX::instance()->sessionFileName).c_str());
+    PrintOptions(0, GMSH_SESSIONRC, 1, 1, 
+                 (CTX::instance()->homeDir + CTX::instance()->sessionFileName).c_str());
   opt_general_options_save(0, GMSH_SET, o->general.butt[9]->value());
   opt_general_expert_mode(0, GMSH_SET, o->general.butt[10]->value());
   opt_general_tooltips(0, GMSH_SET, o->general.butt[13]->value());
diff --git a/Geo/Makefile b/Geo/Makefile
index 241c249759a0d17f8632b500e93aed766b2bcbf0..4b260b78fbd9f18be6d94c2ab9206cd5686eebea 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -99,12 +99,12 @@ GFaceCompound${OBJEXT}: GFaceCompound.cpp ../Common/GmshConfig.h GFaceCompound.h
   ../Numeric/gmshAssembler.h ../Numeric/gmshLinearSystem.h \
   ../Numeric/gmshLaplace.h ../Numeric/gmshTermOfFormulation.h \
   ../Numeric/GmshMatrix.h ../Common/GmshMessage.h \
-  ../Numeric/gmshAssembler.h ../Geo/GModel.h ../Geo/GVertex.h \
-  ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h ../Geo/GEntity.h \
-  ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/MElement.h \
-  ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint2.h \
-  ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
-  ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+  ../Numeric/gmshFunction.h ../Numeric/gmshAssembler.h ../Geo/GModel.h \
+  ../Geo/GVertex.h ../Geo/GEdge.h ../Geo/GFace.h ../Geo/GRegion.h \
+  ../Geo/GEntity.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
+  ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
+  ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
+  ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
   ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
   ../Numeric/gmshFunction.h ../Common/Gmsh.h ../Common/GmshMessage.h \
   ../Numeric/GmshMatrix.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 5da0e80b3f614f27e2b5eca7a46ebcf692006b41..35b80dc2d471e01116913b0e3f324bc06add3ae6 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -129,13 +129,14 @@ gmshSmoothHighOrder${OBJEXT}: gmshSmoothHighOrder.cpp HighOrder.h \
   meshGFaceDelaunayInsertion.h gmshSmoothHighOrder.h \
   ../Numeric/gmshAssembler.h ../Numeric/gmshLinearSystem.h \
   ../Numeric/gmshLaplace.h ../Numeric/gmshTermOfFormulation.h \
-  ../Numeric/GmshMatrix.h ../Numeric/gmshAssembler.h \
-  ../Numeric/gmshFunction.h ../Common/Gmsh.h ../Common/GmshMessage.h \
-  ../Numeric/GmshMatrix.h ../Numeric/gmshElasticity.h \
-  ../Numeric/gmshTermOfFormulation.h ../Numeric/GmshMatrix.h \
-  ../Numeric/gmshLinearSystemGmm.h ../Numeric/gmshLinearSystem.h \
-  ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
-  ../Numeric/Numeric.h ../Numeric/GmshMatrix.h
+  ../Numeric/GmshMatrix.h ../Numeric/gmshFunction.h \
+  ../Numeric/gmshAssembler.h ../Numeric/gmshFunction.h ../Common/Gmsh.h \
+  ../Common/GmshMessage.h ../Numeric/GmshMatrix.h \
+  ../Numeric/gmshElasticity.h ../Numeric/gmshTermOfFormulation.h \
+  ../Numeric/GmshMatrix.h ../Numeric/gmshLinearSystemGmm.h \
+  ../Numeric/gmshLinearSystem.h ../Common/Context.h ../Geo/CGNSOptions.h \
+  ../Mesh/meshPartitionOptions.h ../Numeric/Numeric.h \
+  ../Numeric/GmshMatrix.h
 meshGEdge${OBJEXT}: meshGEdge.cpp ../Geo/GModel.h ../Geo/GVertex.h \
   ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
   ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
diff --git a/Numeric/Makefile b/Numeric/Makefile
index 9ab2bb5e4daf81fa553ceee8321dd04c780196c6..5fb873468a0913221046ca5aa36bf6547978873a 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -58,8 +58,8 @@ GmshMatrix${OBJEXT}: GmshMatrix.cpp ../Common/GmshConfig.h GmshMatrix.h \
   ../Common/GmshMessage.h
 gmshLaplace${OBJEXT}: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \
   GmshMatrix.h ../Common/GmshConfig.h ../Common/GmshMessage.h \
-  gmshAssembler.h gmshLinearSystem.h ../Geo/GModel.h ../Geo/GVertex.h \
-  ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+  gmshFunction.h gmshAssembler.h gmshLinearSystem.h ../Geo/GModel.h \
+  ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
   ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
   ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
   ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
@@ -70,39 +70,39 @@ gmshLaplace${OBJEXT}: gmshLaplace.cpp gmshLaplace.h gmshTermOfFormulation.h \
   ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h \
   ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
   ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
-  ../Numeric/Gauss.h gmshFunction.h ../Common/Gmsh.h \
-  ../Common/GmshMessage.h Numeric.h
+  ../Numeric/Gauss.h ../Common/Gmsh.h ../Common/GmshMessage.h Numeric.h
 gmshHelmholtz${OBJEXT}: gmshHelmholtz.cpp gmshHelmholtz.h \
   gmshTermOfFormulation.h GmshMatrix.h ../Common/GmshConfig.h \
-  ../Common/GmshMessage.h gmshAssembler.h gmshLinearSystem.h \
-  ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
-  ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
-  ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
-  ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
-  ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \
-  ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
-  ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
-  ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
-  ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h \
-  ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
-  ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
-  ../Numeric/Gauss.h gmshFunction.h ../Common/Gmsh.h \
-  ../Common/GmshMessage.h Numeric.h
+  ../Common/GmshMessage.h gmshFunction.h gmshAssembler.h \
+  gmshLinearSystem.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
+  ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
+  ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
+  ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+  ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
+  ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
+  ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
+  ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/MElement.h \
+  ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint2.h \
+  ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+  ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+  ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
+  ../Common/Gmsh.h ../Common/GmshMessage.h Numeric.h
 gmshElasticity${OBJEXT}: gmshElasticity.cpp gmshElasticity.h \
   gmshTermOfFormulation.h GmshMatrix.h ../Common/GmshConfig.h \
-  ../Common/GmshMessage.h gmshAssembler.h gmshLinearSystem.h \
-  ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
-  ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
-  ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
-  ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
-  ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \
-  ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
-  ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
-  ../Geo/SBoundingBox3d.h ../Geo/MElement.h ../Common/GmshDefines.h \
-  ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h \
-  ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
-  ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
-  ../Numeric/Gauss.h ../Common/Gmsh.h ../Common/GmshMessage.h Numeric.h
+  ../Common/GmshMessage.h gmshFunction.h gmshAssembler.h \
+  gmshLinearSystem.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
+  ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
+  ../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
+  ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+  ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
+  ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
+  ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
+  ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/MElement.h \
+  ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint2.h \
+  ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+  ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+  ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
+  ../Common/Gmsh.h ../Common/GmshMessage.h Numeric.h
 EigSolve${OBJEXT}: EigSolve.cpp
 FunctionSpace${OBJEXT}: FunctionSpace.cpp FunctionSpace.h GmshMatrix.h \
   ../Common/GmshConfig.h ../Common/GmshMessage.h ../Common/GmshDefines.h
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 8077401af6406a6a47e148044f838ab2b23b10d3..37b3ca182c92bf6dd0c143aa418647c9850e2c0f 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -4473,7 +4473,7 @@ yyreduce:
   case 77:
 #line 835 "Gmsh.y"
     {
-      GmshColorTable *ct = Get_ColorTable(0);
+      GmshColorTable *ct = GetColorTable(0);
       if(!ct)
 	yymsg(0, "View[%d] does not exist", 0);
       else{
@@ -4496,7 +4496,7 @@ yyreduce:
   case 78:
 #line 855 "Gmsh.y"
     {
-      GmshColorTable *ct = Get_ColorTable((int)(yyvsp[(3) - (9)].d));
+      GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (9)].d));
       if(!ct)
 	yymsg(0, "View[%d] does not exist", (int)(yyvsp[(3) - (9)].d));
       else{
@@ -7171,17 +7171,17 @@ yyreduce:
 
   case 294:
 #line 2938 "Gmsh.y"
-    { (yyval.d) = Get_GmshMajorVersion(); ;}
+    { (yyval.d) = GetGmshMajorVersion(); ;}
     break;
 
   case 295:
 #line 2939 "Gmsh.y"
-    { (yyval.d) = Get_GmshMinorVersion(); ;}
+    { (yyval.d) = GetGmshMinorVersion(); ;}
     break;
 
   case 296:
 #line 2940 "Gmsh.y"
-    { (yyval.d) = Get_GmshPatchVersion(); ;}
+    { (yyval.d) = GetGmshPatchVersion(); ;}
     break;
 
   case 297:
@@ -7653,7 +7653,7 @@ yyreduce:
 #line 3313 "Gmsh.y"
     {
       int flag;
-      (yyval.u) = Get_ColorForString(ColorString, -1, (yyvsp[(1) - (1)].c), &flag);
+      (yyval.u) = GetColorForString(ColorString, -1, (yyvsp[(1) - (1)].c), &flag);
       if(flag) yymsg(0, "Unknown color '%s'", (yyvsp[(1) - (1)].c));
       Free((yyvsp[(1) - (1)].c));
     ;}
@@ -7680,7 +7680,7 @@ yyreduce:
 #line 3334 "Gmsh.y"
     {
       (yyval.l) = List_Create(256, 10, sizeof(unsigned int));
-      GmshColorTable *ct = Get_ColorTable((int)(yyvsp[(3) - (6)].d));
+      GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (6)].d));
       if(!ct)
 	yymsg(0, "View[%d] does not exist", (int)(yyvsp[(3) - (6)].d));
       else{
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 7f5fdeb80ea5097d6d48ea829447f7808516dbdc..48c0f8c59bcf1b4e0249a2167617a7f6bfeb877f 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -833,7 +833,7 @@ Affectation :
 
   | tSTRING '.' tColorTable tAFFECT ListOfColor tEND 
     {
-      GmshColorTable *ct = Get_ColorTable(0);
+      GmshColorTable *ct = GetColorTable(0);
       if(!ct)
 	yymsg(0, "View[%d] does not exist", 0);
       else{
@@ -853,7 +853,7 @@ Affectation :
     }
   | tSTRING '[' FExpr ']' '.' tColorTable tAFFECT ListOfColor tEND 
     {
-      GmshColorTable *ct = Get_ColorTable((int)$3);
+      GmshColorTable *ct = GetColorTable((int)$3);
       if(!ct)
 	yymsg(0, "View[%d] does not exist", (int)$3);
       else{
@@ -2935,9 +2935,9 @@ FExpr_Single :
   | tPi       { $$ = 3.141592653589793; }
   | tMPI_Rank { $$ = Msg::GetCommRank(); }
   | tMPI_Size { $$ = Msg::GetCommSize(); }
-  | tGMSH_MAJOR_VERSION { $$ = Get_GmshMajorVersion(); }
-  | tGMSH_MINOR_VERSION { $$ = Get_GmshMinorVersion(); }
-  | tGMSH_PATCH_VERSION { $$ = Get_GmshPatchVersion(); }
+  | tGMSH_MAJOR_VERSION { $$ = GetGmshMajorVersion(); }
+  | tGMSH_MINOR_VERSION { $$ = GetGmshMinorVersion(); }
+  | tGMSH_PATCH_VERSION { $$ = GetGmshPatchVersion(); }
 
   // Variables
 
@@ -3305,14 +3305,14 @@ ColorExpr :
   | '{' tSTRING ',' FExpr '}'
     {
       int flag;
-      $$ = Get_ColorForString(ColorString, (int)$4, $2, &flag);
+      $$ = GetColorForString(ColorString, (int)$4, $2, &flag);
       if(flag) yymsg(0, "Unknown color '%s'", $2);
     }
 */
   | tSTRING
     {
       int flag;
-      $$ = Get_ColorForString(ColorString, -1, $1, &flag);
+      $$ = GetColorForString(ColorString, -1, $1, &flag);
       if(flag) yymsg(0, "Unknown color '%s'", $1);
       Free($1);
     }
@@ -3333,7 +3333,7 @@ ListOfColor :
   | tSTRING '[' FExpr ']' '.' tColorTable
     {
       $$ = List_Create(256, 10, sizeof(unsigned int));
-      GmshColorTable *ct = Get_ColorTable((int)$3);
+      GmshColorTable *ct = GetColorTable((int)$3);
       if(!ct)
 	yymsg(0, "View[%d] does not exist", (int)$3);
       else{
diff --git a/Plugin/Makefile b/Plugin/Makefile
index cc9f78fe04e92359b76b15efe4f96f8ca24ca0bc..f6a28415efc974b5bfdb6363760349dd29d1333f 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -322,12 +322,13 @@ FiniteElement${OBJEXT}: FiniteElement.cpp ../Common/GmshConfig.h ../Geo/GModel.h
   ../Common/ListUtils.h ../Numeric/gmshAssembler.h \
   ../Numeric/gmshLinearSystem.h ../Numeric/gmshLaplace.h \
   ../Numeric/gmshTermOfFormulation.h ../Numeric/GmshMatrix.h \
-  ../Numeric/gmshAssembler.h ../Geo/MElement.h ../Common/GmshDefines.h \
-  ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h \
-  ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
-  ../Geo/SVector3.h ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h \
-  ../Numeric/Gauss.h ../Numeric/gmshFunction.h ../Common/Gmsh.h \
-  ../Common/GmshMessage.h ../Numeric/GmshMatrix.h \
-  ../Numeric/gmshHelmholtz.h ../Numeric/gmshTermOfFormulation.h \
-  ../Numeric/gmshFunction.h ../Numeric/GmshMatrix.h \
-  ../Numeric/gmshLinearSystemGmm.h ../Numeric/gmshLinearSystem.h
+  ../Numeric/gmshFunction.h ../Numeric/gmshAssembler.h ../Geo/MElement.h \
+  ../Common/GmshDefines.h ../Geo/MVertex.h ../Geo/SPoint2.h \
+  ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
+  ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
+  ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
+  ../Numeric/gmshFunction.h ../Common/Gmsh.h ../Common/GmshMessage.h \
+  ../Numeric/GmshMatrix.h ../Numeric/gmshHelmholtz.h \
+  ../Numeric/gmshTermOfFormulation.h ../Numeric/gmshFunction.h \
+  ../Numeric/GmshMatrix.h ../Numeric/gmshLinearSystemGmm.h \
+  ../Numeric/gmshLinearSystem.h