--- a/liboctave/system/oct-uname.h	Wed May 18 15:23:05 2016 -0400
+++ b/liboctave/system/oct-uname.h	Wed May 18 14:09:17 2016 -0400
@@ -27,68 +27,80 @@
 
 #include <string>
 
-class
-OCTAVE_API
-octave_uname
+namespace
+octave
 {
-public:
-
-  octave_uname (void)
-    : utsname_sysname ("unknown"), utsname_nodename ("unknown"),
-      utsname_release ("unknown"), utsname_version ("unknown"),
-      utsname_machine ("unknown"),
-      msg ("uname not supported on this system"), err (-1)
-  { init (); }
+  namespace
+  sys
+  {
+    class
+    OCTAVE_API
+    uname
+    {
+    public:
 
-  octave_uname (const octave_uname& unm)
-    : utsname_sysname (unm.utsname_sysname),
-      utsname_nodename (unm.utsname_nodename),
-      utsname_release (unm.utsname_release),
-      utsname_version (unm.utsname_version),
-      utsname_machine (unm.utsname_machine),
-      msg (unm.msg), err (unm.err)
-  { }
+      uname (void)
+        : m_sysname ("unknown"), m_nodename ("unknown"),
+          m_release ("unknown"), m_version ("unknown"),
+          m_machine ("unknown"),
+          msg ("uname not supported on this system"), err (-1)
+        { init (); }
 
-  octave_uname& operator = (const octave_uname& unm)
-  {
-    if (this != &unm)
-      {
-        utsname_sysname = unm.utsname_sysname;
-        utsname_nodename = unm.utsname_nodename;
-        utsname_release = unm.utsname_release;
-        utsname_version = unm.utsname_version;
-        utsname_machine = unm.utsname_machine;
+      uname (const uname& unm)
+        : m_sysname (unm.m_sysname), m_nodename (unm.m_nodename),
+          m_release (unm.m_release), m_version (unm.m_version),
+          m_machine (unm.m_machine), msg (unm.msg), err (unm.err)
+        { }
+
+      uname& operator = (const uname& unm)
+        {
+          if (this != &unm)
+            {
+              m_sysname = unm.m_sysname;
+              m_nodename = unm.m_nodename;
+              m_release = unm.m_release;
+              m_version = unm.m_version;
+              m_machine = unm.m_machine;
 
-        msg = unm.msg;
-        err = unm.err;
-      }
+              msg = unm.msg;
+              err = unm.err;
+            }
 
-    return *this;
-  }
+          return *this;
+        }
+
+      ~uname (void) { }
 
-  ~octave_uname (void) { }
+      std::string sysname (void) const { return m_sysname; }
+      std::string nodename (void) const { return m_nodename; }
+      std::string release (void) const { return m_release; }
+      std::string version (void) const { return m_version; }
+      std::string machine (void) const { return m_machine; }
 
-  std::string sysname (void) const { return utsname_sysname; }
-  std::string nodename (void) const { return utsname_nodename; }
-  std::string release (void) const { return utsname_release; }
-  std::string version (void) const { return utsname_version; }
-  std::string machine (void) const { return utsname_machine; }
+      std::string message (void) const { return msg; }
+      int error (void) const { return err; }
 
-  std::string message (void) const { return msg; }
-  int error (void) const { return err; }
+    private:
 
-private:
+      std::string m_sysname;
+      std::string m_nodename;
+      std::string m_release;
+      std::string m_version;
+      std::string m_machine;
 
-  std::string utsname_sysname;
-  std::string utsname_nodename;
-  std::string utsname_release;
-  std::string utsname_version;
-  std::string utsname_machine;
+      std::string msg;
+      int err;
 
-  std::string msg;
-  int err;
+      void init (void);
+    };
+  }
+}
 
-  void init (void);
-};
+#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
+
+OCTAVE_DEPRECATED ("use octave::sys::uname instead")
+typedef octave::sys::uname octave_uname;
 
 #endif
+
+#endif