--- a/liboctave/array/Array.cc	Mon Jan 18 10:00:56 2016 -0800
+++ b/liboctave/array/Array.cc	Mon Jan 18 18:28:06 2016 -0800
@@ -190,9 +190,9 @@
 {
   // Do checks directly to avoid recomputing slice_len.
   if (n < 0)
-    gripe_invalid_index (n);
+    err_invalid_index (n);
   if (n >= slice_len)
-    gripe_index_out_of_range (1, 1, n+1, slice_len, dimensions);
+    err_index_out_of_range (1, 1, n+1, slice_len, dimensions);
 
   return elem (n);
 }
@@ -224,9 +224,9 @@
 {
   // Do checks directly to avoid recomputing slice_len.
   if (n < 0)
-    gripe_invalid_index (n);
+    err_invalid_index (n);
   if (n >= slice_len)
-    gripe_index_out_of_range (1, 1, n+1, slice_len, dimensions);
+    err_index_out_of_range (1, 1, n+1, slice_len, dimensions);
 
   return elem (n);
 }
@@ -260,7 +260,7 @@
   octave_idx_type r = dimensions(0);
 #ifdef BOUNDS_CHECKING
   if (k < 0 || k > dimensions.numel (1))
-    gripe_index_out_of_range (2, 2, k+1, dimensions.numel (1), dimensions);
+    err_index_out_of_range (2, 2, k+1, dimensions.numel (1), dimensions);
 #endif
 
   return Array<T> (*this, dim_vector (r, 1), k*r, k*r + r);
@@ -275,7 +275,7 @@
   octave_idx_type p = r*c;
 #ifdef BOUNDS_CHECKING
   if (k < 0 || k > dimensions.numel (2))
-    gripe_index_out_of_range (3, 3, k+1, dimensions.numel (2), dimensions);
+    err_index_out_of_range (3, 3, k+1, dimensions.numel (2), dimensions);
 #endif
 
   return Array<T> (*this, dim_vector (r, c), k*p, k*p + p);
@@ -287,9 +287,9 @@
 {
 #ifdef BOUNDS_CHECKING
   if (lo < 0)
-    gripe_index_out_of_range (1, 1, lo+1, numel (), dimensions);
+    err_index_out_of_range (1, 1, lo+1, numel (), dimensions);
   if (up > numel ())
-    gripe_index_out_of_range (1, 1, up, numel (), dimensions);
+    err_index_out_of_range (1, 1, up, numel (), dimensions);
 #endif
   if (up < lo) up = lo;
   return Array<T> (*this, dim_vector (up - lo, 1), lo, up);
@@ -726,7 +726,7 @@
   else
     {
       if (i.extent (n) != n)
-        gripe_index_out_of_range (1, 1, i.extent (n), n, dimensions); // throws
+        err_index_out_of_range (1, 1, i.extent (n), n, dimensions); // throws
 
       // FIXME: this is the only place where orig_dimensions are used.
       dim_vector rd = i.orig_dimensions ();
@@ -793,9 +793,9 @@
   else
     {
       if (i.extent (r) != r)
-        gripe_index_out_of_range (2, 1, i.extent (r), r, dimensions); // throws
+        err_index_out_of_range (2, 1, i.extent (r), r, dimensions); // throws
       if (j.extent (c) != c)
-        gripe_index_out_of_range (2, 2, j.extent (c), c, dimensions); // throws
+        err_index_out_of_range (2, 2, j.extent (c), c, dimensions); // throws
 
       octave_idx_type n = numel ();
       octave_idx_type il = i.length (r);
@@ -855,7 +855,7 @@
       for (int i = 0; i < ial; i++)
         {
           if (ia(i).extent (dv(i)) != dv(i))
-            gripe_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i), dimensions); // throws
+            err_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i), dimensions); // throws
 
           all_colons = all_colons && ia(i).is_colon ();
         }
@@ -931,7 +931,7 @@
         invalid = true;
 
       if (invalid)
-        gripe_invalid_resize ();
+        err_invalid_resize ();
       else
         {
           octave_idx_type nx = numel ();
@@ -980,7 +980,7 @@
         }
     }
   else
-    gripe_invalid_resize ();
+    err_invalid_resize ();
 }
 
 template <class T>
@@ -1024,7 +1024,7 @@
         }
     }
   else
-    gripe_invalid_resize ();
+    err_invalid_resize ();
 
 }
 
@@ -1048,7 +1048,7 @@
           *this = tmp;
         }
       else
-        gripe_invalid_resize ();
+        err_invalid_resize ();
     }
 }
 
@@ -1181,7 +1181,7 @@
         }
     }
   else
-    gripe_nonconformant ("=", dim_vector(i.length(n),1), rhs.dims());
+    err_nonconformant ("=", dim_vector(i.length(n),1), rhs.dims());
 }
 
 // Assignment to a 2-dimensional array
@@ -1285,7 +1285,7 @@
     }
   // any empty RHS can be assigned to an empty LHS
   else if ((il != 0 && jl != 0) || (rhdv(0) != 0 && rhdv(1) != 0))
-    gripe_nonconformant ("=", il, jl, rhs.dim1 (), rhs.dim2 ());
+    err_nonconformant ("=", il, jl, rhs.dim1 (), rhs.dim2 ());
 }
 
 // Assignment to a multi-dimensional array
@@ -1399,7 +1399,7 @@
               rhsempty = rhsempty || (rhdv(j++) == 0);
             }
           if (! lhsempty || ! rhsempty)
-            gripe_nonconformant ("=", dv, rhdv);
+            err_nonconformant ("=", dv, rhdv);
         }
     }
 }
@@ -1424,7 +1424,7 @@
   else if (i.length (n) != 0)
     {
       if (i.extent (n) != n)
-        gripe_del_index_out_of_range (true, i.extent (n), n);
+        err_del_index_out_of_range (true, i.extent (n), n);
 
       octave_idx_type l, u;
       bool col_vec = ndims () == 2 && columns () == 1 && rows () != 1;
@@ -1471,7 +1471,7 @@
   else if (i.length (n) != 0)
     {
       if (i.extent (n) != n)
-        gripe_del_index_out_of_range (false, i.extent (n), n);
+        err_del_index_out_of_range (false, i.extent (n), n);
 
       octave_idx_type l, u;