4 files changed, 14 insertions, 14 deletions
diff --git a/Source/LaserContainer.cpp b/Source/LaserParticleContainer.cpp
index 0cada57b8..b8b448740 100644
--- a/Source/LaserContainer.cpp
+++ b/Source/LaserParticleContainer.cpp
@@ -7,7 +7,7 @@
 #include <ParticleContainer.H>
 #include <ParticleIterator.H>
 
-LaserContainer::LaserContainer (AmrCore* amr_core, int ispecies)
+LaserParticleContainer::LaserParticleContainer (AmrCore* amr_core, int ispecies)
     : WarpXParticleContainer(amr_core, ispecies)
 {
     charge = PhysConst::q_e; // note that q_e is defined to be positive.
@@ -15,7 +15,7 @@ LaserContainer::LaserContainer (AmrCore* amr_core, int ispecies)
 }
 
 void
-LaserContainer::AllocData ()
+LaserParticleContainer::AllocData ()
 {
     // have to resize here, not in the constructor because GDB was not
     // ready in constructor.
@@ -23,16 +23,16 @@ LaserContainer::AllocData ()
 }
 
 void
-LaserContainer::InitData ()
+LaserParticleContainer::InitData ()
 {
-    BoxLib::Abort("LaserContainer::InitData: Not implemented");
+    
 }
 
 void
-LaserContainer::Evolve (int lev,
-			const MultiFab&, const MultiFab&, const MultiFab&,
-			const MultiFab&, const MultiFab&, const MultiFab&,
-			MultiFab& jx, MultiFab& jy, MultiFab& jz, Real dt)
+LaserParticleContainer::Evolve (int lev,
+				const MultiFab&, const MultiFab&, const MultiFab&,
+				const MultiFab&, const MultiFab&, const MultiFab&,
+				MultiFab& jx, MultiFab& jy, MultiFab& jz, Real dt)
 {
     BL_PROFILE("Laser::Evolve()");
     BL_PROFILE_VAR_NS("Laser::Evolve::Copy", blp_copy);
diff --git a/Source/Make.package b/Source/Make.package
index 25d7a5351..c2d93284b 100644
--- a/Source/Make.package
+++ b/Source/Make.package
@@ -7,7 +7,7 @@ CEXE_sources += WarpXWrappers.cpp
 CEXE_sources += WarpX.cpp WarpXInitData.cpp WarpXEvolve.cpp WarpXIO.cpp WarpXProb.cpp
 
 CEXE_sources += ParticleContainer.cpp ParticleIterator.cpp ParticleProb.cpp ParticleIO.cpp
-CEXE_sources += WarpXParticleContainer.cpp PhysicalParticleContainer.cpp LaserContainer.cpp
+CEXE_sources += WarpXParticleContainer.cpp PhysicalParticleContainer.cpp LaserParticleContainer.cpp
 
 CEXE_headers += WarpXWrappers.h
 
diff --git a/Source/ParticleContainer.H b/Source/ParticleContainer.H
index 5fafd6869..b34496585 100644
--- a/Source/ParticleContainer.H
+++ b/Source/ParticleContainer.H
@@ -12,7 +12,7 @@
 // MultiParticleContainer holds multiple (nspecies or npsecies+1 when
 // using laser) WarpXParticleContainer.  WarpXParticlContainer is
 // derived from amrex::ParticleContainer, and it is
-// polymorphic. PhysicalParticleContainer and LaserContainer are
+// polymorphic. PhysicalParticleContainer and LaserParticleContainer are
 // concrete class dervied from WarpXParticlContainer.
 //
 
@@ -101,12 +101,12 @@ private:
     Array<std::map<int, Array<std::unique_ptr<Array<Real> > > > > m_partdata;
 };
 
-class LaserContainer
+class LaserParticleContainer
     : public WarpXParticleContainer
 {
 public:
-    LaserContainer (AmrCore* amr_core, int ispecies);
-    virtual ~LaserContainer () {}
+    LaserParticleContainer (AmrCore* amr_core, int ispecies);
+    virtual ~LaserParticleContainer () {}
 
     virtual void AllocData () override;
     
diff --git a/Source/ParticleContainer.cpp b/Source/ParticleContainer.cpp
index b5f933db4..70ed5bc43 100644
--- a/Source/ParticleContainer.cpp
+++ b/Source/ParticleContainer.cpp
@@ -15,7 +15,7 @@ MultiParticleContainer::MultiParticleContainer (AmrCore* amr_core)
 	allcontainers[i].reset(new PhysicalParticleContainer(amr_core, i));
     }
     if (WarpX::use_laser) {
-	allcontainers[n-1].reset(new LaserContainer(amr_core,n-1)); 
+	allcontainers[n-1].reset(new LaserParticleContainer(amr_core,n-1)); 
     }
 }