diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index e3aed1d68704cf6ab22dcd40f3bb06e958a32af4..e53f049d68ed33a212ca869972df93f48c2b67ff 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.456 2006-08-29 10:39:48 remacle Exp $
+// $Id: Callbacks.cpp,v 1.457 2006-08-31 14:15:29 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -609,7 +609,7 @@ static char *file_types =
   "\tGmsh mesh (*.msh)"
   "\tGmsh post-processing (*.pos)"
   "\tSTL surface mesh (*.stl)"
-  "\tINRIA mesh (*.mesh)"
+  "\tMEDIT mesh (*.mesh)"
   "\tJPEG (*.jpg)"
   "\tPNG (*.png)"
   "\tBMP (*.bmp)"
@@ -777,7 +777,7 @@ void file_save_as_cb(CALLBACK_ARGS)
     {"Gmsh unrolled geometry (*.geo)", _save_geo},
     {"  ", _save_auto},
     {"I-DEAS universal mesh (*.unv)", _save_unv},
-    {"INRIA mesh (*.mesh)", _save_mesh},
+    {"MEDIT mesh (*.mesh)", _save_mesh},
     {"STL surface mesh (*.stl)", _save_stl},
     {"VRML surface mesh (*.wrl)", _save_vrml},
     {"   ", _save_auto},
diff --git a/Geo/GModelIO.cpp b/Geo/GModelIO.cpp
index 6bb0cf33c5289c534de3b0785bfcb6daa701a3a5..5b0744cbfa89a40b661b44cf1b443520c23b71fb 100644
--- a/Geo/GModelIO.cpp
+++ b/Geo/GModelIO.cpp
@@ -1,4 +1,4 @@
-// $Id: GModelIO.cpp,v 1.30 2006-08-24 16:56:20 geuzaine Exp $
+// $Id: GModelIO.cpp,v 1.31 2006-08-31 14:15:29 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -1237,7 +1237,7 @@ int GModel::readMESH(const std::string &name)
   sscanf(buffer, "%s %d", str, &format);
 
   if(format != 1){
-    Msg(GERROR, "Non-ASCII INRIA mesh import is not yet available");
+    Msg(GERROR, "Non-ASCII MEDIT mesh import is not yet available");
     return 0;
   }
 
diff --git a/Parser/CreateFile.cpp b/Parser/CreateFile.cpp
index a81a12a112ff03a2b94d84c3f69278f69cc0bc62..b0e988f8b296814fa06a7a9a5b4a7857d672cbe5 100644
--- a/Parser/CreateFile.cpp
+++ b/Parser/CreateFile.cpp
@@ -1,4 +1,4 @@
-// $Id: CreateFile.cpp,v 1.4 2006-08-23 19:53:39 geuzaine Exp $
+// $Id: CreateFile.cpp,v 1.5 2006-08-31 14:15:29 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -81,7 +81,7 @@ void GetDefaultFileName(int format, char *name)
   char ext[32] = "";
   strcpy(name, CTX.base_filename);
   switch(format){
-  case FORMAT_GEO:  strcpy(ext, ".geof"); break; // flattened geo
+  case FORMAT_GEO:  strcpy(ext, ".geo_unrolled"); break;
   case FORMAT_MSH:  strcpy(ext, ".msh"); break;
   case FORMAT_POS:  strcpy(ext, ".pos"); break;
   case FORMAT_OPT:  strcpy(ext, ".opt"); break;