diff --git a/include/openmc/particle.h b/include/openmc/particle.h
index 797f7b0e52..e8002cedbf 100644
--- a/include/openmc/particle.h
+++ b/include/openmc/particle.h
@@ -172,7 +172,7 @@ public:
     double E;
     double wgt;
     int delayed_group;
-    int surf_num;
+    int surf_id;
     Type particle;
     int64_t parent_id;
     int64_t progeny_id;
diff --git a/src/initialize.cpp b/src/initialize.cpp
index 4f5f525da4..6594417de9 100644
--- a/src/initialize.cpp
+++ b/src/initialize.cpp
@@ -108,7 +108,7 @@ void initialize_mpi(MPI_Comm intracomm)
   MPI_Get_address(&b.E, &disp[2]);
   MPI_Get_address(&b.wgt, &disp[3]);
   MPI_Get_address(&b.delayed_group, &disp[4]);
-  MPI_Get_address(&b.surf_num, &disp[5]);
+  MPI_Get_address(&b.surf_id, &disp[5]);
   MPI_Get_address(&b.particle, &disp[6]);
   MPI_Get_address(&b.parent_id, &disp[7]);
   MPI_Get_address(&b.progeny_id, &disp[8]);
diff --git a/src/particle.cpp b/src/particle.cpp
index 26caea2f36..a1829751ac 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -420,7 +420,7 @@ Particle::cross_surface()
     site.E = this->E_;
     site.wgt = this->wgt_;
     site.delayed_group = this->delayed_group_;
-    site.surf_num = surf->id_;
+    site.surf_id = surf->id_;
     site.particle = this->type_;
     site.parent_id = this->id_;
     site.progeny_id = this->n_progeny_;
diff --git a/src/state_point.cpp b/src/state_point.cpp
index 01660831da..16e6160189 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -518,7 +518,7 @@ hid_t h5banktype() {
   H5Tinsert(banktype, "E", HOFFSET(Particle::Bank, E), H5T_NATIVE_DOUBLE);
   H5Tinsert(banktype, "wgt", HOFFSET(Particle::Bank, wgt), H5T_NATIVE_DOUBLE);
   H5Tinsert(banktype, "delayed_group", HOFFSET(Particle::Bank, delayed_group), H5T_NATIVE_INT);
-  H5Tinsert(banktype, "surf_num", HOFFSET(Particle::Bank, surf_num), H5T_NATIVE_INT);
+  H5Tinsert(banktype, "surf_id", HOFFSET(Particle::Bank, surf_id), H5T_NATIVE_INT);
   H5Tinsert(banktype, "particle", HOFFSET(Particle::Bank, particle), H5T_NATIVE_INT);
 
   H5Tclose(postype);