diff --git a/CMakeLists.txt b/CMakeLists.txt
index f802662a3..678fb41ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,13 +339,13 @@ opm_add_test(flow_onephase
   DEPENDS opmsimulators
   LIBRARIES opmsimulators)
 
-opm_add_test(flow_co2
+opm_add_test(flow_co2_diffusion
   ONLY_COMPILE
   DEFAULT_ENABLE_IF ${FLOW_VARIANTS_DEFAULT_ENABLE_IF}
   SOURCES
   flow/flow_co2_diffusion.cpp
   $<TARGET_OBJECTS:moduleVersion>
-  EXE_NAME flow_co2
+  EXE_NAME flow_co2_diffusion
   DEPENDS opmsimulators
   LIBRARIES opmsimulators)
 
diff --git a/flow/flow_bo_diffusion.cpp b/flow/flow_bo_diffusion.cpp
index cdeb74e55..f93e638de 100644
--- a/flow/flow_bo_diffusion.cpp
+++ b/flow/flow_bo_diffusion.cpp
@@ -16,18 +16,17 @@
 */
 #include "config.h"
 #include <opm/simulators/flow/Main.hpp>
-#include <opm/models/blackoil/blackoiltwophaseindices.hh>
 
 namespace Opm {
 namespace Properties {
 namespace TTag {
-struct EclFlowCo2Problem {
+struct EclFlowDiffusionProblem {
     using InheritsFrom = std::tuple<EclFlowProblem>;
 };
 }
 
 template<class TypeTag>
-struct EnableDiffusion<TypeTag, TTag::EclFlowProblem> {
+struct EnableDiffusion<TypeTag, TTag::EclFlowDiffusionProblem> {
     static constexpr bool value = true;
 };
 
@@ -38,7 +37,7 @@ struct EnableDiffusion<TypeTag, TTag::EclFlowProblem> {
 // ----------------- Main program -----------------
 int main(int argc, char** argv)
 {
-    using TypeTag = Opm::Properties::TTag::EclFlowCo2Problem;
+    using TypeTag = Opm::Properties::TTag::EclFlowDiffusionProblem;
     auto mainObject = Opm::Main(argc, argv);
     return mainObject.runStatic<TypeTag>();
 }
diff --git a/flow/flow_co2_diffusion.cpp b/flow/flow_co2_diffusion.cpp
index 548108b63..8b4fe9a95 100644
--- a/flow/flow_co2_diffusion.cpp
+++ b/flow/flow_co2_diffusion.cpp
@@ -27,7 +27,7 @@ struct EclFlowCo2Problem {
 }
 
 template<class TypeTag>
-struct EnableDiffusion<TypeTag, TTag::EclFlowProblem> {
+struct EnableDiffusion<TypeTag, TTag::EclFlowCo2Problem> {
     static constexpr bool value = true;
 };