diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 34d6a1391..d8968aec5 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -409,7 +409,6 @@ list (APPEND PUBLIC_HEADER_FILES
   ebos/collecttoiorank.hh
   ebos/collecttoiorank_impl.hh
   ebos/ebos.hh
-  ebos/eclalugridvanguard.hh
   ebos/eclbaseaquifermodel.hh
   ebos/eclbasevanguard.hh
   ebos/eclcpgridvanguard.hh
@@ -442,6 +441,7 @@ list (APPEND PUBLIC_HEADER_FILES
   ebos/vtkecltracermodule.hh
   opm/simulators/flow/ActionHandler.hpp
   opm/simulators/flow/AluGridCartesianIndexMapper.hpp
+  opm/simulators/flow/AluGridVanguard.hpp
   opm/simulators/flow/Banners.hpp
   opm/simulators/flow/BlackoilModel.hpp
   opm/simulators/flow/BlackoilModelNldd.hpp
diff --git a/flow/flow_blackoil_alugrid.cpp b/flow/flow_blackoil_alugrid.cpp
index d15cb5614..e0a98fa5d 100644
--- a/flow/flow_blackoil_alugrid.cpp
+++ b/flow/flow_blackoil_alugrid.cpp
@@ -19,7 +19,6 @@
 #include <config.h>
 
 #include <dune/alugrid/grid.hh>
-#include <ebos/eclalugridvanguard.hh>
 #include <opm/simulators/flow/Main.hpp>
 
 // for equilgrid in writer
@@ -35,6 +34,7 @@
 #include <ebos/eclgenericwriter_impl.hh>
 #include <ebos/ecltransmissibility_impl.hh>
 #include <ebos/equil/initstateequil_impl.hh>
+#include <opm/simulators/flow/AluGridVanguard.hpp>
 #include <opm/simulators/utils/GridDataOutput_impl.hpp>
 
 namespace Opm {
@@ -62,7 +62,7 @@ struct EquilGrid<TypeTag, TTag::FlowProblemAlugrid> {
 };
 template<class TypeTag>
 struct Vanguard<TypeTag, TTag::FlowProblemAlugrid> {
-    using type = Opm::EclAluGridVanguard<TypeTag>;
+    using type = Opm::AluGridVanguard<TypeTag>;
 };
 }
 }
diff --git a/ebos/eclalugridvanguard.hh b/opm/simulators/flow/AluGridVanguard.hpp
similarity index 95%
rename from ebos/eclalugridvanguard.hh
rename to opm/simulators/flow/AluGridVanguard.hpp
index edcc35c14..8a1ff04e6 100644
--- a/ebos/eclalugridvanguard.hh
+++ b/opm/simulators/flow/AluGridVanguard.hpp
@@ -22,10 +22,10 @@
 */
 /*!
  * \file
- * \copydoc Opm::EclAluGridVanguard
+ * \copydoc Opm::AluGridVanguard
  */
-#ifndef EWOMS_ECL_ALU_GRID_VANGUARD_HH
-#define EWOMS_ECL_ALU_GRID_VANGUARD_HH
+#ifndef OPM_ALUGRID_VANGUARD_HPP
+#define OPM_ALUGRID_VANGUARD_HPP
 
 #include <dune/alugrid/common/fromtogridfactory.hh>
 #include <dune/alugrid/dgf.hh>
@@ -51,25 +51,25 @@
 
 namespace Opm {
 template <class TypeTag>
-class EclAluGridVanguard;
+class FlowAluGridVanguard;
 
 } // namespace Opm
 
 namespace Opm::Properties {
 
 namespace TTag {
-struct EclAluGridVanguard {
+struct AluGridVanguard {
     using InheritsFrom = std::tuple<EclBaseVanguard>;
 };
 }
 
 // declare the properties
 template<class TypeTag>
-struct Vanguard<TypeTag, TTag::EclAluGridVanguard> {
-    using type = Opm::EclAluGridVanguard<TypeTag>;
+struct Vanguard<TypeTag, TTag::AluGridVanguard> {
+    using type = Opm::FlowAluGridVanguard<TypeTag>;
 };
 template<class TypeTag>
-struct Grid<TypeTag, TTag::EclAluGridVanguard> {
+struct Grid<TypeTag, TTag::AluGridVanguard> {
 #if HAVE_MPI
     using type = Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming, Dune::ALUGridMPIComm>; 
 #else    
@@ -77,7 +77,7 @@ struct Grid<TypeTag, TTag::EclAluGridVanguard> {
 #endif //HAVE_MPI     
 };
 template<class TypeTag>
-struct EquilGrid<TypeTag, TTag::EclAluGridVanguard> {
+struct EquilGrid<TypeTag, TTag::AluGridVanguard> {
     using type = Dune::CpGrid;
 };
 
@@ -93,7 +93,7 @@ namespace Opm {
  * This class uses Dune::ALUGrid as the simulation grid.
  */
 template <class TypeTag>
-class EclAluGridVanguard : public EclBaseVanguard<TypeTag>
+class AluGridVanguard : public EclBaseVanguard<TypeTag>
 {
     friend class EclBaseVanguard<TypeTag>;
     using ParentType = EclBaseVanguard<TypeTag>;
@@ -114,15 +114,13 @@ public:
     static constexpr int dimension = Grid::dimension;
     static constexpr int dimensionworld = Grid::dimensionworld;
 
-    EclAluGridVanguard(Simulator& simulator)
+    AluGridVanguard(Simulator& simulator)
         : EclBaseVanguard<TypeTag>(simulator)
     { 
       this->mpiRank = EclGenericVanguard::comm().rank();
       this->callImplementationInit();
     }
 
-    ~EclAluGridVanguard() = default;
-
     /*!
      * \brief Return a reference to the simulation grid.
      */
@@ -365,4 +363,4 @@ protected:
 
 } // namespace Opm
 
-#endif
+#endif // OPM_ALUGRID_VANGUARD_HPP