diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90a7c60e5..c5d02bfee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -556,7 +556,7 @@ if(CUDA_FOUND)
                        cuvector
                        cusparsematrix
                        cuseqilu0
-                       cuowneroverlapcopy
+                       GpuOwnerOverlapCopy
                        solver_adapter
                        GpuBuffer
                        cuview
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 8a98562f7..e6ce02553 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -259,7 +259,7 @@ if (HAVE_CUDA)
   ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg CuSeqILU0.hpp)
   ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg detail/fix_zero_diagonal.hpp)
   ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg PreconditionerConvertFieldTypeAdapter.hpp)
-  ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg CuOwnerOverlapCopy.hpp)
+  ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg GpuOwnerOverlapCopy.hpp)
   ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg SolverAdapter.hpp)
   ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg GpuBlockPreconditioner.hpp)
   ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg PreconditionerHolder.hpp)
@@ -396,7 +396,7 @@ if (HAVE_CUDA)
   ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_cuda_check_last_error.cpp)
   ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_GpuDILU.cpp)
   ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_GpuJac.cpp)
-  ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_cuowneroverlapcopy.cpp)
+  ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_GpuOwnerOverlapCopy.cpp)
   ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_cuseqilu0.cpp)
   ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_cusparse_handle.cpp)
   ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_cuSparse_matrix_operations.cpp)
diff --git a/opm/simulators/linalg/cuistl/CuOwnerOverlapCopy.hpp b/opm/simulators/linalg/cuistl/GpuOwnerOverlapCopy.hpp
similarity index 98%
rename from opm/simulators/linalg/cuistl/CuOwnerOverlapCopy.hpp
rename to opm/simulators/linalg/cuistl/GpuOwnerOverlapCopy.hpp
index 30b06ade8..82051bd6a 100644
--- a/opm/simulators/linalg/cuistl/CuOwnerOverlapCopy.hpp
+++ b/opm/simulators/linalg/cuistl/GpuOwnerOverlapCopy.hpp
@@ -16,8 +16,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef OPM_CUISTL_CUOWNEROVERLAPCOPY_HPP
-#define OPM_CUISTL_CUOWNEROVERLAPCOPY_HPP
+#ifndef OPM_GPUISTL_GPUOWNEROVERLAPCOPY_HPP
+#define OPM_GPUISTL_GPUOWNEROVERLAPCOPY_HPP
 #include <dune/istl/owneroverlapcopy.hh>
 #include <memory>
 #include <mutex>
@@ -380,12 +380,12 @@ private:
  * @tparam OwnerOverlapCopyCommunicationType should mimic Dune::OwnerOverlapCopyCommunication.
  */
 template <class field_type, int block_size, class OwnerOverlapCopyCommunicationType>
-class CuOwnerOverlapCopy
+class GpuOwnerOverlapCopy
 {
 public:
     using X = CuVector<field_type>;
 
-    CuOwnerOverlapCopy(std::shared_ptr<GPUSender<field_type, OwnerOverlapCopyCommunicationType>> sender) : m_sender(sender){}
+    GpuOwnerOverlapCopy(std::shared_ptr<GPUSender<field_type, OwnerOverlapCopyCommunicationType>> sender) : m_sender(sender){}
 
     void copyOwnerToAll(const X& source, X& dest) const {
         m_sender->copyOwnerToAll(source, dest);
diff --git a/opm/simulators/linalg/cuistl/SolverAdapter.hpp b/opm/simulators/linalg/cuistl/SolverAdapter.hpp
index 28d2e460d..948033abc 100644
--- a/opm/simulators/linalg/cuistl/SolverAdapter.hpp
+++ b/opm/simulators/linalg/cuistl/SolverAdapter.hpp
@@ -27,7 +27,7 @@
 #include <dune/istl/solver.hh>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/simulators/linalg/cuistl/GpuBlockPreconditioner.hpp>
-#include <opm/simulators/linalg/cuistl/CuOwnerOverlapCopy.hpp>
+#include <opm/simulators/linalg/cuistl/GpuOwnerOverlapCopy.hpp>
 #include <opm/simulators/linalg/cuistl/CuSparseMatrix.hpp>
 #include <opm/simulators/linalg/cuistl/CuVector.hpp>
 #include <opm/simulators/linalg/cuistl/PreconditionerAdapter.hpp>
@@ -191,7 +191,7 @@ private:
                 gpuComm = std::make_shared<Opm::gpuistl::GPUObliviousMPISender<real_type, block_size, typename Operator::communication_type>>(communication);
             }
 
-            using CudaCommunication = CuOwnerOverlapCopy<real_type, block_size, typename Operator::communication_type>;
+            using CudaCommunication = GpuOwnerOverlapCopy<real_type, block_size, typename Operator::communication_type>;
             using SchwarzOperator
                 = Dune::OverlappingSchwarzOperator<CuSparseMatrix<real_type>, XGPU, XGPU, CudaCommunication>;
             auto cudaCommunication = std::make_shared<CudaCommunication>(gpuComm);
diff --git a/tests/cuistl/test_cuowneroverlapcopy.cpp b/tests/cuistl/test_GpuOwnerOverlapCopy.cpp
similarity index 89%
rename from tests/cuistl/test_cuowneroverlapcopy.cpp
rename to tests/cuistl/test_GpuOwnerOverlapCopy.cpp
index 7ab9877f5..f16e300b7 100644
--- a/tests/cuistl/test_cuowneroverlapcopy.cpp
+++ b/tests/cuistl/test_GpuOwnerOverlapCopy.cpp
@@ -18,7 +18,7 @@
 */
 #include <config.h>
 
-#define BOOST_TEST_MODULE TestCuOwnerOverlapCopy
+#define BOOST_TEST_MODULE TestGpuOwnerOverlapCopy
 #define BOOST_TEST_NO_MAIN
 
 #include <boost/test/unit_test.hpp>
@@ -26,7 +26,7 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/owneroverlapcopy.hh>
 #include <memory>
-#include <opm/simulators/linalg/cuistl/CuOwnerOverlapCopy.hpp>
+#include <opm/simulators/linalg/cuistl/GpuOwnerOverlapCopy.hpp>
 #include <opm/simulators/linalg/cuistl/CuVector.hpp>
 #include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
 #include <opm/simulators/linalg/cuistl/set_device.hpp>
@@ -66,10 +66,10 @@ BOOST_AUTO_TEST_CASE(TestProject)
 
     auto gpuComm = std::make_shared<Opm::gpuistl::GPUObliviousMPISender<double, 1, Dune::OwnerOverlapCopyCommunication<int>>>(ownerOverlapCopy);
     
-    auto cuOwnerOverlapCopy
-        = Opm::gpuistl::CuOwnerOverlapCopy<double, 1, Dune::OwnerOverlapCopyCommunication<int>>(gpuComm);
+    auto GpuOwnerOverlapCopy
+        = Opm::gpuistl::GpuOwnerOverlapCopy<double, 1, Dune::OwnerOverlapCopyCommunication<int>>(gpuComm);
 
-    cuOwnerOverlapCopy.project(xGPU);
+    GpuOwnerOverlapCopy.project(xGPU);
 
     auto resultOfProject = xGPU.asStdVector();
 
@@ -98,15 +98,15 @@ BOOST_AUTO_TEST_CASE(TestDot)
 
     auto gpuComm = std::make_shared<Opm::gpuistl::GPUObliviousMPISender<double, 1, Dune::OwnerOverlapCopyCommunication<int>>>(ownerOverlapCopy);
 
-    auto cuOwnerOverlapCopy
-        = Opm::gpuistl::CuOwnerOverlapCopy<double, 1, Dune::OwnerOverlapCopyCommunication<int>>(gpuComm);
+    auto GpuOwnerOverlapCopy
+        = Opm::gpuistl::GpuOwnerOverlapCopy<double, 1, Dune::OwnerOverlapCopyCommunication<int>>(gpuComm);
 
     double outputDune = -1.0;
     auto xDune = xGPU.asDuneBlockVector<1>();
     ownerOverlapCopy.dot(xDune, xDune, outputDune);
 
     double output = -1.0;
-    cuOwnerOverlapCopy.dot(xGPU, xGPU, output);
+    GpuOwnerOverlapCopy.dot(xGPU, xGPU, output);
 
 
     BOOST_CHECK_EQUAL(outputDune, output);