diff --git a/Fltk/contextWindow.cpp b/Fltk/contextWindow.cpp
index 408e5e99ecfcc6c4b40cf7d08b5aca05ba69ee45..2ea5d1cc41dc68e72c42820ca7b59da1ab1dbbcc 100644
--- a/Fltk/contextWindow.cpp
+++ b/Fltk/contextWindow.cpp
@@ -18,7 +18,7 @@
 #undef Convex
 #endif
 #include "GModelIO_OCC.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "OpenFile.h"
 #include "Context.h"
 #include "Options.h"
diff --git a/Fltk/fieldWindow.cpp b/Fltk/fieldWindow.cpp
index 9a54704bb5310843cef0f7c04c18bc141220c745..0f8d713c6a4803d5af8b036ce8a1c388ec60371c 100644
--- a/Fltk/fieldWindow.cpp
+++ b/Fltk/fieldWindow.cpp
@@ -25,7 +25,7 @@
 #include "PView.h"
 #include "GmshMessage.h"
 #include "Field.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "StringUtils.h"
 #include "Options.h"
 #include "Context.h"
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index c2ce39ace41d347d456fdefabf071f83c675825f..0bd89e85b7562f6f03264e15287cf8eaee1df2f6 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -53,7 +53,7 @@ typedef unsigned long intptr_t;
 #include "OpenFile.h"
 #include "CreateFile.h"
 #include "findLinks.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "CommandLine.h"
 #include "Options.h"
 #include "Context.h"
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 72c8df26e43069722b21ceb73007b5e55a729748..3ae15cfa361d5bd497ba3e9c0af5cafb4ef22124 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -29,7 +29,7 @@ typedef unsigned long intptr_t;
 #include "GModel.h"
 #include "MVertex.h"
 #include "Context.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "StringUtils.h"
 #include "OS.h"
 
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 2779201c737219dbe0b7d6cf0fb16b5c2236d3dc..cf8b2b4abcfd793650ea23907e6b85267e7bdfec 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -33,7 +33,7 @@ typedef unsigned long intptr_t;
 #include "MElement.h"
 #include "PView.h"
 #include "PViewData.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "Options.h"
 #include "Context.h"
 #include "StringUtils.h"
diff --git a/Geo/CMakeLists.txt b/Geo/CMakeLists.txt
index f922335a2fde39cf4b606f55455b1d09c21a2ac6..9ba8d3995e83c8c5aec86e79265c758c815fea19 100644
--- a/Geo/CMakeLists.txt
+++ b/Geo/CMakeLists.txt
@@ -29,8 +29,8 @@ set(SRC
     GModelIO_CELUM.cpp GModelIO_NEU.cpp GModelIO_ACTRAN.cpp GModelIO_SU2.cpp
     GModelIO_SAMCEF.cpp GModelIO_MATLAB.cpp GModelIO_POS.cpp GModelIO_X3D.cpp
   ExtrudeParams.cpp
-  Geo.cpp
-  GeoStringInterface.cpp GeoInterpolation.cpp
+  Geo.cpp GeoInterpolation.cpp
+  scriptStringInterface.cpp
   gmshLevelset.cpp
   findLinks.cpp
   SOrientedBoundingBox.cpp
diff --git a/Geo/GeoInterpolation.cpp b/Geo/GeoInterpolation.cpp
index c252c91ab784c38467e2d477f8d5afb73551d8d4..5098bb43d61f14e2fdf81d44b42b842221efaad9 100644
--- a/Geo/GeoInterpolation.cpp
+++ b/Geo/GeoInterpolation.cpp
@@ -6,7 +6,6 @@
 #include "GmshMessage.h"
 #include "Geo.h"
 #include "GeoInterpolation.h"
-#include "GeoStringInterface.h"
 #include "Numeric.h"
 #include "Context.h"
 
diff --git a/Geo/GeoStringInterface.cpp b/Geo/scriptStringInterface.cpp
similarity index 99%
rename from Geo/GeoStringInterface.cpp
rename to Geo/scriptStringInterface.cpp
index 04d3f570c94f532fa9c55686e1862f33890fa5ce..c6cb6aaf94ffa2e42a299aa653d64d3abd0d2ec9 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/scriptStringInterface.cpp
@@ -13,7 +13,7 @@
 #include "Numeric.h"
 #include "StringUtils.h"
 #include "Geo.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "OpenFile.h"
 #include "Context.h"
 #include "OS.h"
diff --git a/Geo/GeoStringInterface.h b/Geo/scriptStringInterface.h
similarity index 99%
rename from Geo/GeoStringInterface.h
rename to Geo/scriptStringInterface.h
index 877ebe68e7df45ce9c9e785fd576069dcc29918a..afd56d8d1d9ccccd10885366a9f66aafef6b7dcd 100644
--- a/Geo/GeoStringInterface.h
+++ b/Geo/scriptStringInterface.h
@@ -3,8 +3,8 @@
 // See the LICENSE.txt file for license information. Please report all
 // issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
 
-#ifndef GEO_STRING_INTERFACE_H
-#define GEO_STRING_INTERFACE_H
+#ifndef SCRIPT_STRING_INTERFACE_H
+#define SCRIPT_STRING_INTERFACE_H
 
 #include <string>
 #include <vector>
diff --git a/utils/wrappers/java/WrapGmsh.i b/utils/wrappers/java/WrapGmsh.i
index 0a6b19596c4249dc3156abb2836750643bc786b5..66fe1945aa4c280568a8076cbe56d5295507ed8b 100644
--- a/utils/wrappers/java/WrapGmsh.i
+++ b/utils/wrappers/java/WrapGmsh.i
@@ -11,7 +11,7 @@
 #include "GEdge.h"
 #include "GFace.h"
 #include "GRegion.h"
-#include "GeoStringInterface.h"
+#include "scriptStringInterface.h"
 #include "GEntity.h"
 #include "setWrapperGmsh.h"
 #include "listWrapperGmsh.h"