diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 98a1221d1..50fdcade2 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -338,7 +338,7 @@ void FGGlobals::append_data_path(const SGPath& path, bool afterFGRoot)
     }
 }
 
-SGPath FGGlobals::find_data_dir(const std::string& pathSuffix) const
+SGPath FGGlobals::findDataPath(const std::string& pathSuffix) const
 {
     for (SGPath p : additional_data_paths) {
         p.append(pathSuffix);
diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 87b6a29af..f02d49771 100644
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -224,7 +224,7 @@ public:
      * Given a path suffix (eg 'Textures' or 'AI/Traffic'), find the
      * first data directory which defines it.
      */
-    SGPath find_data_dir(const std::string& pathSuffix) const;
+    SGPath findDataPath(const std::string& pathSuffix) const;
 
     const SGPath &get_fg_home () const { return fg_home; }
     void set_fg_home (const SGPath &home);
diff --git a/src/Network/generic.cxx b/src/Network/generic.cxx
index 6e7013192..75dd80f6c 100644
--- a/src/Network/generic.cxx
+++ b/src/Network/generic.cxx
@@ -753,7 +753,7 @@ bool FGGeneric::close() {
 void
 FGGeneric::reinit()
 {
-    SGPath path = globals->find_data_dir("Protocol/" + file_name);
+    SGPath path = globals->findDataPath("Protocol/" + file_name);
     if (!path.exists()) {
         SG_LOG(SG_NETWORK, SG_WARN, "Couldn't find protocol file for '" << file_name << "'");
         return;
diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index ce351758a..e3738e3b3 100644
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -776,7 +776,7 @@ static naRef f_findDataDir(naContext c, naRef me, int argc, naRef* args)
     if(argc != 1 || !naIsString(args[0]))
         naRuntimeError(c, "bad arguments to findDataDir()");
 
-    SGPath p = globals->find_data_dir(naStr_data(args[0]));
+    SGPath p = globals->findDataPath(naStr_data(args[0]));
     std::string pdata = p.utf8Str();
     return naStr_fromdata(naNewString(c), const_cast<char*>(pdata.c_str()), pdata.length());
 }