--- a/src/structcat.cc
+++ b/src/structcat.cc
@@ -25,23 +25,23 @@
 #include <octave/oct.h>
 #include <octave/ov-struct.h>
 
-static Octave_map
-structcat_op_fcn (const Octave_map& m1, const Octave_map& m2,
+static octave_map
+structcat_op_fcn (const octave_map& m1, const octave_map& m2,
                       const dim_vector& dv,
                       const Array<octave_idx_type>& ra_idx,
                       const octave_value& fillv)
 {
-  Octave_map retval (dv);
+  octave_map retval (dv);
 
   Cell c2 (m2.dims (), fillv);
 
-  for (Octave_map::const_iterator pa = m1.begin (); pa != m1.end (); pa++)
+  for (octave_map::const_iterator pa = m1.begin (); pa != m1.end (); pa++)
     {
       Cell c (dv);
 
       c.insert (m1.contents(pa), 0, 0);
 
-      Octave_map::const_iterator pb = m2.seek (m1.key(pa));
+      octave_map::const_iterator pb = m2.seek (m1.key(pa));
 
       if (pb == m2.end ())
         c.insert (c2, ra_idx);
@@ -51,9 +51,9 @@
       retval.assign (m1.key(pa), c);
     }
 
-  for (Octave_map::const_iterator pa = m2.begin (); pa != m2.end (); pa++)
+  for (octave_map::const_iterator pa = m2.begin (); pa != m2.end (); pa++)
     {
-      Octave_map::const_iterator pb = m1.seek (m2.key(pa));
+      octave_map::const_iterator pb = m1.seek (m2.key(pa));
 
       if (pb == m1.end ())
         {
@@ -79,7 +79,7 @@
 {
   std::string fname ("structcat");
 
-  Octave_map retval;
+  octave_map retval;
 
   octave_idx_type n_args = args.length ();