diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index f4881477..7dfd03d7 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -72,7 +72,7 @@ list (APPEND MAIN_SOURCE_FILES
 	opm/core/pressure/tpfa/compr_source.c
 	opm/core/pressure/tpfa/ifs_tpfa.c
 	opm/core/pressure/tpfa/trans_tpfa.c
-	opm/core/pressure/well.c
+	opm/core/pressure/legacy_well.c
 	opm/core/props/BlackoilPropertiesBasic.cpp
 	opm/core/props/BlackoilPropertiesFromDeck.cpp
 	opm/core/props/IncompPropertiesBasic.cpp
@@ -212,6 +212,7 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/pressure/flow_bc.h
 	opm/core/pressure/fsh.h
 	opm/core/pressure/fsh_common_impl.h
+	opm/core/pressure/legacy_well.h
 	opm/core/pressure/mimetic/hybsys.h
 	opm/core/pressure/mimetic/hybsys_global.h
 	opm/core/pressure/mimetic/mimetic.h
@@ -321,7 +322,6 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/core/utility/parameters/ParameterXML.hpp
 	opm/core/utility/parameters/tinyxml/tinystr.h
 	opm/core/utility/parameters/tinyxml/tinyxml.h
-	opm/core/well.h
 	opm/core/wells/InjectionSpecification.hpp
 	opm/core/wells/ProductionSpecification.hpp
 	opm/core/wells/WellCollection.hpp
diff --git a/opm/core/pressure/TPFACompressiblePressureSolver.hpp b/opm/core/pressure/TPFACompressiblePressureSolver.hpp
index f47f987f..d38d8260 100644
--- a/opm/core/pressure/TPFACompressiblePressureSolver.hpp
+++ b/opm/core/pressure/TPFACompressiblePressureSolver.hpp
@@ -25,7 +25,7 @@
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
 #include <opm/core/linalg/sparse_sys.h>
 #include <opm/core/pressure/flow_bc.h>
-#include <opm/core/well.h>
+#include <opm/core/pressure/legacy_well.h>
 #include <opm/core/pressure/tpfa/compr_quant.h>
 #include <opm/core/GridAdapter.hpp>
 #include <stdexcept>
diff --git a/opm/core/pressure/fsh.h b/opm/core/pressure/fsh.h
index 4930cd10..8e71e9c4 100644
--- a/opm/core/pressure/fsh.h
+++ b/opm/core/pressure/fsh.h
@@ -52,7 +52,7 @@
  */
 
 #include <opm/core/grid.h>
-#include <opm/core/well.h>
+#include <opm/core/pressure/legacy_well.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #ifdef __cplusplus
diff --git a/opm/core/pressure/fsh_common_impl.c b/opm/core/pressure/fsh_common_impl.c
index 6a6c8d62..0ac450c4 100644
--- a/opm/core/pressure/fsh_common_impl.c
+++ b/opm/core/pressure/fsh_common_impl.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include <opm/core/grid.h>
-#include <opm/core/well.h>
+#include <opm/core/pressure/legacy_well.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #include <opm/core/pressure/fsh.h>
diff --git a/opm/core/pressure/well.c b/opm/core/pressure/legacy_well.c
similarity index 98%
rename from opm/core/pressure/well.c
rename to opm/core/pressure/legacy_well.c
index 16719426..8a976b30 100644
--- a/opm/core/pressure/well.c
+++ b/opm/core/pressure/legacy_well.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include <opm/core/well.h>
+#include <opm/core/pressure/legacy_well.h>
 
 
 /* Release memory resources for cell->well mapping. */
diff --git a/opm/core/well.h b/opm/core/pressure/legacy_well.h
similarity index 96%
rename from opm/core/well.h
rename to opm/core/pressure/legacy_well.h
index 008817c1..3d985f7e 100644
--- a/opm/core/well.h
+++ b/opm/core/pressure/legacy_well.h
@@ -17,8 +17,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_WELL_HEADER_INCLUDED
-#define OPM_WELL_HEADER_INCLUDED
+#ifndef OPM_LEGACY_WELL_HEADER_INCLUDED
+#define OPM_LEGACY_WELL_HEADER_INCLUDED
 
 /**
  * \file
@@ -133,4 +133,4 @@ derive_cell_wells(int nc, well_t *W, int *cwpos, int *cwells);
 }
 #endif
 
-#endif /* OPM_WELL_HEADER_INCLUDED */
+#endif /* OPM_LEGACY_WELL_HEADER_INCLUDED */
diff --git a/opm/core/pressure/mimetic/hybsys_global.h b/opm/core/pressure/mimetic/hybsys_global.h
index 975d4962..1d98cd0d 100644
--- a/opm/core/pressure/mimetic/hybsys_global.h
+++ b/opm/core/pressure/mimetic/hybsys_global.h
@@ -93,7 +93,7 @@ extern "C" {
 #endif
 
 #include <opm/core/grid.h>
-#include <opm/core/well.h>
+#include <opm/core/pressure/legacy_well.h>
 #include <opm/core/linalg/sparse_sys.h>
 
 
diff --git a/opm/core/pressure/tpfa/cfs_tpfa.c b/opm/core/pressure/tpfa/cfs_tpfa.c
index 6f6aea60..1b4daa21 100644
--- a/opm/core/pressure/tpfa/cfs_tpfa.c
+++ b/opm/core/pressure/tpfa/cfs_tpfa.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <opm/core/well.h>
+#include <opm/core/pressure/legacy_well.h>
 #include <opm/core/linalg/blas_lapack.h>
 #include <opm/core/linalg/sparse_sys.h>
 #include <opm/core/pressure/flow_bc.h>
diff --git a/opm/core/pressure/tpfa/cfs_tpfa.h b/opm/core/pressure/tpfa/cfs_tpfa.h
index b099f11c..32f37422 100644
--- a/opm/core/pressure/tpfa/cfs_tpfa.h
+++ b/opm/core/pressure/tpfa/cfs_tpfa.h
@@ -21,7 +21,7 @@
 #define OPM_CFS_TPFA_HEADER_INCLUDED
 
 #include <opm/core/grid.h>
-#include <opm/core/well.h>
+#include <opm/core/pressure/legacy_well.h>
 #include <opm/core/pressure/flow_bc.h>
 
 #ifdef __cplusplus