--- a/liboctave/system/dir-ops.cc	Mon Aug 30 11:53:55 2021 -0700
+++ b/liboctave/system/dir-ops.cc	Mon Aug 30 12:03:27 2021 -0700
@@ -50,23 +50,23 @@
     dir_entry::open (const std::string& n)
     {
       if (! n.empty ())
-        name = n;
+        m_name = n;
 
-      if (! name.empty ())
+      if (! m_name.empty ())
         {
           close ();
 
-          std::string fullname = sys::file_ops::tilde_expand (name);
+          std::string fullname = sys::file_ops::tilde_expand (m_name);
 
-          dir = octave_opendir_wrapper (fullname.c_str ());
+          m_dir = octave_opendir_wrapper (fullname.c_str ());
 
-          if (! dir)
-            errmsg = std::strerror (errno);
+          if (! m_dir)
+            m_errmsg = std::strerror (errno);
         }
       else
-        errmsg = "dir_entry::open: empty filename";
+        m_errmsg = "dir_entry::open: empty filename";
 
-      return dir != nullptr;
+      return m_dir != nullptr;
     }
 
     string_vector
@@ -80,7 +80,7 @@
 
           char *fname;
 
-          while ((fname = octave_readdir_wrapper (dir)))
+          while ((fname = octave_readdir_wrapper (m_dir)))
             dirlist.push_back (fname);
 
           retval = string_vector (dirlist);
@@ -94,11 +94,11 @@
     {
       bool retval = true;
 
-      if (dir)
+      if (m_dir)
         {
-          retval = (octave_closedir_wrapper (dir) == 0);
+          retval = (octave_closedir_wrapper (m_dir) == 0);
 
-          dir = nullptr;
+          m_dir = nullptr;
         }
 
       return retval;

--- a/liboctave/system/dir-ops.h	Mon Aug 30 11:53:55 2021 -0700
+++ b/liboctave/system/dir-ops.h	Mon Aug 30 12:03:27 2021 -0700
@@ -49,23 +49,25 @@
     public:
 
       dir_entry (const std::string& n = "")
-        : name (n), dir (nullptr), fail (false), errmsg ()
+        : m_name (n), m_dir (nullptr), m_fail (false), m_errmsg ()
       {
-        if (! name.empty ())
+        if (! m_name.empty ())
           open ();
       }
 
       dir_entry (const dir_entry& d)
-        : name (d.name), dir (d.dir), fail (d.fail), errmsg (d.errmsg) { }
+        : m_name (d.m_name), m_dir (d.m_dir), m_fail (d.m_fail),
+          m_errmsg (d.m_errmsg)
+      { }
 
       dir_entry& operator = (const dir_entry& d)
       {
         if (this != &d)
           {
-            name = d.name;
-            dir = d.dir;
-            fail = d.fail;
-            errmsg = d.errmsg;
+            m_name = d.m_name;
+            m_dir = d.m_dir;
+            m_fail = d.m_fail;
+            m_errmsg = d.m_errmsg;
           }
 
         return *this;
@@ -79,29 +81,29 @@
 
       bool close (void);
 
-      bool ok (void) const { return dir && ! fail; }
+      bool ok (void) const { return m_dir && ! m_fail; }
 
       operator bool () const { return ok (); }
 
-      std::string error (void) const { return ok () ? "" : errmsg; }
+      std::string error (void) const { return ok () ? "" : m_errmsg; }
 
       static unsigned int max_name_length (void);
 
     private:
 
       // Name of the directory.
-      std::string name;
+      std::string m_name;
 
       // A pointer to the contents of the directory.  We use void here to
       // avoid possible conflicts with the way some systems declare the
       // type DIR.
-      void *dir;
+      void *m_dir;
 
       // TRUE means the open for this directory failed.
-      bool fail;
+      bool m_fail;
 
       // If a failure occurs, this contains the system error text.
-      std::string errmsg;
+      std::string m_errmsg;
     };
   }
 }