diff --git a/src/TNL/Matrices/TridiagonalMatrixView.hpp b/src/TNL/Matrices/TridiagonalMatrixView.hpp
index 008becb092e6a895eb347d3d556bba9fab79d127..d8fa6061c3c7e8789e0cc60fd30bdd0b8456393d 100644
--- a/src/TNL/Matrices/TridiagonalMatrixView.hpp
+++ b/src/TNL/Matrices/TridiagonalMatrixView.hpp
@@ -326,7 +326,7 @@ void
 TridiagonalMatrixView< Real, Device, Index, RowMajorOrder >::
 allRowsReduction( Fetch& fetch, Reduce& reduce, Keep& keep, const FetchReal& zero ) const
 {
-   this->rowsReduction( 0, this->indexer.getNonEmptyRowsCount(), fetch, reduce, keep, zero );
+   this->rowsReduction( 0, this->indexer.getNonemptyRowsCount(), fetch, reduce, keep, zero );
 }
 
 template< typename Real,
@@ -418,7 +418,7 @@ void
 TridiagonalMatrixView< Real, Device, Index, RowMajorOrder >::
 forAllRows( Function& function )
 {
-   this->forRows( 0, this->indexer.getNonEmptyRowsCount(), function );
+   this->forRows( 0, this->indexer.getNonemptyRowsCount(), function );
 }
 
 template< typename Real,
diff --git a/src/TNL/Matrices/details/TridiagonalMatrixIndexer.h b/src/TNL/Matrices/details/TridiagonalMatrixIndexer.h
index 6d3377b4f938399452230d3e5a3739d26e4e755f..64beb44f736152c1ddb57e2b2647e2e1cd8f8870 100644
--- a/src/TNL/Matrices/details/TridiagonalMatrixIndexer.h
+++ b/src/TNL/Matrices/details/TridiagonalMatrixIndexer.h
@@ -26,21 +26,21 @@ class TridiagonalMatrixIndexer
 
       __cuda_callable__
       TridiagonalMatrixIndexer()
-      : rows( 0 ), columns( 0 ), nonEmptyRows( 0 ){};
+      : rows( 0 ), columns( 0 ), nonemptyRows( 0 ){};
 
       __cuda_callable__
       TridiagonalMatrixIndexer( const IndexType& rows, const IndexType& columns )
-      : rows( rows ), columns( columns ), nonEmptyRows( TNL::min( rows, columns ) + ( rows > columns ) ) {};
+      : rows( rows ), columns( columns ), nonemptyRows( TNL::min( rows, columns ) + ( rows > columns ) ) {};
 
       __cuda_callable__
       TridiagonalMatrixIndexer( const TridiagonalMatrixIndexer& indexer )
-      : rows( indexer.rows ), columns( indexer.columns ), nonEmptyRows( indexer.nonEmptyRows ) {};
+      : rows( indexer.rows ), columns( indexer.columns ), nonemptyRows( indexer.nonemptyRows ) {};
 
       void setDimensions( const IndexType& rows, const IndexType& columns )
       {
          this->rows = rows;
          this->columns = columns;
-         this->nonEmptyRows = min( rows, columns ) + ( rows > columns );
+         this->nonemptyRows = min( rows, columns ) + ( rows > columns );
       };
 
       __cuda_callable__
@@ -65,9 +65,9 @@ class TridiagonalMatrixIndexer
       const IndexType& getColumns() const { return this->columns; };
 
       __cuda_callable__
-      const IndexType& getNonEmptyRowsCount() const { return this->nonEmptyRows; };
+      const IndexType& getNonemptyRowsCount() const { return this->nonemptyRows; };
       __cuda_callable__
-      IndexType getStorageSize() const { return 3 * this->nonEmptyRows; };
+      IndexType getStorageSize() const { return 3 * this->nonemptyRows; };
 
       __cuda_callable__
       IndexType getGlobalIndex( const Index rowIdx, const Index localIdx ) const
@@ -76,16 +76,16 @@ class TridiagonalMatrixIndexer
          TNL_ASSERT_LT( localIdx, 3, "" );
          TNL_ASSERT_GE( rowIdx, 0, "" );
          TNL_ASSERT_LT( rowIdx, this->rows, "" );
-         
+
          if( RowMajorOrder )
             return 3 * rowIdx + localIdx;
          else
-            return localIdx * nonEmptyRows + rowIdx;
+            return localIdx * nonemptyRows + rowIdx;
       };
 
       protected:
 
-         IndexType rows, columns, nonEmptyRows;
+         IndexType rows, columns, nonemptyRows;
 };
       } //namespace details
    } // namespace Materices