diff --git a/Multipole/src/multipole.cxx b/Multipole/src/multipole.cxx
index 82415b5e..895928ca 100644
--- a/Multipole/src/multipole.cxx
+++ b/Multipole/src/multipole.cxx
@@ -126,7 +126,7 @@ setup_harmonics(const int spin_weights[max_spin_weights], int n_spin_weights,
 }
 
 static void output_modes(CCTK_ARGUMENTS, const variable_desc vars[],
-                         const CCTK_REAL radii[], const mode_array &modes) {
+                         const CCTK_REAL radii[], const ModeArray &modes) {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
@@ -253,7 +253,7 @@ extern "C" void Multipole_Calc(CCTK_ARGUMENTS) {
     CCTK_VINFO("initialized arrays");
   }
 
-  mode_array modes(n_variables, nradii, lmax);
+  ModeArray modes(n_variables, nradii, lmax);
 
   for (int v = 0; v < n_variables; v++) {
     // assert(vars[v].spin_weight == -2);
diff --git a/Multipole/src/multipole.hxx b/Multipole/src/multipole.hxx
index 0a1ea0cb..764fe2db 100644
--- a/Multipole/src/multipole.hxx
+++ b/Multipole/src/multipole.hxx
@@ -25,12 +25,12 @@ struct variables_desc {
 
 // a simple array class to hold complex modes abs(m) <= l, l <= lmax, for
 // nradii radii for nvars variables
-class mode_array {
+class ModeArray {
 public:
-  mode_array(int nvars_, int nradii_, int lmax_)
+  ModeArray(int nvars_, int nradii_, int lmax_)
       : nvars(nvars_), nradii(nradii_), lmax(lmax_),
         modes(size_t(nvars * nradii * (lmax + 1) * (lmax + 1) * 2)) {}
-  virtual ~mode_array() {}
+  virtual ~ModeArray() {}
   // default copy and assignment is ok
 
   CCTK_REAL &operator()(int v, int ri, int l, int m, bool is_im) {
diff --git a/Multipole/src/utils.cxx b/Multipole/src/utils.cxx
index 0c90b37f..270ba37c 100644
--- a/Multipole/src/utils.cxx
+++ b/Multipole/src/utils.cxx
@@ -130,7 +130,7 @@ void OutputComplexToFile(CCTK_ARGUMENTS, const string &name, CCTK_REAL redata,
 }
 
 void OutputComplexToH5File(CCTK_ARGUMENTS, const variable_desc vars[],
-                           const CCTK_REAL radii[], const mode_array &modes) {
+                           const CCTK_REAL radii[], const ModeArray &modes) {
 
 #ifdef HAVE_CAPABILITY_HDF5
 
diff --git a/Multipole/src/utils.hxx b/Multipole/src/utils.hxx
index 6e242532..06641ba0 100644
--- a/Multipole/src/utils.hxx
+++ b/Multipole/src/utils.hxx
@@ -24,7 +24,7 @@ void OutputComplexToFile(CCTK_ARGUMENTS, const string &name, CCTK_REAL redata,
                          CCTK_REAL imdata);
 
 void OutputComplexToH5File(CCTK_ARGUMENTS, const variable_desc vars[],
-                           const CCTK_REAL radii[], const mode_array &modes);
+                           const CCTK_REAL radii[], const ModeArray &modes);
 
 void CoordSetup(CCTK_REAL xhat[], CCTK_REAL yhat[], CCTK_REAL zhat[],
                 CCTK_REAL th[], CCTK_REAL ph[]);