diff --git a/Common/Context.cpp b/Common/Context.cpp
index bc79e31fa5a87b4eeac97d04d2cb514a13c223c0..32322fb745389c3f640e707bf0e91165ae92b424 100644
--- a/Common/Context.cpp
+++ b/Common/Context.cpp
@@ -23,13 +23,13 @@ CTX::CTX()
   bigEndian = (byte[0] ? 0 : 1);
 
   const char *tmp;
-  if((tmp = GetEnvironmentVariable("GMSH_HOME")))
+  if((tmp = GetEnvironmentVar("GMSH_HOME")))
     homeDir = tmp;
-  else if((tmp = GetEnvironmentVariable("HOME")))
+  else if((tmp = GetEnvironmentVar("HOME")))
     homeDir = tmp;
-  else if((tmp = GetEnvironmentVariable("TMP")))
+  else if((tmp = GetEnvironmentVar("TMP")))
     homeDir = tmp;
-  else if((tmp = GetEnvironmentVariable("TEMP")))
+  else if((tmp = GetEnvironmentVar("TEMP")))
     homeDir = tmp;
   else
     homeDir = "";
diff --git a/Common/OS.cpp b/Common/OS.cpp
index 0c163ec6e683cf6f39c628ef952063a5d750e86d..9cc026dd7cd88732dde7286d3be220c48b33a463 100644
--- a/Common/OS.cpp
+++ b/Common/OS.cpp
@@ -34,7 +34,7 @@
 
 #include "GmshMessage.h"
 
-const char *GetEnvironmentVariable(const char *var)
+const char *GetEnvironmentVar(const char *var)
 {
 #if !defined(WIN32)
   return getenv(var);
diff --git a/Common/OS.h b/Common/OS.h
index 4ec46810125dc98550a18f4c3db43fc9f748f159..2a4e3edf8da27214c42576f7eea41f88db916b60 100644
--- a/Common/OS.h
+++ b/Common/OS.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-const char *GetEnvironmentVariable(const char *var);
+const char *GetEnvironmentVar(const char *var);
 double GetTimeInSeconds();
 void SleepInSeconds(double s);
 void CheckResources();
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 0eee92b74abb7dbc3afb9f8847035718a3c7aa55..8b7e01b1935ecb08c9244eb10faf9f4d53348281 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -8711,7 +8711,7 @@ yyreduce:
   case 382:
 #line 4080 "Gmsh.y"
     { 
-      const char *env = GetEnvironmentVariable((yyvsp[(3) - (4)].c));
+      const char *env = GetEnvironmentVar((yyvsp[(3) - (4)].c));
       if(!env) env = "";
       (yyval.c) = (char *)Malloc((sizeof(env) + 1) * sizeof(char));
       strcpy((yyval.c), env);
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index f1a7d6e5a60cb01a6b3503c93c363702c122321e..6cc10169abdd3801936389f8d1af4b43515a2b87 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -4078,7 +4078,7 @@ StringExpr :
     }
   | tGetEnv '(' StringExprVar ')'
     { 
-      const char *env = GetEnvironmentVariable($3);
+      const char *env = GetEnvironmentVar($3);
       if(!env) env = "";
       $$ = (char *)Malloc((sizeof(env) + 1) * sizeof(char));
       strcpy($$, env);