diff --git a/src/TNL/Meshes/Mesh.h b/src/TNL/Meshes/Mesh.h
index 44a254d13c9fd8372ab127e82eb79a2140538069..7e526cdb698064ff3638a75d1b678b8520906209 100644
--- a/src/TNL/Meshes/Mesh.h
+++ b/src/TNL/Meshes/Mesh.h
@@ -174,7 +174,7 @@ class Mesh
 
    protected:
       // Methods for the mesh initializer
-      using StorageBaseType::setNumberOfEntities;
+      using StorageBaseType::setEntitiesCount;
       using StorageBaseType::getSubentityStorageNetwork;
       using StorageBaseType::getSuperentityStorageNetwork;
 
diff --git a/src/TNL/Meshes/MeshDetails/initializer/MeshInitializer.h b/src/TNL/Meshes/MeshDetails/initializer/MeshInitializer.h
index b6c17db8e3304f69f914b0ebb15a0f53cacecd8b..c2d16c8dfc28eacffba8ac96d30a28a2c288c428 100644
--- a/src/TNL/Meshes/MeshDetails/initializer/MeshInitializer.h
+++ b/src/TNL/Meshes/MeshDetails/initializer/MeshInitializer.h
@@ -114,10 +114,10 @@ class MeshInitializer
       }
 
       template< int Dimension >
-      void setNumberOfEntities( const GlobalIndexType& entitiesCount )
+      void setEntitiesCount( const GlobalIndexType& entitiesCount )
       {
          //std::cout << "Setting number of entities with " << Dimension << " dimension to " << entitiesCount << std::endl;
-         mesh->template setNumberOfEntities< Dimension >( entitiesCount );
+         mesh->template setEntitiesCount< Dimension >( entitiesCount );
       }
 
       template< int Subdimension, typename EntityType, typename LocalIndex, typename GlobalIndex >
@@ -210,7 +210,7 @@ class MeshInitializerLayer< MeshConfig,
       void initEntities( InitializerType& initializer, PointArrayType& points, CellSeedArrayType& cellSeeds, MeshType& mesh )
       {
          //std::cout << " Initiating entities with dimension " << DimensionTag::value << " ... " << std::endl;
-         initializer.template setNumberOfEntities< DimensionTag::value >( cellSeeds.getSize() );
+         initializer.template setEntitiesCount< DimensionTag::value >( cellSeeds.getSize() );
          for( GlobalIndexType i = 0; i < cellSeeds.getSize(); i++ )
             EntityInitializerType::initEntity( mesh.template getEntity< DimensionTag::value >( i ), i, cellSeeds[ i ], initializer );
          cellSeeds.reset();
@@ -305,7 +305,7 @@ class MeshInitializerLayer< MeshConfig,
       {
          //std::cout << " Initiating entities with dimension " << DimensionTag::value << " ... " << std::endl;
          const GlobalIndexType numberOfEntities = getEntitiesCount( initializer, mesh );
-         initializer.template setNumberOfEntities< DimensionTag::value >( numberOfEntities );
+         initializer.template setEntitiesCount< DimensionTag::value >( numberOfEntities );
 
          using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::getMeshDimension() >, DimensionTag >;
          for( GlobalIndexType i = 0; i < mesh.template getEntitiesCount< MeshType::getMeshDimension() >(); i++ )
@@ -392,7 +392,7 @@ class MeshInitializerLayer< MeshConfig,
       {
          //std::cout << " Initiating entities with dimension " << DimensionTag::value << " ... " << std::endl;
          const GlobalIndexType numberOfEntities = getEntitiesCount( initializer, mesh );
-         initializer.template setNumberOfEntities< DimensionTag::value >( numberOfEntities );
+         initializer.template setEntitiesCount< DimensionTag::value >( numberOfEntities );
          this->referenceOrientations.setSize( numberOfEntities );
 
          using SubentitySeedsCreator = MeshSubentitySeedsCreator< MeshConfig, Meshes::DimensionTag< MeshType::getMeshDimension() >, DimensionTag >;
@@ -478,7 +478,7 @@ class MeshInitializerLayer< MeshConfig,
       void initEntities( InitializerType& initializer, PointArrayType& points, MeshType& mesh )
       {
          //std::cout << " Initiating entities with dimension " << DimensionTag::value << " ... " << std::endl;
-         initializer.template setNumberOfEntities< 0 >( points.getSize() );
+         initializer.template setEntitiesCount< 0 >( points.getSize() );
          for( GlobalIndexType i = 0; i < points.getSize(); i++ )
             EntityInitializerType::initEntity( mesh.template getEntity< 0 >( i ), i, points[ i ], initializer );
          points.reset();
diff --git a/src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h b/src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h
index 215976296bbbeb79efb4ccfd9ec0b4b474167b96..73dc1900c758a77aa4318d1b135fbbe6b844721a 100644
--- a/src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h
+++ b/src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h
@@ -70,7 +70,7 @@ public:
    }
 
 
-   void setNumberOfEntities( const GlobalIndexType& entitiesCount )
+   void setEntitiesCount( const GlobalIndexType& entitiesCount )
    {
       boundaryTags.setSize( entitiesCount );
    }
@@ -240,7 +240,7 @@ public:
    template< typename Device_ >
    MeshBoundaryTagsLayer& operator=( const MeshBoundaryTagsLayer< MeshConfig, Device_, DimensionTag >& other ) { return *this; }
 
-   void setNumberOfEntities( const GlobalIndexType& entitiesCount ) {}
+   void setEntitiesCount( const GlobalIndexType& entitiesCount ) {}
 
    void resetBoundaryTags( DimensionTag ) {}
    void setIsBoundaryEntity( DimensionTag, const GlobalIndexType& entityIndex, bool isBoundary ) {}
diff --git a/src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h b/src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h
index 36203a56e22748c0efdebf8747034d24e9f55787..9d580e613ffea24a0ab94171a5bc3a30370d9b5f 100644
--- a/src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h
+++ b/src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h
@@ -49,10 +49,10 @@ public:
 
 protected:
    template< int Dimension >
-   void setNumberOfEntities( const typename EntityTraits< Dimension >::GlobalIndexType& entitiesCount )
+   void setEntitiesCount( const typename EntityTraits< Dimension >::GlobalIndexType& entitiesCount )
    {
       static_assert( EntityTraits< Dimension >::storageEnabled, "You try to set number of entities which are not configured for storage." );
-      BaseType::setNumberOfEntities( DimensionTag< Dimension >(), entitiesCount );
+      BaseType::setEntitiesCount( DimensionTag< Dimension >(), entitiesCount );
    }
 
    template< int Dimension, int Subdimension >
@@ -176,7 +176,7 @@ public:
    /****
      * Make visible getters of the lower layer
      */
-   using BaseType::setNumberOfEntities;
+   using BaseType::setEntitiesCount;
    using BaseType::getEntitiesCount;
    using BaseType::getEntity;
 
@@ -235,12 +235,12 @@ public:
    }
 
 
-   void setNumberOfEntities( DimensionTag, const GlobalIndexType& entitiesCount )
+   void setEntitiesCount( DimensionTag, const GlobalIndexType& entitiesCount )
    {
       this->entities.setSize( entitiesCount );
-      SubentityStorageBaseType::setNumberOfEntities( entitiesCount );
-      SuperentityStorageBaseType::setNumberOfEntities( entitiesCount );
-      BoundaryTagsBaseType::setNumberOfEntities( entitiesCount );
+      SubentityStorageBaseType::setEntitiesCount( entitiesCount );
+      SuperentityStorageBaseType::setEntitiesCount( entitiesCount );
+      BoundaryTagsBaseType::setEntitiesCount( entitiesCount );
    }
 
    __cuda_callable__
@@ -363,7 +363,7 @@ public:
    }
 
 
-   void setNumberOfEntities() {}
+   void setEntitiesCount() {}
    void getEntitiesCount() const {}
    void getEntity() const {}
 
diff --git a/src/TNL/Meshes/MeshDetails/layers/MeshSubentityStorageLayer.h b/src/TNL/Meshes/MeshDetails/layers/MeshSubentityStorageLayer.h
index 1c4b74731d2d4bf037b2d466b9f8f08453a1f82c..8a521bb02b29bd695c5cf6d280f66daea726e303 100644
--- a/src/TNL/Meshes/MeshDetails/layers/MeshSubentityStorageLayer.h
+++ b/src/TNL/Meshes/MeshDetails/layers/MeshSubentityStorageLayer.h
@@ -112,9 +112,9 @@ protected:
    }
 
 
-   void setNumberOfEntities( const GlobalIndexType& entitiesCount )
+   void setEntitiesCount( const GlobalIndexType& entitiesCount )
    {
-      BaseType::setNumberOfEntities( entitiesCount );
+      BaseType::setEntitiesCount( entitiesCount );
       this->storageNetwork.setKeysRange( entitiesCount );
       this->storageNetwork.allocate();
    }
@@ -219,7 +219,7 @@ protected:
     * These methods are due to 'using BaseType::...;' in the derived classes.
     */
    template< typename GlobalIndexType >
-   void setNumberOfEntities( const GlobalIndexType& entitiesCount ) {}
+   void setEntitiesCount( const GlobalIndexType& entitiesCount ) {}
 
    void print( std::ostream& str ) const {}
 
@@ -264,7 +264,7 @@ protected:
     * These methods are due to 'using BaseType::...;' in the derived classes.
     */
    template< typename GlobalIndexType >
-   void setNumberOfEntities( const GlobalIndexType& entitiesCount ) {}
+   void setEntitiesCount( const GlobalIndexType& entitiesCount ) {}
 
    void print( std::ostream& str ) const {}
 
diff --git a/src/TNL/Meshes/MeshDetails/layers/MeshSuperentityStorageLayer.h b/src/TNL/Meshes/MeshDetails/layers/MeshSuperentityStorageLayer.h
index 8bbae013a2598b4f2d32b5867db48e75bd2beda0..f67a233ffaefc9b0203f0d9d563cae85c3fda494 100644
--- a/src/TNL/Meshes/MeshDetails/layers/MeshSuperentityStorageLayer.h
+++ b/src/TNL/Meshes/MeshDetails/layers/MeshSuperentityStorageLayer.h
@@ -113,9 +113,9 @@ protected:
    }
 
 
-   void setNumberOfEntities( const GlobalIndexType& entitiesCount )
+   void setEntitiesCount( const GlobalIndexType& entitiesCount )
    {
-      BaseType::setNumberOfEntities( entitiesCount );
+      BaseType::setEntitiesCount( entitiesCount );
       this->storageNetwork.setKeysRange( entitiesCount );
    }
 
@@ -211,7 +211,7 @@ protected:
    /****
     * These methods are due to 'using BaseType::...;' in the derived classes.
     */
-   void setNumberOfEntities( const GlobalIndexType& entitiesCount ) {}
+   void setEntitiesCount( const GlobalIndexType& entitiesCount ) {}
 
    void print( std::ostream& str ) const {}
 
@@ -257,7 +257,7 @@ protected:
    /****
     * These methods are due to 'using BaseType::...;' in the derived classes.
     */
-   void setNumberOfEntities( const GlobalIndexType& entitiesCount ) {}
+   void setEntitiesCount( const GlobalIndexType& entitiesCount ) {}
 
    void print( std::ostream& str ) const {}