diff --git a/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues.h b/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues.h
index f87db8e942ce5bb7cb09177ca6e14fcde1be2394..1cfa23568c7c6252bb5e35f5931609847fed0d0c 100644
--- a/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues.h
+++ b/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues.h
@@ -25,8 +25,6 @@ template< typename Index,
           typename LocalIndex >
 class EllpackIndexMultimapValues
 {
-      using ThisType       = EllpackIndexMultimapValues< Index, Device, LocalIndex >;
-
    public:
       using DeviceType     = Device;
       using IndexType      = Index;
@@ -35,13 +33,13 @@ class EllpackIndexMultimapValues
 
       EllpackIndexMultimapValues();
 
-      EllpackIndexMultimapValues( ThisType&& other );
+      EllpackIndexMultimapValues( EllpackIndexMultimapValues&& other );
 
-      ThisType& operator=( const ThisType& );
+      EllpackIndexMultimapValues& operator=( const EllpackIndexMultimapValues& );
 
-      ThisType& operator=( ThisType&& other );
+      EllpackIndexMultimapValues& operator=( EllpackIndexMultimapValues&& other );
 
-      void bind( const ThisType& other );
+      void bind( const EllpackIndexMultimapValues& other );
 
       bool setSize( const LocalIndexType& portsCount );
 
@@ -58,9 +56,9 @@ class EllpackIndexMultimapValues
 
       const IndexType& operator[]( const LocalIndexType& portIndex ) const;
 
-      bool operator==( const ThisType& other ) const;
+      bool operator==( const EllpackIndexMultimapValues& other ) const;
 
-      bool operator!=( const ThisType& other ) const;
+      bool operator!=( const EllpackIndexMultimapValues& other ) const;
 
       void print( std::ostream& str ) const;
 
diff --git a/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues_impl.h b/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues_impl.h
index 402b3691d76b59751f43f82edbc3623effdb44cf..3a7a3e28935ef1b865ef08ac784d3192716d9a5f 100644
--- a/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues_impl.h
+++ b/src/TNL/Experimental/Multimaps/EllpackIndexMultimapValues_impl.h
@@ -29,7 +29,7 @@ template< typename Index,
           typename Device,
           typename LocalIndex >
 EllpackIndexMultimapValues< Index, Device, LocalIndex >::
-EllpackIndexMultimapValues( ThisType&& other )
+EllpackIndexMultimapValues( EllpackIndexMultimapValues&& other )
 : values( other.values ), valuesCount( other.valuesCount ), allocatedSize( other.allocatedSize )
 {
    other.values = nullptr;
@@ -42,7 +42,7 @@ template< typename Index,
           typename LocalIndex >
 EllpackIndexMultimapValues< Index, Device, LocalIndex >&
 EllpackIndexMultimapValues< Index, Device, LocalIndex >::
-operator=( const ThisType& other )
+operator=( const EllpackIndexMultimapValues& other )
 {
    Assert( this->getSize() == other.getSize(), );
    if( this->values != other.values ) {
@@ -57,7 +57,7 @@ template< typename Index,
           typename LocalIndex >
 EllpackIndexMultimapValues< Index, Device, LocalIndex >&
 EllpackIndexMultimapValues< Index, Device, LocalIndex >::
-operator=( ThisType&& other )
+operator=( EllpackIndexMultimapValues&& other )
 {
    this->values = other.values;
    this->valuesCount = other.valuesCount;
@@ -73,7 +73,7 @@ template< typename Index,
           typename LocalIndex >
 void
 EllpackIndexMultimapValues< Index, Device, LocalIndex >::
-bind( const ThisType& other )
+bind( const EllpackIndexMultimapValues& other )
 {
    this->values = other.values;
    this->valuesCount = other.valuesCount;
@@ -192,7 +192,7 @@ template< typename Index,
           typename LocalIndex >
 bool
 EllpackIndexMultimapValues< Index, Device, LocalIndex >::
-operator==( const ThisType& other ) const
+operator==( const EllpackIndexMultimapValues& other ) const
 {
    if( this->getSize() != other.getSize() )
       return false;
@@ -207,7 +207,7 @@ template< typename Index,
           typename LocalIndex >
 bool
 EllpackIndexMultimapValues< Index, Device, LocalIndex >::
-operator!=( const ThisType& other ) const
+operator!=( const EllpackIndexMultimapValues& other ) const
 {
    return ! ( *this == other );
 }