Rename PSATD Classes (#2805)

* Rename PSATD Classes

* Rename PsatdAlgorithmJLinear as PsatdAlgorithmJLinearInTime

15 files changed, 90 insertions, 90 deletions

diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/CMakeLists.txt b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/CMakeLists.txt
index 3fbe99765..eb88b1f4e 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/CMakeLists.txt
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/CMakeLists.txt
@@ -1,10 +1,10 @@
 target_sources(WarpX
   PRIVATE
     PsatdAlgorithm.cpp
-    PsatdAlgorithmMultiJ.cpp
-    PMLPsatdAlgorithm.cpp
+    PsatdAlgorithmJLinearInTime.cpp
+    PsatdAlgorithmPml.cpp
     SpectralBaseAlgorithm.cpp
-    ComovingPsatdAlgorithm.cpp
+    PsatdAlgorithmComoving.cpp
 )
 
 if(WarpX_DIMS STREQUAL RZ)
@@ -12,7 +12,7 @@ if(WarpX_DIMS STREQUAL RZ)
       PRIVATE
         SpectralBaseAlgorithmRZ.cpp
         PsatdAlgorithmRZ.cpp
-        GalileanPsatdAlgorithmRZ.cpp
-        PMLPsatdAlgorithmRZ.cpp
+        PsatdAlgorithmGalileanRZ.cpp
+        PsatdAlgorithmPmlRZ.cpp
     )
 endif()
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/Make.package b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/Make.package
index e4c32ea2b..7c2bf4281 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/Make.package
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/Make.package
@@ -1,14 +1,14 @@
 CEXE_sources += SpectralBaseAlgorithm.cpp
 CEXE_sources += PsatdAlgorithm.cpp
-CEXE_sources += PsatdAlgorithmMultiJ.cpp
-CEXE_sources += PMLPsatdAlgorithm.cpp
-CEXE_sources += ComovingPsatdAlgorithm.cpp
+CEXE_sources += PsatdAlgorithmJLinearInTime.cpp
+CEXE_sources += PsatdAlgorithmPml.cpp
+CEXE_sources += PsatdAlgorithmComoving.cpp
 
 ifeq ($(USE_RZ),TRUE)
   CEXE_sources += SpectralBaseAlgorithmRZ.cpp
   CEXE_sources += PsatdAlgorithmRZ.cpp
-  CEXE_sources += GalileanPsatdAlgorithmRZ.cpp
-  CEXE_sources += PMLPsatdAlgorithmRZ.cpp
+  CEXE_sources += PsatdAlgorithmGalileanRZ.cpp
+  CEXE_sources += PsatdAlgorithmPmlRZ.cpp
 endif
 
 VPATH_LOCATIONS   += $(WARPX_HOME)/Source/FieldSolver/SpectralSolver/SpectralAlgorithms
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.H
index a1e4a4412..a01719a9a 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.H
@@ -1,5 +1,5 @@
-#ifndef WARPX_COMOVING_PSATD_ALGORITHM_H_
-#define WARPX_COMOVING_PSATD_ALGORITHM_H_
+#ifndef WARPX_PSATD_ALGORITHM_COMOVING_H_
+#define WARPX_PSATD_ALGORITHM_COMOVING_H_
 
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
@@ -19,14 +19,14 @@
 /* \brief Class that updates the field in spectral space and stores the coefficients
  * of the corresponding update equation, according to the comoving spectral scheme.
  */
-class ComovingPsatdAlgorithm : public SpectralBaseAlgorithm
+class PsatdAlgorithmComoving : public SpectralBaseAlgorithm
 {
     public:
 
         /**
          * \brief Class constructor
          */
-        ComovingPsatdAlgorithm (const SpectralKSpace& spectral_kspace,
+        PsatdAlgorithmComoving (const SpectralKSpace& spectral_kspace,
                                 const amrex::DistributionMapping& dm,
                                 const SpectralFieldIndex& spectral_index,
                                 const int norder_x,
@@ -102,4 +102,4 @@ class ComovingPsatdAlgorithm : public SpectralBaseAlgorithm
 };
 
 #endif // WARPX_USE_PSATD
-#endif // WARPX_COMOVING_PSATD_ALGORITHM_H_
+#endif // WARPX_PSATD_ALGORITHM_COMOVING_H_
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp
index 0e2953624..b14ded092 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/ComovingPsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmComoving.cpp
@@ -1,4 +1,4 @@
-#include "ComovingPsatdAlgorithm.H"
+#include "PsatdAlgorithmComoving.H"
 
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpX_Complex.H"
@@ -20,7 +20,7 @@
 
 using namespace amrex;
 
-ComovingPsatdAlgorithm::ComovingPsatdAlgorithm (const SpectralKSpace& spectral_kspace,
+PsatdAlgorithmComoving::PsatdAlgorithmComoving (const SpectralKSpace& spectral_kspace,
                                                 const DistributionMapping& dm,
                                                 const SpectralFieldIndex& spectral_index,
                                                 const int norder_x, const int norder_y,
@@ -64,7 +64,7 @@ ComovingPsatdAlgorithm::ComovingPsatdAlgorithm (const SpectralKSpace& spectral_k
 }
 
 void
-ComovingPsatdAlgorithm::pushSpectralFields (SpectralFieldData& f) const
+PsatdAlgorithmComoving::pushSpectralFields (SpectralFieldData& f) const
 {
     const SpectralFieldIndex& Idx = m_spectral_index;
 
@@ -155,7 +155,7 @@ ComovingPsatdAlgorithm::pushSpectralFields (SpectralFieldData& f) const
     }
 }
 
-void ComovingPsatdAlgorithm::InitializeSpectralCoefficients (const SpectralKSpace& spectral_kspace,
+void PsatdAlgorithmComoving::InitializeSpectralCoefficients (const SpectralKSpace& spectral_kspace,
                                                              const amrex::DistributionMapping& dm,
                                                              const amrex::Real dt)
 {
@@ -411,13 +411,13 @@ void ComovingPsatdAlgorithm::InitializeSpectralCoefficients (const SpectralKSpac
 }
 
 void
-ComovingPsatdAlgorithm::CurrentCorrection (const int lev,
+PsatdAlgorithmComoving::CurrentCorrection (const int lev,
                                            SpectralFieldData& field_data,
                                            std::array<std::unique_ptr<amrex::MultiFab>,3>& current,
                                            const std::unique_ptr<amrex::MultiFab>& rho)
 {
     // Profiling
-    BL_PROFILE("ComovingAlgorithm::CurrentCorrection");
+    BL_PROFILE("PsatdAlgorithmComoving::CurrentCorrection");
 
     const SpectralFieldIndex& Idx = m_spectral_index;
 
@@ -516,7 +516,7 @@ ComovingPsatdAlgorithm::CurrentCorrection (const int lev,
 }
 
 void
-ComovingPsatdAlgorithm::VayDeposition (const int /*lev*/,
+PsatdAlgorithmComoving::VayDeposition (const int /*lev*/,
                                        SpectralFieldData& /*field_data*/,
                                        std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/)
 {
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmGalileanRZ.H
index 10ad6dbc5..cee84f99d 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmGalileanRZ.H
@@ -4,19 +4,19 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#ifndef WARPX_GALILEAN_PSATD_ALGORITHM_RZ_H_
-#define WARPX_GALILEAN_PSATD_ALGORITHM_RZ_H_
+#ifndef WARPX_PSATD_ALGORITHM_GALILEAN_RZ_H_
+#define WARPX_PSATD_ALGORITHM_GALILEAN_RZ_H_
 
 #include "SpectralBaseAlgorithmRZ.H"
 
 /* \brief Class that updates the field in spectral space
  * and stores the coefficients of the corresponding update equation.
  */
-class GalileanPsatdAlgorithmRZ : public SpectralBaseAlgorithmRZ
+class PsatdAlgorithmGalileanRZ : public SpectralBaseAlgorithmRZ
 {
 
     public:
-        GalileanPsatdAlgorithmRZ (SpectralKSpaceRZ const & spectral_kspace,
+        PsatdAlgorithmGalileanRZ (SpectralKSpaceRZ const & spectral_kspace,
                                   amrex::DistributionMapping const & dm,
                                   const SpectralFieldIndex& spectral_index,
                                   int const n_rz_azimuthal_modes, int const norder_z,
@@ -75,4 +75,4 @@ class GalileanPsatdAlgorithmRZ : public SpectralBaseAlgorithmRZ
 
 };
 
-#endif // WARPX_GALILEAN_PSATD_ALGORITHM_RZ_H_
+#endif // WARPX_PSATD_ALGORITHM_GALILEAN_RZ_H_
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmGalileanRZ.cpp
index 4fa68b681..2faf48c04 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/GalileanPsatdAlgorithmRZ.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmGalileanRZ.cpp
@@ -4,7 +4,7 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "GalileanPsatdAlgorithmRZ.H"
+#include "PsatdAlgorithmGalileanRZ.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXProfilerWrapper.H"
 #include "WarpX.H"
@@ -15,7 +15,7 @@ using namespace amrex::literals;
 
 
 /* \brief Initialize coefficients for the update equation */
-GalileanPsatdAlgorithmRZ::GalileanPsatdAlgorithmRZ (SpectralKSpaceRZ const & spectral_kspace,
+PsatdAlgorithmGalileanRZ::PsatdAlgorithmGalileanRZ (SpectralKSpaceRZ const & spectral_kspace,
                                                     amrex::DistributionMapping const & dm,
                                                     const SpectralFieldIndex& spectral_index,
                                                     int const n_rz_azimuthal_modes, int const norder_z,
@@ -50,7 +50,7 @@ GalileanPsatdAlgorithmRZ::GalileanPsatdAlgorithmRZ (SpectralKSpaceRZ const & spe
  * The algorithm is described in https://doi.org/10.1103/PhysRevE.94.053305
  * */
 void
-GalileanPsatdAlgorithmRZ::pushSpectralFields (SpectralFieldDataRZ & f)
+PsatdAlgorithmGalileanRZ::pushSpectralFields (SpectralFieldDataRZ & f)
 {
 
     bool const update_with_rho = m_update_with_rho;
@@ -175,7 +175,7 @@ GalileanPsatdAlgorithmRZ::pushSpectralFields (SpectralFieldDataRZ & f)
     }
 }
 
-void GalileanPsatdAlgorithmRZ::InitializeSpectralCoefficients (SpectralFieldDataRZ const & f)
+void PsatdAlgorithmGalileanRZ::InitializeSpectralCoefficients (SpectralFieldDataRZ const & f)
 {
 
     // Fill them with the right values:
@@ -290,13 +290,13 @@ void GalileanPsatdAlgorithmRZ::InitializeSpectralCoefficients (SpectralFieldData
 }
 
 void
-GalileanPsatdAlgorithmRZ::CurrentCorrection (const int lev,
+PsatdAlgorithmGalileanRZ::CurrentCorrection (const int lev,
                                              SpectralFieldDataRZ& field_data,
                                              std::array<std::unique_ptr<amrex::MultiFab>,3>& current,
                                              const std::unique_ptr<amrex::MultiFab>& rho )
 {
     // Profiling
-    WARPX_PROFILE( "GalileanPsatdAlgorithmRZ::CurrentCorrection" );
+    WARPX_PROFILE( "PsatdAlgorithmGalileanRZ::CurrentCorrection" );
 
     const SpectralFieldIndex& Idx = m_spectral_index;
 
@@ -377,7 +377,7 @@ GalileanPsatdAlgorithmRZ::CurrentCorrection (const int lev,
 }
 
 void
-GalileanPsatdAlgorithmRZ::VayDeposition (const int /*lev*/,
+PsatdAlgorithmGalileanRZ::VayDeposition (const int /*lev*/,
                                          SpectralFieldDataRZ& /*field_data*/,
                                          std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/)
 {
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmMultiJ.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.H
index 215e35676..e9636fc32 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmMultiJ.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.H
@@ -4,8 +4,8 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#ifndef WARPX_PSATD_ALGORITHM_MULTIJ_H_
-#define WARPX_PSATD_ALGORITHM_MULTIJ_H_
+#ifndef WARPX_PSATD_ALGORITHM_J_LINEAR_IN_TIME_H_
+#define WARPX_PSATD_ALGORITHM_J_LINEAR_IN_TIME_H_
 
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
@@ -27,12 +27,12 @@
  *        linear in time and two currents, deposited at the beginning and the end of the time step,
  *        are used for the PSATD update equations, instead of only one current deposited at half time.
  */
-class PsatdAlgorithmMultiJ : public SpectralBaseAlgorithm
+class PsatdAlgorithmJLinearInTime : public SpectralBaseAlgorithm
 {
     public:
 
         /**
-         * \brief Constructor of the class PsatdAlgorithmMultiJ
+         * \brief Constructor of the class PsatdAlgorithmJLinearInTime
          *
          * \param[in] spectral_kspace spectral space
          * \param[in] dm distribution mapping
@@ -47,7 +47,7 @@ class PsatdAlgorithmMultiJ : public SpectralBaseAlgorithm
          * \param[in] dive_cleaning Update F as part of the field update, so that errors in divE=rho propagate away at the speed of light
          * \param[in] divb_cleaning Update G as part of the field update, so that errors in divB=0 propagate away at the speed of light
          */
-        PsatdAlgorithmMultiJ (
+        PsatdAlgorithmJLinearInTime (
             const SpectralKSpace& spectral_kspace,
             const amrex::DistributionMapping& dm,
             const SpectralFieldIndex& spectral_index,
@@ -144,4 +144,4 @@ class PsatdAlgorithmMultiJ : public SpectralBaseAlgorithm
         bool m_divb_cleaning;
 };
 #endif // WARPX_USE_PSATD
-#endif // WARPX_PSATD_ALGORITHM_MULTIJ_H_
+#endif // WARPX_PSATD_ALGORITHM_J_LINEAR_IN_TIME_H_
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmMultiJ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp
index 7ecde8d79..5db997612 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmMultiJ.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmJLinearInTime.cpp
@@ -4,7 +4,7 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "PsatdAlgorithmMultiJ.H"
+#include "PsatdAlgorithmJLinearInTime.H"
 
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpX_Complex.H"
@@ -26,7 +26,7 @@
 
 using namespace amrex::literals;
 
-PsatdAlgorithmMultiJ::PsatdAlgorithmMultiJ(
+PsatdAlgorithmJLinearInTime::PsatdAlgorithmJLinearInTime(
     const SpectralKSpace& spectral_kspace,
     const amrex::DistributionMapping& dm,
     const SpectralFieldIndex& spectral_index,
@@ -68,7 +68,7 @@ PsatdAlgorithmMultiJ::PsatdAlgorithmMultiJ(
 }
 
 void
-PsatdAlgorithmMultiJ::pushSpectralFields (SpectralFieldData& f) const
+PsatdAlgorithmJLinearInTime::pushSpectralFields (SpectralFieldData& f) const
 {
     const bool time_averaging = m_time_averaging;
     const bool dive_cleaning = m_dive_cleaning;
@@ -260,7 +260,7 @@ PsatdAlgorithmMultiJ::pushSpectralFields (SpectralFieldData& f) const
     }
 }
 
-void PsatdAlgorithmMultiJ::InitializeSpectralCoefficients (
+void PsatdAlgorithmJLinearInTime::InitializeSpectralCoefficients (
     const SpectralKSpace& spectral_kspace,
     const amrex::DistributionMapping& dm,
     const amrex::Real dt)
@@ -353,7 +353,7 @@ void PsatdAlgorithmMultiJ::InitializeSpectralCoefficients (
     }
 }
 
-void PsatdAlgorithmMultiJ::InitializeSpectralCoefficientsAveraging (
+void PsatdAlgorithmJLinearInTime::InitializeSpectralCoefficientsAveraging (
     const SpectralKSpace& spectral_kspace,
     const amrex::DistributionMapping& dm,
     const amrex::Real dt)
@@ -424,27 +424,27 @@ void PsatdAlgorithmMultiJ::InitializeSpectralCoefficientsAveraging (
 }
 
 void
-PsatdAlgorithmMultiJ::CurrentCorrection (
+PsatdAlgorithmJLinearInTime::CurrentCorrection (
     const int lev,
     SpectralFieldData& field_data,
     std::array<std::unique_ptr<amrex::MultiFab>,3>& current,
     const std::unique_ptr<amrex::MultiFab>& rho)
 {
     // Profiling
-    BL_PROFILE("PsatdAlgorithmMultiJ::CurrentCorrection");
+    BL_PROFILE("PsatdAlgorithmJLinearInTime::CurrentCorrection");
 
     amrex::ignore_unused(lev, field_data, current, rho);
     amrex::Abort("Current correction not implemented for multi-J PSATD algorithm");
 }
 
 void
-PsatdAlgorithmMultiJ::VayDeposition (
+PsatdAlgorithmJLinearInTime::VayDeposition (
     const int lev,
     SpectralFieldData& field_data,
     std::array<std::unique_ptr<amrex::MultiFab>,3>& current)
 {
     // Profiling
-    BL_PROFILE("PsatdAlgorithmMultiJ::VayDeposition()");
+    BL_PROFILE("PsatdAlgorithmJLinearInTime::VayDeposition()");
 
     amrex::ignore_unused(lev, field_data, current);
     amrex::Abort("Vay deposition not implemented for multi-J PSATD algorithm");
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.H
index d6d7e074e..39e99012f 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.H
@@ -4,8 +4,8 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#ifndef WARPX_PML_PSATD_ALGORITHM_H_
-#define WARPX_PML_PSATD_ALGORITHM_H_
+#ifndef WARPX_PSATD_ALGORITHM_PML_H_
+#define WARPX_PSATD_ALGORITHM_PML_H_
 
 #include "SpectralBaseAlgorithm.H"
 
@@ -24,18 +24,18 @@
 /* \brief Class that updates the field in spectral space
  * and stores the coefficients of the corresponding update equation.
  */
-class PMLPsatdAlgorithm : public SpectralBaseAlgorithm
+class PsatdAlgorithmPml : public SpectralBaseAlgorithm
 {
     public:
-        PMLPsatdAlgorithm(const SpectralKSpace& spectral_kspace,
-                         const amrex::DistributionMapping& dm,
-                         const SpectralFieldIndex& spectral_index,
-                         const int norder_x, const int norder_y,
-                         const int norder_z, const bool nodal,
-                         const amrex::IntVect& fill_guards,
-                         const amrex::Real dt,
-                         const bool dive_cleaning,
-                         const bool divb_cleaning);
+        PsatdAlgorithmPml(const SpectralKSpace& spectral_kspace,
+                          const amrex::DistributionMapping& dm,
+                          const SpectralFieldIndex& spectral_index,
+                          const int norder_x, const int norder_y,
+                          const int norder_z, const bool nodal,
+                          const amrex::IntVect& fill_guards,
+                          const amrex::Real dt,
+                          const bool dive_cleaning,
+                          const bool divb_cleaning);
 
         void InitializeSpectralCoefficients(
             const SpectralKSpace& spectral_kspace,
@@ -88,4 +88,4 @@ class PMLPsatdAlgorithm : public SpectralBaseAlgorithm
 };
 
 #endif // WARPX_USE_PSATD
-#endif // WARPX_PML_PSATD_ALGORITHM_H_
+#endif // WARPX_PSATD_ALGORITHM_PML_H_
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp
index bfe02a238..0780b8c52 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPml.cpp
@@ -4,7 +4,7 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "PMLPsatdAlgorithm.H"
+#include "PsatdAlgorithmPml.H"
 
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
 #include "FieldSolver/SpectralSolver/SpectralKSpace.H"
@@ -29,7 +29,7 @@
 using namespace amrex;
 
 /* \brief Initialize coefficients for the update equation */
-PMLPsatdAlgorithm::PMLPsatdAlgorithm(const SpectralKSpace& spectral_kspace,
+PsatdAlgorithmPml::PsatdAlgorithmPml(const SpectralKSpace& spectral_kspace,
                                      const DistributionMapping& dm,
                                      const SpectralFieldIndex& spectral_index,
                                      const int norder_x, const int norder_y,
@@ -56,7 +56,7 @@ PMLPsatdAlgorithm::PMLPsatdAlgorithm(const SpectralKSpace& spectral_kspace,
 /* Advance the E and B field in spectral space (stored in `f`)
  * over one time step */
 void
-PMLPsatdAlgorithm::pushSpectralFields(SpectralFieldData& f) const {
+PsatdAlgorithmPml::pushSpectralFields(SpectralFieldData& f) const {
 
     const bool dive_cleaning = m_dive_cleaning;
     const bool divb_cleaning = m_divb_cleaning;
@@ -346,7 +346,7 @@ PMLPsatdAlgorithm::pushSpectralFields(SpectralFieldData& f) const {
     }
 }
 
-void PMLPsatdAlgorithm::InitializeSpectralCoefficients (
+void PsatdAlgorithmPml::InitializeSpectralCoefficients (
     const SpectralKSpace& spectral_kspace,
     const amrex::DistributionMapping& dm,
     const amrex::Real dt)
@@ -402,7 +402,7 @@ void PMLPsatdAlgorithm::InitializeSpectralCoefficients (
 }
 
 void
-PMLPsatdAlgorithm::CurrentCorrection (const int /*lev*/,
+PsatdAlgorithmPml::CurrentCorrection (const int /*lev*/,
                                       SpectralFieldData& /*field_data*/,
                                       std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/,
                                       const std::unique_ptr<amrex::MultiFab>& /*rho*/)
@@ -411,7 +411,7 @@ PMLPsatdAlgorithm::CurrentCorrection (const int /*lev*/,
 }
 
 void
-PMLPsatdAlgorithm::VayDeposition (const int /*lev*/,
+PsatdAlgorithmPml::VayDeposition (const int /*lev*/,
                                   SpectralFieldData& /*field_data*/,
                                   std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/)
 {
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithmRZ.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPmlRZ.H
index e0956a514..fac84b90a 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithmRZ.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPmlRZ.H
@@ -4,19 +4,19 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#ifndef WARPX_PMLPSATD_ALGORITHM_RZ_H_
-#define WARPX_PMLPSATD_ALGORITHM_RZ_H_
+#ifndef WARPX_PSATD_ALGORITHM_PML_RZ_H_
+#define WARPX_PSATD_ALGORITHM_PML_RZ_H_
 
 #include "SpectralBaseAlgorithmRZ.H"
 
 /* \brief Class that updates the field in spectral space
  * and stores the coefficients of the corresponding update equation.
  */
-class PMLPsatdAlgorithmRZ : public SpectralBaseAlgorithmRZ
+class PsatdAlgorithmPmlRZ : public SpectralBaseAlgorithmRZ
 {
 
     public:
-        PMLPsatdAlgorithmRZ (SpectralKSpaceRZ const & spectral_kspace,
+        PsatdAlgorithmPmlRZ (SpectralKSpaceRZ const & spectral_kspace,
                              amrex::DistributionMapping const & dm,
                              const SpectralFieldIndex& spectral_index,
                              int const n_rz_azimuthal_modes, int const norder_z,
@@ -69,4 +69,4 @@ class PMLPsatdAlgorithmRZ : public SpectralBaseAlgorithmRZ
         SpectralRealCoefficients C_coef, S_ck_coef;
 };
 
-#endif // WARPX_PMLPSATD_ALGORITHM_RZ_H_
+#endif // WARPX_PSATD_ALGORITHM_PML_RZ_H_
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithmRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPmlRZ.cpp
index 892c542c7..16f4f1e37 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PMLPsatdAlgorithmRZ.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithmPmlRZ.cpp
@@ -4,7 +4,7 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "PMLPsatdAlgorithmRZ.H"
+#include "PsatdAlgorithmPmlRZ.H"
 #include "FieldSolver/SpectralSolver/SpectralHankelTransform/HankelTransform.H"
 #include "Utils/WarpXConst.H"
 #include "Utils/WarpXProfilerWrapper.H"
@@ -16,7 +16,7 @@ using amrex::operator""_rt;
 
 
 /* \brief Initialize coefficients for the update equation */
-PMLPsatdAlgorithmRZ::PMLPsatdAlgorithmRZ (SpectralKSpaceRZ const & spectral_kspace,
+PsatdAlgorithmPmlRZ::PsatdAlgorithmPmlRZ (SpectralKSpaceRZ const & spectral_kspace,
                                           amrex::DistributionMapping const & dm,
                                           const SpectralFieldIndex& spectral_index,
                                           int const n_rz_azimuthal_modes, int const norder_z,
@@ -37,7 +37,7 @@ PMLPsatdAlgorithmRZ::PMLPsatdAlgorithmRZ (SpectralKSpaceRZ const & spectral_kspa
 /* Advance the E and B field in spectral space (stored in `f`)
  * over one time step */
 void
-PMLPsatdAlgorithmRZ::pushSpectralFields (SpectralFieldDataRZ & f)
+PsatdAlgorithmPmlRZ::pushSpectralFields (SpectralFieldDataRZ & f)
 {
 
     if (not coefficients_initialized) {
@@ -113,7 +113,7 @@ PMLPsatdAlgorithmRZ::pushSpectralFields (SpectralFieldDataRZ & f)
     }
 }
 
-void PMLPsatdAlgorithmRZ::InitializeSpectralCoefficients (SpectralFieldDataRZ const & f)
+void PsatdAlgorithmPmlRZ::InitializeSpectralCoefficients (SpectralFieldDataRZ const & f)
 {
 
     // Fill them with the right values:
@@ -160,7 +160,7 @@ void PMLPsatdAlgorithmRZ::InitializeSpectralCoefficients (SpectralFieldDataRZ co
 }
 
 void
-PMLPsatdAlgorithmRZ::CurrentCorrection (const int /* lev */,
+PsatdAlgorithmPmlRZ::CurrentCorrection (const int /* lev */,
                                         SpectralFieldDataRZ& /* field_data */,
                                         std::array<std::unique_ptr<amrex::MultiFab>,3>& /* current */,
                                         const std::unique_ptr<amrex::MultiFab>& /* rho */)
@@ -169,7 +169,7 @@ PMLPsatdAlgorithmRZ::CurrentCorrection (const int /* lev */,
 }
 
 void
-PMLPsatdAlgorithmRZ::VayDeposition (const int /* lev */,
+PsatdAlgorithmPmlRZ::VayDeposition (const int /* lev */,
                                     SpectralFieldDataRZ& /*field_data*/,
                                     std::array<std::unique_ptr<amrex::MultiFab>,3>& /*current*/)
 {
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.H b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
index f5cfb814b..78fdc16f8 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.H
@@ -121,7 +121,7 @@ class SpectralSolver
         /**
          * \brief Public interface to call the virtual function \c CurrentCorrection,
          * defined in the base class SpectralBaseAlgorithm and possibly overridden
-         * by its derived classes (e.g. PsatdAlgorithm, GalileanAlgorithm), from
+         * by its derived classes (e.g. PsatdAlgorithm, PsatdAlgorithmComoving, etc.), from
          * objects of class SpectralSolver through the private unique pointer \c algorithm
          *
          * \param[in]     lev     The mesh refinement level
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
index ee169398c..3a9e23127 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolver.cpp
@@ -6,10 +6,10 @@
  */
 #include "FieldSolver/SpectralSolver/SpectralAlgorithms/SpectralBaseAlgorithm.H"
 #include "FieldSolver/SpectralSolver/SpectralFieldData.H"
-#include "SpectralAlgorithms/ComovingPsatdAlgorithm.H"
-#include "SpectralAlgorithms/PMLPsatdAlgorithm.H"
+#include "SpectralAlgorithms/PsatdAlgorithmComoving.H"
+#include "SpectralAlgorithms/PsatdAlgorithmPml.H"
 #include "SpectralAlgorithms/PsatdAlgorithm.H"
-#include "SpectralAlgorithms/PsatdAlgorithmMultiJ.H"
+#include "SpectralAlgorithms/PsatdAlgorithmJLinearInTime.H"
 #include "SpectralKSpace.H"
 #include "SpectralSolver.H"
 #include "Utils/WarpXProfilerWrapper.H"
@@ -50,7 +50,7 @@ SpectralSolver::SpectralSolver(
 
     if (pml) // PSATD equations in the PML grids
     {
-        algorithm = std::make_unique<PMLPsatdAlgorithm>(
+        algorithm = std::make_unique<PsatdAlgorithmPml>(
             k_space, dm, m_spectral_index, norder_x, norder_y, norder_z, nodal,
             fill_guards, dt, dive_cleaning, divb_cleaning);
     }
@@ -59,7 +59,7 @@ SpectralSolver::SpectralSolver(
         // Comoving PSATD algorithm
         if (v_comoving[0] != 0. || v_comoving[1] != 0. || v_comoving[2] != 0.)
         {
-            algorithm = std::make_unique<ComovingPsatdAlgorithm>(
+            algorithm = std::make_unique<PsatdAlgorithmComoving>(
                 k_space, dm, m_spectral_index, norder_x, norder_y, norder_z, nodal,
                 fill_guards, v_comoving, dt, update_with_rho);
         }
@@ -67,7 +67,7 @@ SpectralSolver::SpectralSolver(
         {
             if (do_multi_J)
             {
-                algorithm = std::make_unique<PsatdAlgorithmMultiJ>(
+                algorithm = std::make_unique<PsatdAlgorithmJLinearInTime>(
                     k_space, dm, m_spectral_index, norder_x, norder_y, norder_z, nodal,
                     fill_guards, dt, fft_do_time_averaging, dive_cleaning, divb_cleaning);
             }
diff --git a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
index 558d4a78a..a16175b0f 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralSolverRZ.cpp
@@ -4,9 +4,9 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#include "SpectralAlgorithms/GalileanPsatdAlgorithmRZ.H"
+#include "SpectralAlgorithms/PsatdAlgorithmGalileanRZ.H"
 #include "SpectralAlgorithms/PsatdAlgorithmRZ.H"
-#include "SpectralAlgorithms/PMLPsatdAlgorithmRZ.H"
+#include "SpectralAlgorithms/PsatdAlgorithmPmlRZ.H"
 #include "SpectralKSpaceRZ.H"
 #include "SpectralSolverRZ.H"
 #include "Utils/WarpXProfilerWrapper.H"
@@ -53,7 +53,7 @@ SpectralSolverRZ::SpectralSolverRZ (const int lev,
     // - Select the algorithm depending on the input parameters
     //   Initialize the corresponding coefficients over k space
     if (with_pml) {
-            PML_algorithm = std::make_unique<PMLPsatdAlgorithmRZ>(
+            PML_algorithm = std::make_unique<PsatdAlgorithmPmlRZ>(
                 k_space, dm, m_spectral_index, n_rz_azimuthal_modes, norder_z, nodal, dt);
     }
     if (v_galilean[2] == 0) {
@@ -63,7 +63,7 @@ SpectralSolverRZ::SpectralSolverRZ (const int lev,
             update_with_rho, fft_do_time_averaging, do_multi_J, dive_cleaning, divb_cleaning);
     } else {
         // Otherwise: use the Galilean algorithm
-        algorithm = std::make_unique<GalileanPsatdAlgorithmRZ>(
+        algorithm = std::make_unique<PsatdAlgorithmGalileanRZ>(
             k_space, dm, m_spectral_index, n_rz_azimuthal_modes, norder_z, nodal, v_galilean, dt, update_with_rho);
     }