diff --git a/src/TNL/Algorithms/Segments/CSR.h b/src/TNL/Algorithms/Segments/CSR.h
index 576a1de79563b19eec101c3961f724d18ba02b7b..dce7cec748a667be44253e31af4dc80dd7c9f6e0 100644
--- a/src/TNL/Algorithms/Segments/CSR.h
+++ b/src/TNL/Algorithms/Segments/CSR.h
@@ -145,7 +145,7 @@ using CSRScalar = CSR< Device, Index, CSRScalarKernel< Index, Device >, IndexAll
 template< typename Device,
           typename Index,
           typename IndexAllocator = typename Allocators::Default< Device >::template Allocator< Index > >
-using CSRVector = CSR< Device, Index, CSRKernelVector< Index, Device >, IndexAllocator >;
+using CSRVector = CSR< Device, Index, CSRVectorKernel< Index, Device >, IndexAllocator >;
 
 template< typename Device,
           typename Index,
diff --git a/src/TNL/Algorithms/Segments/CSRKernelVector.h b/src/TNL/Algorithms/Segments/CSRVectorKernel.h
similarity index 87%
rename from src/TNL/Algorithms/Segments/CSRKernelVector.h
rename to src/TNL/Algorithms/Segments/CSRVectorKernel.h
index a5eb7721088afa39ce70c8468a381c2689ba5c7d..3163abb6029a116f627705cba86fff2593c6a1fe 100644
--- a/src/TNL/Algorithms/Segments/CSRKernelVector.h
+++ b/src/TNL/Algorithms/Segments/CSRVectorKernel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          CSRKernelVector.h -  description
+                          CSRVectorKernel.h -  description
                              -------------------
     begin                : Jan 23, 2021 -> Joe Biden inauguration
     copyright            : (C) 2021 by Tomas Oberhuber
@@ -22,12 +22,12 @@ namespace TNL {
 
 template< typename Index,
           typename Device >
-struct CSRKernelVector
+struct CSRVectorKernel
 {
    using IndexType = Index;
    using DeviceType = Device;
-   using ViewType = CSRKernelVector< Index, Device >;
-   using ConstViewType = CSRKernelVector< Index, Device >;
+   using ViewType = CSRVectorKernel< Index, Device >;
+   using ConstViewType = CSRVectorKernel< Index, Device >;
 
    template< typename Offsets >
    void init( const Offsets& offsets );
@@ -60,4 +60,4 @@ struct CSRKernelVector
    }  // namespace Algorithms
 } // namespace TNL
 
-#include <TNL/Algorithms/Segments/CSRKernelVector.hpp>
+#include <TNL/Algorithms/Segments/CSRVectorKernel.hpp>
diff --git a/src/TNL/Algorithms/Segments/CSRKernelVector.hpp b/src/TNL/Algorithms/Segments/CSRVectorKernel.hpp
similarity index 93%
rename from src/TNL/Algorithms/Segments/CSRKernelVector.hpp
rename to src/TNL/Algorithms/Segments/CSRVectorKernel.hpp
index faa0308648cd062a60257b346f14c83ce768a2fb..2caf272c14fdd860e6e2e70288d77d88f39b46e8 100644
--- a/src/TNL/Algorithms/Segments/CSRKernelVector.hpp
+++ b/src/TNL/Algorithms/Segments/CSRVectorKernel.hpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          CSRKernelVector.hpp -  description
+                          CSRVectorKernel.hpp -  description
                              -------------------
     begin                : Jan 23, 2021 -> Joe Biden inauguration
     copyright            : (C) 2021 by Tomas Oberhuber
@@ -15,7 +15,7 @@
 #include <TNL/Containers/VectorView.h>
 #include <TNL/Algorithms/ParallelFor.h>
 #include <TNL/Algorithms/Segments/details/LambdaAdapter.h>
-#include <TNL/Algorithms/Segments/CSRKernelVector.h>
+#include <TNL/Algorithms/Segments/CSRVectorKernel.h>
 
 namespace TNL {
    namespace Algorithms {
@@ -80,7 +80,7 @@ template< typename Index,
           typename Device >
     template< typename Offsets >
 void
-CSRKernelVector< Index, Device >::
+CSRVectorKernel< Index, Device >::
 init( const Offsets& offsets )
 {
 }
@@ -88,7 +88,7 @@ init( const Offsets& offsets )
 template< typename Index,
           typename Device >
 void
-CSRKernelVector< Index, Device >::
+CSRVectorKernel< Index, Device >::
 reset()
 {
 }
@@ -96,7 +96,7 @@ reset()
 template< typename Index,
           typename Device >
 auto
-CSRKernelVector< Index, Device >::
+CSRVectorKernel< Index, Device >::
 getView() -> ViewType
 {
     return *this;
@@ -105,7 +105,7 @@ getView() -> ViewType
 template< typename Index,
           typename Device >
 auto
-CSRKernelVector< Index, Device >::
+CSRVectorKernel< Index, Device >::
 getConstView() const -> ConstViewType
 {
     return *this;
@@ -114,7 +114,7 @@ getConstView() const -> ConstViewType
 template< typename Index,
           typename Device >
 TNL::String
-CSRKernelVector< Index, Device >::
+CSRVectorKernel< Index, Device >::
 getKernelType()
 {
     return "Vector";
@@ -129,7 +129,7 @@ template< typename Index,
               typename Real,
               typename... Args >
 void
-CSRKernelVector< Index, Device >::
+CSRVectorKernel< Index, Device >::
 segmentsReduction( const OffsetsView& offsets,
                          Index first,
                          Index last,
diff --git a/src/TNL/Algorithms/Segments/CSRView.h b/src/TNL/Algorithms/Segments/CSRView.h
index 3a19f4af78c6a0a904a49e66edd70ca4f5085fe6..d5723de3c3ba78c2862b7488f02206af114a254b 100644
--- a/src/TNL/Algorithms/Segments/CSRView.h
+++ b/src/TNL/Algorithms/Segments/CSRView.h
@@ -15,7 +15,7 @@
 #include <TNL/Containers/Vector.h>
 #include <TNL/Algorithms/Segments/SegmentView.h>
 #include <TNL/Algorithms/Segments/CSRScalarKernel.h>
-#include <TNL/Algorithms/Segments/CSRKernelVector.h>
+#include <TNL/Algorithms/Segments/CSRVectorKernel.h>
 #include <TNL/Algorithms/Segments/CSRKernelHybrid.h>
 #include <TNL/Algorithms/Segments/CSRKernelAdaptive.h>
 
@@ -138,7 +138,7 @@ using CSRViewScalar = CSRView< Device, Index, CSRScalarKernel< Index, Device > >
 
 template< typename Device,
           typename Index >
-using CSRViewVector = CSRView< Device, Index, CSRKernelVector< Index, Device > >;
+using CSRViewVector = CSRView< Device, Index, CSRVectorKernel< Index, Device > >;
 
 template< typename Device,
           typename Index >