--- a/src/Cell.h
+++ b/src/Cell.h
@@ -26,7 +26,7 @@
 
 #include <string>
 
-#include "ArrayN.h"
+#include "Array.h"
 #include "oct-alloc.h"
 #include "str-vec.h"
 #include "ov.h"
@@ -35,33 +35,30 @@
 
 class
 OCTINTERP_API
-Cell : public ArrayN<octave_value>
+Cell : public Array<octave_value>
 {
 public:
 
   Cell (void)
-    : ArrayN<octave_value> (dim_vector (0, 0)) { }
+    : Array<octave_value> (dim_vector (0, 0)) { }
 
   Cell (const octave_value& val)
-    : ArrayN<octave_value> (dim_vector (1, 1), val) { }
+    : Array<octave_value> (dim_vector (1, 1), val) { }
 
   Cell (const octave_value_list& ovl);
 
   Cell (octave_idx_type n, octave_idx_type m,
 	const octave_value& val = resize_fill_value ())
-    : ArrayN<octave_value> (dim_vector (n, m), val) { }
+    : Array<octave_value> (dim_vector (n, m), val) { }
 
   Cell (const dim_vector& dv, const octave_value& val = resize_fill_value ())
-    : ArrayN<octave_value> (dv, val) { }
-
-  Cell (const ArrayN<octave_value>& c)
-    : ArrayN<octave_value> (c) { }
+    : Array<octave_value> (dv, val) { }
 
   Cell (const Array<octave_value>& c)
-    : ArrayN<octave_value> (c) { }
+    : Array<octave_value> (c) { }
 
   Cell (const Array<octave_value>& c, octave_idx_type nr, octave_idx_type nc)
-    : ArrayN<octave_value> (c, dim_vector (nr, nc)) { }
+    : Array<octave_value> (c, dim_vector (nr, nc)) { }
 
   Cell (const string_vector& sv, bool trim = false);
 
@@ -70,7 +67,7 @@
   Cell (const dim_vector& dv, const string_vector& sv, bool trim = false);
 
   Cell (const Cell& c)
-    : ArrayN<octave_value> (c) { }
+    : Array<octave_value> (c) { }
 
   bool is_cellstr (void) const;
 
@@ -82,7 +79,7 @@
 		const octave_value& fill_val = resize_fill_value ());
 
   Cell reshape (const dim_vector& new_dims) const
-    { return ArrayN<octave_value>::reshape (new_dims); }
+    { return Array<octave_value>::reshape (new_dims); }
 
   octave_idx_type nnz (void) const;