diff --git a/include/aidge/data/DataProvider.hpp b/include/aidge/data/DataProvider.hpp
index 5ca47ce7b8ebcac35d88b0805b23771d362a8c93..055d6e9261b8ba8ee66d8f01e9b409ac18a869dc 100644
--- a/include/aidge/data/DataProvider.hpp
+++ b/include/aidge/data/DataProvider.hpp
@@ -20,14 +20,14 @@ public:
      * @param database database from which to load the data.
      * @param batchSize number of data samples per batch.
      */
-    DataProvider(Database& database, size_t batchSize);
+    DataProvider(Database& database, std::size_t batchSize);
 
     /**
      * @brief Create a batch for each data modality in the database. The returned batch contain the data as sorted in the database.
      * @param startIndex the starting index in the database to start the batch from. 
      * @return a vector of tensors. Each tensor is a batch corresponding to one modality.
      */
-    std::vector<std::shared_ptr<Tensor>> readBatch(size_t startIndex);
+    std::vector<std::shared_ptr<Tensor>> readBatch(std::size_t startIndex);
 
 protected:
 
@@ -35,7 +35,7 @@ protected:
     Database& mDatabase;
     
     size_t mNumberModality;
-    std::vector<std::vector<size_t>> mDataSizes;
+    std::vector<std::vector<std::size_t>> mDataSizes;
     std::vector<std::string> mDataBackends;
     std::vector<DataType> mDataTypes;
     
diff --git a/src/data/DataProvider.cpp b/src/data/DataProvider.cpp
index ab94547ec40431070d30311c3d04e5227d18b350..07804be8ec21f13d2c8ec77efafbae49ebed4da8 100644
--- a/src/data/DataProvider.cpp
+++ b/src/data/DataProvider.cpp
@@ -4,7 +4,7 @@
 
 using namespace Aidge; 
 
-DataProvider::DataProvider(Database& database, size_t batchSize)
+DataProvider::DataProvider(Database& database, std::size_t batchSize)
     :
     mDatabase(database),
     mBatchSize(batchSize)
@@ -22,7 +22,7 @@ DataProvider::DataProvider(Database& database, size_t batchSize)
     }
 }
 
-std::vector<std::shared_ptr<Tensor>> DataProvider::readBatch(size_t startIndex)
+std::vector<std::shared_ptr<Tensor>> DataProvider::readBatch(std::size_t startIndex)
 {
     assert((startIndex) <= mDatabase.getLen() && " DataProvider readBatch : database fetch out of bounds");