--- a/liboctave/util/oct-shlib.h	Sat Sep 07 10:49:03 2019 -0400
+++ b/liboctave/util/oct-shlib.h	Mon Sep 09 16:15:40 2019 -0400
@@ -48,8 +48,8 @@
     public:
 
       dynlib_rep (void)
-        : count (1), file (), tm_loaded (time_t ()), fcn_names (),
-          search_all_loaded (false)
+        : m_count (1), m_fcn_names (), m_file (), m_time_loaded (time_t ()),
+          m_search_all_loaded (false)
       { }
 
     protected:
@@ -60,7 +60,7 @@
 
       virtual ~dynlib_rep (void)
       {
-        instances.erase (file);
+        s_instances.erase (m_file);
       }
 
       virtual bool is_open (void) const
@@ -77,12 +77,12 @@
       static dynlib_rep * get_instance (const std::string& f, bool fake);
 
       sys::time time_loaded (void) const
-      { return tm_loaded; }
+      { return m_time_loaded; }
 
       std::string file_name (void) const
-      { return file; }
+      { return m_file; }
 
-      size_t num_fcn_names (void) const { return fcn_names.size (); }
+      size_t num_fcn_names (void) const { return m_fcn_names.size (); }
 
       std::list<std::string> function_names (void) const;
 
@@ -90,79 +90,78 @@
 
       bool remove_fcn_name (const std::string&);
 
-      void clear_fcn_names (void) { fcn_names.clear (); }
+      void clear_fcn_names (void) { m_fcn_names.clear (); }
 
     public:
 
-      refcount<int> count;
+      refcount<int> m_count;
 
     protected:
 
       void fake_reload (void);
 
-      std::string file;
-      sys::time tm_loaded;
+      static std::map<std::string, dynlib_rep *> s_instances;
 
       // Set of hooked function names.
       typedef std::map<std::string, size_t>::iterator fcn_names_iterator;
       typedef std::map<std::string, size_t>::const_iterator fcn_names_const_iterator;
 
-      std::map<std::string, size_t> fcn_names;
-
-      static std::map<std::string, dynlib_rep *> instances;
-      bool search_all_loaded;
+      std::map<std::string, size_t> m_fcn_names;
+      std::string m_file;
+      sys::time m_time_loaded;
+      bool m_search_all_loaded;
     };
 
   private:
 
-    static dynlib_rep nil_rep;
+    static dynlib_rep s_nil_rep;
 
   public:
 
-    dynamic_library (void) : rep (&nil_rep) { rep->count++; }
+    dynamic_library (void) : m_rep (&s_nil_rep) { m_rep->m_count++; }
 
     dynamic_library (const std::string& f, bool fake = true)
-      : rep (dynlib_rep::get_instance (f, fake)) { }
+      : m_rep (dynlib_rep::get_instance (f, fake)) { }
 
     ~dynamic_library (void)
     {
-      if (--rep->count == 0)
-        delete rep;
+      if (--m_rep->m_count == 0)
+        delete m_rep;
     }
 
     dynamic_library (const dynamic_library& sl)
-      : rep (sl.rep)
+      : m_rep (sl.m_rep)
     {
-      rep->count++;
+      m_rep->m_count++;
     }
 
     dynamic_library& operator = (const dynamic_library& sl)
     {
-      if (rep != sl.rep)
+      if (m_rep != sl.m_rep)
         {
-          if (--rep->count == 0)
-            delete rep;
+          if (--m_rep->m_count == 0)
+            delete m_rep;
 
-          rep = sl.rep;
-          rep->count++;
+          m_rep = sl.m_rep;
+          m_rep->m_count++;
         }
 
       return *this;
     }
 
     bool operator == (const dynamic_library& sl) const
-    { return (rep == sl.rep); }
+    { return (m_rep == sl.m_rep); }
 
-    operator bool () const { return rep->is_open (); }
+    operator bool () const { return m_rep->is_open (); }
 
     void open (const std::string& f)
     { *this = dynamic_library (f); }
 
     std::list<std::string> close (void)
     {
-      std::list<std::string> removed_fcns = rep->function_names ();
+      std::list<std::string> removed_fcns = m_rep->function_names ();
 
-      rep->clear_fcn_names ();
+      m_rep->clear_fcn_names ();
 
       *this = dynamic_library ();
 
@@ -171,34 +170,34 @@
 
     void * search (const std::string& nm, name_mangler mangler = nullptr) const
     {
-      void *f = rep->search (nm, mangler);
+      void *f = m_rep->search (nm, mangler);
       if (f)
-        rep->add_fcn_name (nm);
+        m_rep->add_fcn_name (nm);
 
       return f;
     }
 
     void add (const std::string& name)
-    { rep->add_fcn_name (name); }
+    { m_rep->add_fcn_name (name); }
 
     bool remove (const std::string& name)
-    { return rep->remove_fcn_name (name); }
+    { return m_rep->remove_fcn_name (name); }
 
     size_t number_of_functions_loaded (void) const
-    { return rep->num_fcn_names (); }
+    { return m_rep->num_fcn_names (); }
 
     bool is_out_of_date (void) const
-    { return rep->is_out_of_date (); }
+    { return m_rep->is_out_of_date (); }
 
     std::string file_name (void) const
-    { return rep->file_name (); }
+    { return m_rep->file_name (); }
 
     sys::time time_loaded (void) const
-    { return rep->time_loaded (); }
+    { return m_rep->time_loaded (); }
 
   private:
 
-    dynlib_rep *rep;
+    dynlib_rep *m_rep;
   };
 }