@@ -16,11 +16,11 @@ namespace openmc {
 
 namespace simulation {
 
-extern vector<ParticleBank> source_bank;
+extern vector<SourceSite> source_bank;
 
-extern SharedArray<ParticleBank> surf_source_bank;
+extern SharedArray<SourceSite> surf_source_bank;
 
-extern SharedArray<ParticleBank> fission_bank;
+extern SharedArray<SourceSite> fission_bank;
 
 extern vector<int64_t> progeny_per_particle;
 
 
@@ -303,7 +303,7 @@ class UniversePartitioner
   //! `partitions_.back()` gives the cells that lie on the positive side of
   //! `surfs_.back()`.  Otherwise, `partitions_[i]` gives cells sandwiched
   //! between `surfs_[i-1]` and `surfs_[i]`.
-  vector<std::vector<int32_t>> partitions_;
+  vector<vector<int32_t>> partitions_;
 };
 
 
 
@@ -13,9 +13,9 @@
 
 namespace openmc {
 
-using double_2dvec = vector<std::vector<double>>;
-using double_3dvec = vector<std::vector<std::vector<double>>>;
-using double_4dvec = vector<std::vector<std::vector<std::vector<double>>>>;
+using double_2dvec = vector<vector<double>>;
+using double_3dvec = vector<vector<vector<double>>>;
+using double_4dvec = vector<vector<vector<vector<double>>>>;
 
 // ============================================================================
 // VERSIONING NUMBERS
 
@@ -65,8 +65,8 @@ void read_cross_sections_xml();
 //
 //! \param[in] nuc_temps Temperatures for each nuclide in [K]
 //! \param[in] thermal_temps Temperatures for each thermal scattering table in [K]
-void read_ce_cross_sections(const vector<std::vector<double>>& nuc_temps,
-  const vector<std::vector<double>>& thermal_temps);
+void read_ce_cross_sections(const vector<vector<double>>& nuc_temps,
+  const vector<vector<double>>& thermal_temps);
 
 //! Read cross_sections.xml and populate data libraries
 void read_ce_cross_sections_xml();
 
@@ -42,8 +42,8 @@ void assign_temperatures();
 //!   table
 //==============================================================================
 
-void get_temperatures(vector<std::vector<double>>& nuc_temps,
-  vector<std::vector<double>>& thermal_temps);
+void get_temperatures(
+  vector<vector<double>>& nuc_temps, vector<vector<double>>& thermal_temps);
 
 //==============================================================================
 //! \brief Perform final setup for geometry
 
@@ -197,9 +197,9 @@ double sternheimer_adjustment(const vector<double>& f,
   double log_I, double tol, int max_iter);
 
 //! Calculate density effect correction
-double density_effect(const vector<double>& f,
-  const std::vector<double>& e_b_sq, double e_p_sq, double n_conduction,
-  double rho, double E, double tol, int max_iter);
+double density_effect(const vector<double>& f, const vector<double>& e_b_sq,
+  double e_p_sq, double n_conduction, double rho, double E, double tol,
+  int max_iter);
 
 //! Read material data from materials.xml
 void read_materials_xml();
 
@@ -122,7 +122,7 @@ class Mesh
   //!   of the plot's axes.  For example an xy-slice plot will get back a vector
   //!   of x-coordinates and another of y-coordinates.  These vectors may be
   //!   empty for low-dimensional meshes.
-  virtual std::pair<vector<double>, std::vector<double>> plot(
+  virtual std::pair<vector<double>, vector<double>> plot(
     Position plot_ll, Position plot_ur) const = 0;
 
   //! Return a string representation of the mesh bin
@@ -159,7 +159,7 @@ class StructuredMesh : public Mesh {
   //! \param[in] Number of bank sites
   //! \param[out] Whether any bank sites are outside the mesh
   xt::xtensor<double, 1> count_sites(
-    const ParticleBank* bank, int64_t length, bool* outside) const;
+    const SourceSite* bank, int64_t length, bool* outside) const;
 
   //! Get bin given mesh indices
   //
@@ -244,7 +244,7 @@ class RegularMesh : public StructuredMesh
 
   double negative_grid_boundary(int* ijk, int i) const override;
 
-  std::pair<vector<double>, std::vector<double>> plot(
+  std::pair<vector<double>, vector<double>> plot(
     Position plot_ll, Position plot_ur) const override;
 
   void to_hdf5(hid_t group) const override;
@@ -257,7 +257,7 @@ class RegularMesh : public StructuredMesh
   //! \param[out] Whether any bank sites are outside the mesh
   //! \return Array indicating number of sites in each mesh/energy bin
   xt::xtensor<double, 1> count_sites(
-    const ParticleBank* bank, int64_t length, bool* outside) const;
+    const SourceSite* bank, int64_t length, bool* outside) const;
 
   // Data members
   double volume_frac_; //!< Volume fraction of each mesh element
@@ -285,12 +285,12 @@ class RectilinearMesh : public StructuredMesh
 
   double negative_grid_boundary(int* ijk, int i) const override;
 
-  std::pair<vector<double>, std::vector<double>> plot(
+  std::pair<vector<double>, vector<double>> plot(
     Position plot_ll, Position plot_ur) const override;
 
   void to_hdf5(hid_t group) const override;
 
-  vector<std::vector<double>> grid_;
+  vector<vector<double>> grid_;
 
   int set_grid();
 };
@@ -382,7 +382,7 @@ class MOABMesh : public UnstructuredMesh {
 
   int n_surface_bins() const override;
 
-  std::pair<vector<double>, std::vector<double>> plot(
+  std::pair<vector<double>, vector<double>> plot(
     Position plot_ll, Position plot_ur) const override;
 
   std::string library() const override;
@@ -534,7 +534,7 @@ class LibMesh : public UnstructuredMesh {
 
   int n_surface_bins() const override;
 
-  std::pair<vector<double>, std::vector<double>> plot(
+  std::pair<vector<double>, vector<double>> plot(
     Position plot_ll, Position plot_ur) const override;
 
   void add_score(const std::string& var_name) override;
 
@@ -64,7 +64,7 @@ class Mgxs {
     void init(const std::string& in_name, double in_awr,
       const vector<double>& in_kTs, bool in_fissionable,
       AngleDistributionType in_scatter_format, bool in_is_isotropic,
-      const vector<double>& in_polar, const std::vector<double>& in_azimuthal);
+      const vector<double>& in_polar, const vector<double>& in_azimuthal);
 
     //! \brief Initializes the Mgxs object metadata from the HDF5 file
     //!
@@ -84,9 +84,8 @@ class Mgxs {
     //! @param micro_ts The temperature index of the microscopic objects that
     //!   corresponds to the temperature of interest.
     //! @param this_t The temperature index of the macroscopic object.
-    void combine(const vector<Mgxs*>& micros,
-      const std::vector<double>& scalars, const vector<int>& micro_ts,
-      int this_t);
+    void combine(const vector<Mgxs*>& micros, const vector<double>& scalars,
+      const vector<int>& micro_ts, int this_t);
 
     //! \brief Checks to see if this and that are able to be combined
     //!
@@ -124,7 +123,7 @@ class Mgxs {
     //! @param num_group number of energy groups
     //! @param num_delay number of delayed groups
     Mgxs(const std::string& in_name, const vector<double>& mat_kTs,
-      const vector<Mgxs*>& micros, const std::vector<double>& atom_densities,
+      const vector<Mgxs*>& micros, const vector<double>& atom_densities,
       int num_group, int num_delay);
 
     //! \brief Provides a cross section value given certain parameters
 
@@ -23,15 +23,15 @@ class MgxsInterface {
   // of XS to read and the corresponding temperatures for each XS
   MgxsInterface(const std::string& path_cross_sections,
     const vector<std::string> xs_to_read,
-    const vector<std::vector<double>> xs_temps);
+    const vector<vector<double>> xs_temps);
 
   // Does things to construct after the nuclides and temperatures to
   // read have been specified.
   void init();
 
   // Set which nuclides and temperatures are to be read
   void set_nuclides_and_temperatures(
-    vector<std::string> xs_to_read, vector<std::vector<double>> xs_temps);
+    vector<std::string> xs_to_read, vector<vector<double>> xs_temps);
 
   // Add an Mgxs object to be managed
   void add_mgxs(
@@ -45,20 +45,20 @@ class MgxsInterface {
   void create_macro_xs();
 
   // Get the kT values which are used in the OpenMC model
-  vector<std::vector<double>> get_mat_kTs();
+  vector<vector<double>> get_mat_kTs();
 
   int num_energy_groups_;
   int num_delayed_groups_;
   vector<std::string> xs_names_;                 // available names in HDF5 file
   vector<std::string> xs_to_read_;               // XS which appear in materials
-  vector<std::vector<double>> xs_temps_to_read_; // temperatures used
+  vector<vector<double>> xs_temps_to_read_;      // temperatures used
   std::string cross_sections_path_; // path to MGXS h5 file
   vector<Mgxs> nuclides_;
   vector<Mgxs> macro_xs_;
   vector<double> energy_bins_;
   vector<double> energy_bin_avg_;
   vector<double> rev_energy_bins_;
-  vector<std::vector<double>> nuc_temps_; // all available temperatures
+  vector<vector<double>> nuc_temps_; // all available temperatures
 };
 
 namespace data {
 
@@ -51,7 +51,7 @@ class Particle : public ParticleData {
   //! site may have been produced from an external source, from fission, or
   //! simply as a secondary particle.
   //! \param src Source site data
-  void from_source(const ParticleBank* src);
+  void from_source(const SourceSite* src);
 
   // Coarse-grained particle events
   void event_calculate_xs();