--- a/libinterp/corefcn/text-renderer.h	Wed Aug 25 09:17:48 2021 -0700
+++ b/libinterp/corefcn/text-renderer.h	Wed Aug 25 11:25:41 2021 -0700
@@ -84,17 +84,17 @@
     public:
 
       font (void)
-        : name (), weight (), angle (), size (0)
+        : m_name (), m_weight (), m_angle (), m_size (0)
       { }
 
       font (const std::string& nm, const std::string& wt,
             const std::string& ang, double sz)
-        : name (nm), weight (wt), angle (ang), size (sz)
+        : m_name (nm), m_weight (wt), m_angle (ang), m_size (sz)
       { }
 
       font (const font& ft)
-        : name (ft.name), weight (ft.weight), angle (ft.angle),
-          size (ft.size)
+        : m_name (ft.m_name), m_weight (ft.m_weight), m_angle (ft.m_angle),
+          m_size (ft.m_size)
       { }
 
       ~font (void) = default;
@@ -103,29 +103,29 @@
       {
         if (&ft != this)
           {
-            name = ft.name;
-            weight = ft.weight;
-            angle = ft.angle;
-            size = ft.size;
+            m_name = ft.m_name;
+            m_weight = ft.m_weight;
+            m_angle = ft.m_angle;
+            m_size = ft.m_size;
           }
 
         return *this;
       }
 
-      std::string get_name (void) const { return name; }
+      std::string get_name (void) const { return m_name; }
 
-      std::string get_weight (void) const { return weight; }
+      std::string get_weight (void) const { return m_weight; }
 
-      std::string get_angle (void) const { return angle; }
+      std::string get_angle (void) const { return m_angle; }
 
-      double get_size (void) const { return size; }
+      double get_size (void) const { return m_size; }
 
     protected:
 
-      std::string name;
-      std::string weight;
-      std::string angle;
-      double size;
+      std::string m_name;
+      std::string m_weight;
+      std::string m_angle;
+      double m_size;
     };
 
     // Container for substrings after parsing.
@@ -134,15 +134,16 @@
     {
     public:
 
-      string (const std::string& s, font& f, const double x0, const double y0)
-        : str (s), family (f.get_name ()), fnt (f), x (x0), y (y0), z (0.0),
-          xdata (), code (0), color (Matrix (1,3,0.0)), svg_element ()
+      string (const std::string& s, font& f, const double x, const double y)
+        : m_str (s), m_family (f.get_name ()), m_fnt (f), m_x (x), m_y (y),
+          m_z (0.0), m_xdata (), m_code (0), m_color (Matrix (1,3,0.0)),
+          m_svg_element ()
       { }
 
       string (const string& s)
-        : str (s.str), family (s.family), fnt (s.fnt), x (s.x), y (s.y),
-          z (s.z), xdata (s.xdata), code (s.code), color (s.color),
-          svg_element (s.svg_element)
+        : m_str (s.m_str), m_family (s.m_family), m_fnt (s.m_fnt), m_x (s.m_x),
+          m_y (s.m_y), m_z (s.m_z), m_xdata (s.m_xdata), m_code (s.m_code),
+          m_color (s.m_color), m_svg_element (s.m_svg_element)
       { }
 
       ~string (void) = default;
@@ -151,79 +152,79 @@
       {
         if (&s != this)
           {
-            str = s.str;
-            family = s.family;
-            fnt = s.fnt;
-            x = s.x;
-            y = s.y;
-            z = s.z;
-            xdata = s.xdata;
-            code = s.code;
-            color = s.color;
+            m_str = s.m_str;
+            m_family = s.m_family;
+            m_fnt = s.m_fnt;
+            m_x = s.m_x;
+            m_y = s.m_y;
+            m_z = s.m_z;
+            m_xdata = s.m_xdata;
+            m_code = s.m_code;
+            m_color = s.m_color;
           }
 
         return *this;
       }
 
-      void set_string (const std::string& s) { str = s; }
+      void set_string (const std::string& s) { m_str = s; }
 
-      std::string get_string (void) const { return str; }
+      std::string get_string (void) const { return m_str; }
 
-      std::string get_name (void) const { return fnt.get_name (); }
+      std::string get_name (void) const { return m_fnt.get_name (); }
 
-      std::string get_family (void) const { return family; }
+      std::string get_family (void) const { return m_family; }
 
-      void set_family (const std::string& nm) { family = nm; }
+      void set_family (const std::string& nm) { m_family = nm; }
 
-      std::string get_weight (void) const { return fnt.get_weight (); }
+      std::string get_weight (void) const { return m_fnt.get_weight (); }
 
-      std::string get_angle (void) const { return fnt.get_angle (); }
+      std::string get_angle (void) const { return m_fnt.get_angle (); }
 
-      double get_size (void) const { return fnt.get_size (); }
+      double get_size (void) const { return m_fnt.get_size (); }
 
-      void set_x (const double x0) { x = x0; }
+      void set_x (const double x) { m_x = x; }
 
-      double get_x (void) const { return x; }
+      double get_x (void) const { return m_x; }
 
-      void set_xdata (const std::vector<double>& x0) { xdata = x0; }
+      void set_xdata (const std::vector<double>& x) { m_xdata = x; }
 
-      std::vector<double> get_xdata (void) const { return xdata; }
+      std::vector<double> get_xdata (void) const { return m_xdata; }
 
-      void set_y (const double y0) { y = y0; }
+      void set_y (const double y) { m_y = y; }
 
-      double get_y (void) const { return y; }
+      double get_y (void) const { return m_y; }
 
-      void set_z (const double z0) { z = z0; }
+      void set_z (const double z) { m_z = z; }
 
-      double get_z (void) const { return z; }
+      double get_z (void) const { return m_z; }
 
-      void set_code (const uint32_t c) { code = c; }
+      void set_code (const uint32_t code) { m_code = code; }
 
-      uint32_t get_code (void) const { return code; }
+      uint32_t get_code (void) const { return m_code; }
 
-      void set_svg_element (const std::string& svg) { svg_element = svg; }
+      void set_svg_element (const std::string& svg) { m_svg_element = svg; }
 
-      std::string get_svg_element (void) const { return svg_element; }
+      std::string get_svg_element (void) const { return m_svg_element; }
 
       void set_color (const uint8NDArray& c)
       {
-        color(0) = static_cast<double> (c(0)) / 255;
-        color(1) = static_cast<double> (c(1)) / 255;
-        color(2) = static_cast<double> (c(2)) / 255;
+        m_color(0) = static_cast<double> (c(0)) / 255;
+        m_color(1) = static_cast<double> (c(1)) / 255;
+        m_color(2) = static_cast<double> (c(2)) / 255;
       }
 
-      Matrix get_color (void) const { return color; }
+      Matrix get_color (void) const { return m_color; }
 
     private:
 
-      std::string str;
-      std::string family;
-      font fnt;
-      double x, y, z;
-      std::vector<double> xdata;
-      uint32_t code;
-      Matrix color;
-      std::string svg_element;
+      std::string m_str;
+      std::string m_family;
+      font m_fnt;
+      double m_x, m_y, m_z;
+      std::vector<double> m_xdata;
+      uint32_t m_code;
+      Matrix m_color;
+      std::string m_svg_element;
     };
 
     void text_to_strlist (const std::string& txt,
@@ -233,8 +234,8 @@
 
   private:
 
-    base_text_renderer *rep;
-    base_text_renderer *latex_rep;
+    base_text_renderer *m_rep;
+    base_text_renderer *m_latex_rep;
   };
 }