diff --git a/opm/core/linalg/call_umfpack.c b/opm/core/linalg/call_umfpack.c
index 517dd292d..d38873783 100644
--- a/opm/core/linalg/call_umfpack.c
+++ b/opm/core/linalg/call_umfpack.c
@@ -38,8 +38,8 @@
 
 #include <suitesparse/umfpack.h>
 
-#include <opmcore/linalg/sparse_sys.h>
-#include <opmcore/linalg/call_umfpack.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/linalg/call_umfpack.h>
 
 struct CSCMatrix {
     UF_long  n;
diff --git a/opm/core/pressure/mimetic/mimetic.c b/opm/core/pressure/mimetic/mimetic.c
index e7a49cceb..4ead1e526 100644
--- a/opm/core/pressure/mimetic/mimetic.c
+++ b/opm/core/pressure/mimetic/mimetic.c
@@ -21,8 +21,8 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/pressure/mimetic/mimetic.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/pressure/mimetic/mimetic.h>
 
 /* ------------------------------------------------------------------ */
 void
diff --git a/opm/core/pressure/tpfa/cfs_tpfa_residual.c b/opm/core/pressure/tpfa/cfs_tpfa_residual.c
index e7953145b..4f83e42b5 100644
--- a/opm/core/pressure/tpfa/cfs_tpfa_residual.c
+++ b/opm/core/pressure/tpfa/cfs_tpfa_residual.c
@@ -4,15 +4,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <opmcore/well.h>
-#include <opmcore/linalg/blas_lapack.h>
-#include <opmcore/linalg/sparse_sys.h>
+#include <opm/core/well.h>
+#include <opm/core/linalg/blas_lapack.h>
+#include <opm/core/linalg/sparse_sys.h>
 
-#include <opmcore/pressure/tpfa/compr_quant_general.h>
-#include <opmcore/pressure/tpfa/compr_source.h>
-#include <opmcore/pressure/tpfa/trans_tpfa.h>
+#include <opm/core/pressure/tpfa/compr_quant_general.h>
+#include <opm/core/pressure/tpfa/compr_source.h>
+#include <opm/core/pressure/tpfa/trans_tpfa.h>
 
-#include <opmcore/pressure/tpfa/cfs_tpfa_residual.h>
+#include <opm/core/pressure/tpfa/cfs_tpfa_residual.h>
 
 #if defined(MAX)
 #undef MAX
diff --git a/opm/core/pressure/tpfa/cfs_tpfa_residual.h b/opm/core/pressure/tpfa/cfs_tpfa_residual.h
index 1e852639e..b2a60de5d 100644
--- a/opm/core/pressure/tpfa/cfs_tpfa_residual.h
+++ b/opm/core/pressure/tpfa/cfs_tpfa_residual.h
@@ -20,7 +20,7 @@
 #ifndef OPM_CFS_TPFA_HEADER_INCLUDED
 #define OPM_CFS_TPFA_HEADER_INCLUDED
 
-#include <opmcore/grid.h>
+#include <opm/core/grid.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/opm/core/pressure/tpfa/ifs_tpfa.c b/opm/core/pressure/tpfa/ifs_tpfa.c
index df059c827..136ab43ba 100644
--- a/opm/core/pressure/tpfa/ifs_tpfa.c
+++ b/opm/core/pressure/tpfa/ifs_tpfa.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <opmcore/linalg/sparse_sys.h>
-#include <opmcore/pressure/tpfa/ifs_tpfa.h>
+#include <opm/core/linalg/sparse_sys.h>
+#include <opm/core/pressure/tpfa/ifs_tpfa.h>
 
 
 struct ifs_tpfa_impl {
diff --git a/opm/core/pressure/tpfa/ifs_tpfa.h b/opm/core/pressure/tpfa/ifs_tpfa.h
index 4b9aab628..9b04a8d7e 100644
--- a/opm/core/pressure/tpfa/ifs_tpfa.h
+++ b/opm/core/pressure/tpfa/ifs_tpfa.h
@@ -20,7 +20,7 @@
 #ifndef OPM_IFS_TPFA_HEADER_INCLUDED
 #define OPM_IFS_TPFA_HEADER_INCLUDED
 
-#include <opmcore/grid.h>
+#include <opm/core/grid.h>
 
 #ifdef __cplusplus
 extern "C" {